From patchwork Fri Apr 30 03:58:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 429979 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA837C433B4 for ; Fri, 30 Apr 2021 03:59:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 71E046144B for ; Fri, 30 Apr 2021 03:59:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229994AbhD3D7v (ORCPT ); Thu, 29 Apr 2021 23:59:51 -0400 Received: from new3-smtp.messagingengine.com ([66.111.4.229]:43411 "EHLO new3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229577AbhD3D7v (ORCPT ); Thu, 29 Apr 2021 23:59:51 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailnew.nyi.internal (Postfix) with ESMTP id 73E4D58098C; Thu, 29 Apr 2021 23:59:03 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Thu, 29 Apr 2021 23:59:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=C/zv9YAufZEA1 vYQZ89gyFjqQ5tKRBiTvd9OZQm7wS4=; b=p7X+/8zVRC7OM40ixXor7PStlAf1B d+fNjICLPlm7O2B1ySMbXOrsSQv1RYYl6fIVW2mNAwh1fiSGtJojBTKMW3k+VmHy yjoaBRZIchoE7h4troyMEUKU04LB1wBcMKH3+1VhkHzou7A7LlIH/zAGLQtqzxOZ tANQwDh0GwQvSu++j7PuawlbM1C9hnmFp7vunN9wGkkG5XLOlYLBQUInSzhXo6fF tqGngYhNEOs7TrN2h+UfJDdspYSSqO3MX32KZPy4ZQbFRq8KiBuGcfzCLwAtl6GN x8U0DWCg0tvbE6EBoMyo5J9s5a83igXxsGfcmARVSIgWoBw8jWmKyo/pA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=C/zv9YAufZEA1vYQZ89gyFjqQ5tKRBiTvd9OZQm7wS4=; b=AwUnA8+k otv4GjsfgS/kRNyRZADBOpKQMrJ3616aHugx7CPyZJ65/X0reIOr7KukHTe4WmMQ RjlgLFtDpDYNq8ZRb9ddHKmJfE4X6Mz6zTGm639bwuH7uyNZHmWkpaeVJ81sfAKT J+XxkDmHco5uq5r3NY27wBGrxozUxM8hRiw9m2ZYJuTDwSv1IFw6X3E5NzVcPtvZ 42oB8nd88KvQgNBwfr2CxlQKqR/FBMZ/5ozoYancNLYfgSuNT/E9FgFrA+N/qgMg yN8AxmG1Px02qA5Eq2qVfjNx2sekjEzRqyquDNLdroQPRT+6EBkIMYTK+sl8IRW+ dJ2RBH4shXXu6A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvddvhedgjeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpeduhfejfedvhffgfeehtefghfeiiefgfeehgfdvvdevfeegjeehjedv gfejheeuieenucfkphepjedtrddufeehrddugeekrdduhedunecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhuvghlsehshhholhhlrghn ugdrohhrgh X-ME-Proxy: Received: from titanium.stl.sholland.net (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151]) by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 29 Apr 2021 23:59:02 -0400 (EDT) From: Samuel Holland To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Liam Girdwood , Mark Brown , Rob Herring Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Samuel Holland Subject: [PATCH v3 1/7] ASoC: dt-bindings: sun8i-codec: Increase #sound-dai-cells Date: Thu, 29 Apr 2021 22:58:53 -0500 Message-Id: <20210430035859.3487-2-samuel@sholland.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210430035859.3487-1-samuel@sholland.org> References: <20210430035859.3487-1-samuel@sholland.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Increase sound-dai-cells to 1 to allow using the DAIs in the codec corresponding to AIF2 and AIF3. The generic ASoC OF code supports a #sound-dai-cells value of 0 or 1 with no impact to the driver, so this is a backward-compatible change. Signed-off-by: Samuel Holland --- .../bindings/sound/allwinner,sun8i-a33-codec.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/allwinner,sun8i-a33-codec.yaml b/Documentation/devicetree/bindings/sound/allwinner,sun8i-a33-codec.yaml index 67405e6d8168..19f111f40225 100644 --- a/Documentation/devicetree/bindings/sound/allwinner,sun8i-a33-codec.yaml +++ b/Documentation/devicetree/bindings/sound/allwinner,sun8i-a33-codec.yaml @@ -12,7 +12,11 @@ maintainers: properties: "#sound-dai-cells": - const: 0 + minimum: 0 + maximum: 1 + description: + A value of 0 is deprecated. When used, it only allows access to + the ADC/DAC and AIF1 (the CPU DAI), not the other two AIFs/DAIs. compatible: oneOf: @@ -50,7 +54,7 @@ additionalProperties: false examples: - | audio-codec@1c22e00 { - #sound-dai-cells = <0>; + #sound-dai-cells = <1>; compatible = "allwinner,sun8i-a33-codec"; reg = <0x01c22e00 0x400>; interrupts = <0 29 4>; From patchwork Fri Apr 30 03:58:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 430314 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 750F0C43461 for ; Fri, 30 Apr 2021 03:59:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 588FA60FDB for ; Fri, 30 Apr 2021 03:59:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229965AbhD3D7w (ORCPT ); Thu, 29 Apr 2021 23:59:52 -0400 Received: from new3-smtp.messagingengine.com ([66.111.4.229]:60809 "EHLO new3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230011AbhD3D7w (ORCPT ); Thu, 29 Apr 2021 23:59:52 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id 2B29C58098D; Thu, 29 Apr 2021 23:59:04 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 29 Apr 2021 23:59:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=YEbs+BEOpZZ9t yyMXl71FJjFgn9WB+c04wCg6ag0Rvw=; b=mwhWdCoCl3MndYHXi27nvSPk0dLwm MdUmLmtyQbwiOFlcZthor1CEDhVe+DprZVFETGUGYgMQZ9G2MV3lhtM2ALR55q7y Mx/fWiunekWkvrraCHYwq3vmBnVp30TeVncN66auczu1276vaxq3Eyf+YFTb7Sy7 2FkwTXYJyLvXjj7i00Y0OXn913WYmFfRBHmlsvZKPgJIRO606CaXZw2AGBmb3CSi MRhOIhhgrvDSd34PNeyCgMiIFnSrfCDe2dREEOMVv357srd/uhw4EpMD07TgGvuK Uqft9pJd4DmZTRrdJv2IjgS2oTtRBG6b3bSTeiBKPQfidPcX7FtuC/8jg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=YEbs+BEOpZZ9tyyMXl71FJjFgn9WB+c04wCg6ag0Rvw=; b=aUa78juR a4PEBRA0HCTJrO3VnQ4hFrPy8kmc1qzWgZvBgSrO5eEKxNchd3q8btzJP8NFqFI7 0Ge3YQ2P6pxt1qabFb+cM/2tbFcyLUgAINKC7strtI6SIFGN2m5e6as/SsQ2AFvZ ammTvqKWSWd268ToStlE9FojagaBwQdeLG7ong5B2g2J48S+JCBFIZ1RB7zeVMBX VtVIF6L8U4GvcZtb4VBrmYi+CcFXFPnUi1V8FXTU6Fn/xXUNdW5IRZbrYVj6K5g7 FEWaKnUaTR9aZstlwhm4ixwfAmwtqLsg+b4x8u8MljtNeqeVU/kSCz4DQfwBt5P0 6sXsnL0TdJj53w== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvddvhedgjeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpeduhfejfedvhffgfeehtefghfeiiefgfeehgfdvvdevfeegjeehjedv gfejheeuieenucfkphepjedtrddufeehrddugeekrdduhedunecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhuvghlsehshhholhhlrghn ugdrohhrgh X-ME-Proxy: Received: from titanium.stl.sholland.net (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151]) by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 29 Apr 2021 23:59:03 -0400 (EDT) From: Samuel Holland To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Liam Girdwood , Mark Brown , Rob Herring Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Samuel Holland Subject: [PATCH v3 2/7] ARM: dts: sun8i-a33: Allow using multiple codec DAIs Date: Thu, 29 Apr 2021 22:58:54 -0500 Message-Id: <20210430035859.3487-3-samuel@sholland.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210430035859.3487-1-samuel@sholland.org> References: <20210430035859.3487-1-samuel@sholland.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Increase #sound-dai-cells on the digital codec to allow using the other DAIs provided by the codec for AIF2 and AIF3. Signed-off-by: Samuel Holland --- arch/arm/boot/dts/sun8i-a33.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi index 7344c37107c6..2beddbb3c518 100644 --- a/arch/arm/boot/dts/sun8i-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a33.dtsi @@ -198,7 +198,7 @@ simple-audio-card,cpu { }; link_codec: simple-audio-card,codec { - sound-dai = <&codec>; + sound-dai = <&codec 0>; }; }; @@ -238,7 +238,7 @@ dai: dai@1c22c00 { }; codec: codec@1c22e00 { - #sound-dai-cells = <0>; + #sound-dai-cells = <1>; compatible = "allwinner,sun8i-a33-codec"; reg = <0x01c22e00 0x400>; interrupts = ; From patchwork Fri Apr 30 03:58:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 429977 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33E15C43460 for ; Fri, 30 Apr 2021 03:59:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 045F461423 for ; Fri, 30 Apr 2021 03:59:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230085AbhD3D7y (ORCPT ); Thu, 29 Apr 2021 23:59:54 -0400 Received: from new3-smtp.messagingengine.com ([66.111.4.229]:52319 "EHLO new3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230032AbhD3D7w (ORCPT ); Thu, 29 Apr 2021 23:59:52 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id D057A580990; Thu, 29 Apr 2021 23:59:04 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 29 Apr 2021 23:59:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=RUx5Bh9JwrJMb 9tpHuRajgEQACMYEpqxwh8iy6v4q6E=; b=VPwR4moS+55tLIU7rUu1eYMhHQUrB VhaXgIAPoivFrfefbVwS4G0BQhxWkNa/fHp9LHbdvkOxMFlWAWukS41SmkSiFgoR FiiltpafefMas09qEaOXfAvLcy9uwebDoHM1NkuDmsU5CNdW3eKCH7GSyiSVZe3v /gDZZPihoYDqs99gU3tMPfX43istLsOEj9MbAd6NKVZkptUxrwe1JxfTBl5QxcnD TWlyY3Sofs5IoMU5tGuhBwxxVomN1MGxdJeRSn/M1wE6lnriPUXbiIuGyqX3ZkKj oyvnmtyvi0FBYy1Vf3Em4oiIEagmtcrGvcVYSWr7yfd1gcysr0YysOmfg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=RUx5Bh9JwrJMb9tpHuRajgEQACMYEpqxwh8iy6v4q6E=; b=hYSzl8kl a28QWqUiWgt77I09KUIxuc9LpBbWHgRiW3ymSKVAWMJ0EI1WAjF1NEiZ+NaXd3Uf Yf0TC55Q4n+T7Kfcb7O5qlJGGItm4+LQm6pvjHSTLVfS4Rh7VB62/AASMHUedvnz i8yg1kU6xYrP1653b8OcP5n0sBE0PnNbk7goGzvsdEWZwgEA9Y/jBHTssmI+ShMS VBy87utB+E8uusIfMGCcwNxgBaIpys+KVjeezZiir2pe2rS78Zd8diB+PnvS66Vi REsUxgEiqNm0L4dPA0GMgd0q5hH1Kd06Mz8FX6upIBIRe3kwpw4cXcFURJxFP8Lc N52EyJZHCP5RrQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvddvhedgjeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpeduhfejfedvhffgfeehtefghfeiiefgfeehgfdvvdevfeegjeehjedv gfejheeuieenucfkphepjedtrddufeehrddugeekrdduhedunecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhuvghlsehshhholhhlrghn ugdrohhrgh X-ME-Proxy: Received: from titanium.stl.sholland.net (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151]) by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 29 Apr 2021 23:59:04 -0400 (EDT) From: Samuel Holland To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Liam Girdwood , Mark Brown , Rob Herring Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Samuel Holland Subject: [PATCH v3 3/7] arm64: dts: allwinner: a64: Allow using multiple codec DAIs Date: Thu, 29 Apr 2021 22:58:55 -0500 Message-Id: <20210430035859.3487-4-samuel@sholland.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210430035859.3487-1-samuel@sholland.org> References: <20210430035859.3487-1-samuel@sholland.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Increase #sound-dai-cells on the digital codec to allow using the other DAIs provided by the codec for AIF2 and AIF3. Signed-off-by: Samuel Holland --- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index 57786fc120c3..3061031780de 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -150,7 +150,7 @@ cpudai: simple-audio-card,cpu { }; link_codec: simple-audio-card,codec { - sound-dai = <&codec>; + sound-dai = <&codec 0>; }; }; @@ -878,7 +878,7 @@ dai: dai@1c22c00 { }; codec: codec@1c22e00 { - #sound-dai-cells = <0>; + #sound-dai-cells = <1>; compatible = "allwinner,sun50i-a64-codec", "allwinner,sun8i-a33-codec"; reg = <0x01c22e00 0x600>; From patchwork Fri Apr 30 03:58:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 429978 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E44ADC433ED for ; Fri, 30 Apr 2021 03:59:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B979461423 for ; Fri, 30 Apr 2021 03:59:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230075AbhD3D7y (ORCPT ); Thu, 29 Apr 2021 23:59:54 -0400 Received: from new3-smtp.messagingengine.com ([66.111.4.229]:60809 "EHLO new3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230037AbhD3D7x (ORCPT ); Thu, 29 Apr 2021 23:59:53 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id 809F6580991; Thu, 29 Apr 2021 23:59:05 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 29 Apr 2021 23:59:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=pw3UViUjMVgmZ bCu3Ja0rB/pgHOsIsfcqpXmNDlOmSI=; b=a5VCO5oHhRMhi9ChsSAySrkudBfSd 0eOPTSTDwyEILVhDRxNt9KwGQI9bzarLWMiU2LJGzUBHuUmJGQ2JBv7MXmQpNx15 TnGflFX4XTBeQOWSXsuJvQbkddwCW98iveBdn1bcCsJJfia9zXkbD0SXSs4MBly1 2YAXyYiphU6nn4it7+ZIbf5F+YurYl+KKpToeVjhtH8YFRFkB8l1Oa44pE/K2lOj sWXPRIYr5PnaRn8MBcijTblGiCv85WFZhBpsGKjg4MqDmk8SgfxlyW9C5Dh6o8JL KzxLfYK3T2KzO5rfnwnr+TAp1U+8TzOK90eeHbLP70H06g6GUdhf7jKOA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=pw3UViUjMVgmZbCu3Ja0rB/pgHOsIsfcqpXmNDlOmSI=; b=a3t3wL6L TSTdfVhubUu+hKlDxFV6KYcsDtsalT2NJOpsOvwGiTDHvDzZNXlww1gXFP2AZ3Pb SNEOg2ZwOXek1JkcqMYKdk4tZmahQYNrja8uw8Jj13Pg+8h8UkNt67LhRHjNOGng 5uxN1cX2GkSsGpEOSilhZPf23TLD4lDvbFEjkVRNgGB/j/ipVrrd5iS/3ntekM8x V27x8tl41lOd2HqJjnYIb1VE/F64ng/mdUnhDNIAot/mf7Dkn2BNb/ymWma68zeh 131aeEXxiyugWYeLdeGoo67wRfcu8i6BUpJKmbOo60XpjnLwTz/kyjp6683HUEmm BQrkkoKZCf2bxg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvddvhedgjeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpeduhfejfedvhffgfeehtefghfeiiefgfeehgfdvvdevfeegjeehjedv gfejheeuieenucfkphepjedtrddufeehrddugeekrdduhedunecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhuvghlsehshhholhhlrghn ugdrohhrgh X-ME-Proxy: Received: from titanium.stl.sholland.net (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151]) by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 29 Apr 2021 23:59:04 -0400 (EDT) From: Samuel Holland To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Liam Girdwood , Mark Brown , Rob Herring Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Samuel Holland Subject: [PATCH v3 4/7] arm64: dts: allwinner: a64: Add pinmux nodes for AIF2/AIF3 Date: Thu, 29 Apr 2021 22:58:56 -0500 Message-Id: <20210430035859.3487-5-samuel@sholland.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210430035859.3487-1-samuel@sholland.org> References: <20210430035859.3487-1-samuel@sholland.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Now that the sun8i-codec driver supports AIF2 and AIF3, boards can use them in DAI links. Add the necessary pinmux nodes. Signed-off-by: Samuel Holland --- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index 3061031780de..a583355a3128 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -658,6 +658,18 @@ pio: pinctrl@1c20800 { interrupt-controller; #interrupt-cells = <3>; + /omit-if-no-ref/ + aif2_pins: aif2-pins { + pins = "PB4", "PB5", "PB6", "PB7"; + function = "aif2"; + }; + + /omit-if-no-ref/ + aif3_pins: aif3-pins { + pins = "PG10", "PG11", "PG12", "PG13"; + function = "aif3"; + }; + csi_pins: csi-pins { pins = "PE0", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11"; From patchwork Fri Apr 30 03:58:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 430313 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53AC8C43461 for ; Fri, 30 Apr 2021 03:59:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1AB606141C for ; Fri, 30 Apr 2021 03:59:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230111AbhD3D7z (ORCPT ); Thu, 29 Apr 2021 23:59:55 -0400 Received: from new3-smtp.messagingengine.com ([66.111.4.229]:46209 "EHLO new3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230061AbhD3D7y (ORCPT ); Thu, 29 Apr 2021 23:59:54 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.nyi.internal (Postfix) with ESMTP id 4BD66580992; Thu, 29 Apr 2021 23:59:06 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Thu, 29 Apr 2021 23:59:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=Dvnv9iv8lzVpm qWT03DWw0xg+FDgyNq03CXrBpobr4A=; b=iN9a7vILYCv2Fvivk8mLoQyWk/o/2 Khlb5w1GtcwdTXsyAHxg6uAuyzm8W0xDbduM/SVD2SbmP7Buq5qJNP6gfCVrz8Oz 5vR6nknDeSwroH0ytq1IgDLgyCk2o/N9JR4NHkhP9N1JtwYhfXpQYt9y0lav9ykh AYkzo3FLdD5TKSD6cal7U1Jiw3sotuCp+VQzwPjQ+PMibZln5Fw01lvVtjgtYGTg UIzpTyjWa9AHmLL0sRqlu88y38Ep6L7bLy6KcNdA7LhfNKrN0J2sGuHyJ0+MriBo 1kwF3DD+z8oInnRsAh2yAWNVYjH7sjqQBSx9+b/DFK3+RzAL90U9YzgVA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=Dvnv9iv8lzVpmqWT03DWw0xg+FDgyNq03CXrBpobr4A=; b=sOXQAydO qXR9AA28GrFCHff/YKFq2XmgLTvFzaPntlAHAjWnW2v3eGobJZNwzU84c0Xmafn9 I5/a5oZ3aiG7/Pn6CMgYEj2VmKxo9+EDj8tkpIVjk/cfGnrPYryGGVQVH0YiekdO nZ8VM7wpjOvoQGGdZS46gZus3LVWTAoed/U+O3TOLlSQh4eSTf0FOGHzVh1tYFHn LJLGSh/qh2HWKTsAlYrBpezteWqog2NZcLNLhkvmbmfMr5TjWqz5BaWBwesrQQfA iuH9LCvE5MK3FXX9R8ncxGBN9iYgAgiQDLBVNp0PMNLj98hhKXPVJ+koZYhKDeec Z6UoZ64X7YEWMg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvddvhedgjeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpeduhfejfedvhffgfeehtefghfeiiefgfeehgfdvvdevfeegjeehjedv gfejheeuieenucfkphepjedtrddufeehrddugeekrdduhedunecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhuvghlsehshhholhhlrghn ugdrohhrgh X-ME-Proxy: Received: from titanium.stl.sholland.net (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151]) by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 29 Apr 2021 23:59:05 -0400 (EDT) From: Samuel Holland To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Liam Girdwood , Mark Brown , Rob Herring Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Samuel Holland Subject: [PATCH v3 5/7] arm64: dts: allwinner: a64: Allow multiple DAI links Date: Thu, 29 Apr 2021 22:58:57 -0500 Message-Id: <20210430035859.3487-6-samuel@sholland.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210430035859.3487-1-samuel@sholland.org> References: <20210430035859.3487-1-samuel@sholland.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org simple-audio-card supports either a single DAI link at the top level, or subnodes with one or more DAI links. To use the secondary AIFs on the codec, we need to add additional DAI links to the same sound card, so we need to use the other binding. Signed-off-by: Samuel Holland --- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index a583355a3128..5734b4825f64 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -131,12 +131,10 @@ psci { }; sound: sound { + #address-cells = <1>; + #size-cells = <0>; compatible = "simple-audio-card"; simple-audio-card,name = "sun50i-a64-audio"; - simple-audio-card,format = "i2s"; - simple-audio-card,frame-master = <&cpudai>; - simple-audio-card,bitclock-master = <&cpudai>; - simple-audio-card,mclk-fs = <128>; simple-audio-card,aux-devs = <&codec_analog>; simple-audio-card,routing = "Left DAC", "DACL", @@ -145,12 +143,19 @@ sound: sound { "ADCR", "Right ADC"; status = "disabled"; - cpudai: simple-audio-card,cpu { - sound-dai = <&dai>; - }; + simple-audio-card,dai-link@0 { + format = "i2s"; + frame-master = <&link0_cpu>; + bitclock-master = <&link0_cpu>; + mclk-fs = <128>; - link_codec: simple-audio-card,codec { - sound-dai = <&codec 0>; + link0_cpu: cpu { + sound-dai = <&dai>; + }; + + link0_codec: codec { + sound-dai = <&codec 0>; + }; }; }; From patchwork Fri Apr 30 03:58:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 430312 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50695C43470 for ; Fri, 30 Apr 2021 03:59:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 215FB61419 for ; Fri, 30 Apr 2021 03:59:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230092AbhD3D75 (ORCPT ); Thu, 29 Apr 2021 23:59:57 -0400 Received: from new3-smtp.messagingengine.com ([66.111.4.229]:50471 "EHLO new3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230090AbhD3D7z (ORCPT ); Thu, 29 Apr 2021 23:59:55 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailnew.nyi.internal (Postfix) with ESMTP id 70A4258098B; Thu, 29 Apr 2021 23:59:07 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 29 Apr 2021 23:59:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=bZ5Jq/1+ZthwK TvuIq15eH/CIV4N1NBK/xFYSqK20FA=; b=Xwz5L2eWhQfh9qWryMixZTGZUdZ/o AGvrmkXe4K4YnKORZBkoH7+V0ID0bBnqmGYsW+qDt125V2ffHDqyUsjYOnGNFgVe rljCEEgfDZdv2w1JxG8IC9Pyv6gV7zydAN9EpwwagqpwK1NWEU2PpyvJxvtPhpyu MKmi/RW6ARObfgn/guPWgfh3BYOw+8X45s0vzVECdBfwxXtZ/7cs81p0zYjT2w8q JQh10HhthUdcxdU4JND7TzsRcUvJJwfvtpABUQTG1mtB0ws2cQN9OiS7zD97vQjs kYwmTvoKkCCrW/hlJOA1wYCkLmZi9a5j71qMNn+LEpHWfjKDKXCO6o8JQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=bZ5Jq/1+ZthwKTvuIq15eH/CIV4N1NBK/xFYSqK20FA=; b=eLXcISbW lqCxdLxiK35V7QEUswLanJaWpAts4+9v+C9YhiWuVa6K+6f0h3QEMQQXXD2CUuka qupXy9+9naEkHfAM61ib6Bzj9c8gR84FXEjoX2VMvsYq3uLgZMfIThPMf95f7786 HJFn3bwtwtq7EP3saeyqFVn4x2b6R0zjCtQ0A3ZmGdNyy/OQKchdn4VXeE3RArhX WBVcRIAZa0bSIFbd14l2WXjXcSHtXZYZ1ONarTYSVuVOYUIYf27eYuhpaMzYdN4q 4dnxu76YaKS5QLsr92EgGDuEDfIxAUA3XR+Hoa6/1j10P8E88mm9c9WGpLeVRK3z TgazJ3g/4CEtAw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvddvhedgjeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpeduhfejfedvhffgfeehtefghfeiiefgfeehgfdvvdevfeegjeehjedv gfejheeuieenucfkphepjedtrddufeehrddugeekrdduhedunecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhuvghlsehshhholhhlrghn ugdrohhrgh X-ME-Proxy: Received: from titanium.stl.sholland.net (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151]) by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 29 Apr 2021 23:59:06 -0400 (EDT) From: Samuel Holland To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Liam Girdwood , Mark Brown , Rob Herring Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Samuel Holland Subject: [PATCH v3 6/7] arm64: dts: allwinner: pinephone: Add support for Bluetooth audio Date: Thu, 29 Apr 2021 22:58:58 -0500 Message-Id: <20210430035859.3487-7-samuel@sholland.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210430035859.3487-1-samuel@sholland.org> References: <20210430035859.3487-1-samuel@sholland.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The PinePhone has a Bluetooth chip with its PCM interface connected to AIF3. Add the DAI link so headeset audio can be routed in hardware. Even though the link is 16 bit PCM, configuring the link a 32-bit slot is required for compatibility with AIF2, which also uses a 32-bit slot, and which shares clock dividers with AIF3. Using equal clock frequencies allows the modem and headset to be used at the same time. Signed-off-by: Samuel Holland --- .../dts/allwinner/sun50i-a64-pinephone.dtsi | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi index 9f69d489a81d..51cbfdc12936 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi @@ -25,6 +25,11 @@ backlight: backlight { /* Backlight configuration differs per PinePhone revision. */ }; + bt_sco_codec: bt-sco-codec { + #sound-dai-cells = <1>; + compatible = "linux,bt-sco"; + }; + chosen { stdout-path = "serial0:115200n8"; }; @@ -91,6 +96,8 @@ vibrator { }; &codec { + pinctrl-names = "default"; + pinctrl-0 = <&aif3_pins>; status = "okay"; }; @@ -447,6 +454,23 @@ &sound { "MIC1", "Internal Microphone", "Headset Microphone", "HBIAS", "MIC2", "Headset Microphone"; + + simple-audio-card,dai-link@2 { + format = "dsp_a"; + frame-master = <&link2_codec>; + bitclock-master = <&link2_codec>; + bitclock-inversion; + + link2_cpu: cpu { + sound-dai = <&bt_sco_codec 0>; + }; + + link2_codec: codec { + sound-dai = <&codec 2>; + dai-tdm-slot-num = <1>; + dai-tdm-slot-width = <32>; + }; + }; }; &uart0 { From patchwork Fri Apr 30 03:58:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 429976 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13634C43600 for ; Fri, 30 Apr 2021 03:59:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D1A1760FDB for ; Fri, 30 Apr 2021 03:59:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230128AbhD3D75 (ORCPT ); Thu, 29 Apr 2021 23:59:57 -0400 Received: from new3-smtp.messagingengine.com ([66.111.4.229]:43291 "EHLO new3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230126AbhD3D74 (ORCPT ); Thu, 29 Apr 2021 23:59:56 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailnew.nyi.internal (Postfix) with ESMTP id 3C889580990; Thu, 29 Apr 2021 23:59:08 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 29 Apr 2021 23:59:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=klNuigViCSgbY D+5aBtDCyvX8D0xhoqYJ1AnG3UNN20=; b=IcstK0OjpRCuhXgy7ZrYLs7PAfnh5 kcFslzfniNLl2h6DBc7yB/5r8KrnogIgp4gKzHDBs5R7DlCJzfTh//HLsNMHFnNt 9eqq5lg9f93FNAzx3y4OpZKEB847yJLOtN2+vYcM4nnNKxfMaAQGZO8vMxliiUNk TScITXLCCdc5b4ojEqaMJTvxgSE1LjeBddNktHX8nknoqQYwn/PLeMgxzg/87+om rmwFQ0R0hyjcComgiRrq9AnnwPJr1dkrJ3WcFYEmZYdtD8POg2nPKPa5kInIaRs+ aNV0yuTKVSemigTG9FEplSC4tVYZzjCs9YaT03Ft3VS/xG37Z36we6IUQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=klNuigViCSgbYD+5aBtDCyvX8D0xhoqYJ1AnG3UNN20=; b=QjgomTaU T8TMiLB8al919KfDxK7JRc+HXeI6UEjlqw7q9XV1rpI/v/a8GaCpd2HPE4Db7UmT fWN4Aef+CU3tCtmcWOeFp/g+mfBuy0/o32QcwugKJKlkTbp03If18R9IuoPIL2nw UhrGkfwrlLilgh76+tJ+WBqmQNU14bsu8dd7iLq7XrHUd6OqLJ59fiCl7z4oWYLs RZBFccvWVvSXGzpS/abVuffDY/P0Cyw6HMAB01/1vS2AbXZAy1G8N1dxGvCBtn80 Wo1Rt02MJPCegiSIvJH3vp/53Ajs3wKK+SqHzZSRvrvA9T7mInlBz6btjAl9MUlO YcfVlM+9xOkysQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvddvhedgjeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpeduhfejfedvhffgfeehtefghfeiiefgfeehgfdvvdevfeegjeehjedv gfejheeuieenucfkphepjedtrddufeehrddugeekrdduhedunecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhuvghlsehshhholhhlrghn ugdrohhrgh X-ME-Proxy: Received: from titanium.stl.sholland.net (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151]) by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 29 Apr 2021 23:59:07 -0400 (EDT) From: Samuel Holland To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Liam Girdwood , Mark Brown , Rob Herring Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Samuel Holland , Arnaud Ferraris Subject: [PATCH v3 7/7] arm64: dts: allwinner: pinephone: Set audio card name Date: Thu, 29 Apr 2021 22:58:59 -0500 Message-Id: <20210430035859.3487-8-samuel@sholland.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210430035859.3487-1-samuel@sholland.org> References: <20210430035859.3487-1-samuel@sholland.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Arnaud Ferraris Add the "PinePhone" name to the sound card: this will make upstreaming an ALSA UCM config easier as we can use a unique name. It also avoids an issue where the default card name is truncated. Signed-off-by: Arnaud Ferraris [Samuel: Split out change, updated commit message] Signed-off-by: Samuel Holland --- arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi index 51cbfdc12936..02712f85f6bd 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi @@ -433,6 +433,7 @@ ®_rtc_ldo { &sound { status = "okay"; + simple-audio-card,name = "PinePhone"; simple-audio-card,aux-devs = <&codec_analog>, <&speaker_amp>; simple-audio-card,widgets = "Microphone", "Headset Microphone", "Microphone", "Internal Microphone",