From patchwork Wed Jan 13 06:06:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 12015825 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 C8EA8C433DB for ; Wed, 13 Jan 2021 06:08:56 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4E6F923125 for ; Wed, 13 Jan 2021 06:08:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E6F923125 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sholland.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=H4nOc455rwRq7itr5xlMoAgXj7w27ewG+0S31P4EDuY=; b=dvyT7/d4ASUQwD+l7BdFQvQHJ yiZ7a9AjddWXddWwt3OBh95/cQD0F5ml1zjUnrSNIYIpglnCdgkGzO/rYaAnPFg/dsLoyZFzvMAuj umlum1ARMWVDiBR1dJrSD3aLOtHDcQ1GFTRzfaaiAhOLMObgEhNw9sz3M/C5PX0bipTD5UXI7ke8h 1tqLxmLaN/Dg0RVnAwl32Hujr0+qQiGLyydyoq8Jav1JDTMq25LqrJLCCgpQGaaR49/bc38Sy49On 6nxJ9M/wIL1P7f2UQZrCLAvEHr4DWBI0THLxRoRqgG47iVDyTxxfm+tamTaJqqRIX9aTXYoBvJsoG RN/hXrQ0A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzZIp-00012h-Rd; Wed, 13 Jan 2021 06:06:45 +0000 Received: from wnew2-smtp.messagingengine.com ([64.147.123.27]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzZIU-0000vH-Jw for linux-arm-kernel@lists.infradead.org; Wed, 13 Jan 2021 06:06:26 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id 7DFA91B92; Wed, 13 Jan 2021 01:06:18 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 13 Jan 2021 01:06:19 -0500 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=fm1; bh=satIn0D2dr0dK CzgUTF/ukd8o810xusPKG6T6TQ2h4M=; b=K5JtOKfG3NC+IAjv19T8b28kPDuA3 ExXfYx4Tn8eRhY25upypD8x9h2lbAskvmAncoKCz5asRvwgENm9cIoDNiSA9OfdU oZ1Ff9ChwTftwyi6ZSQm/OVeIqquwzIr38CR3jA05f/UFYCztGSGBWPtNzRw7/// oDCJTbqMTQO/vJ/7XEmre+iT5Rh1yAfC5eazdz9T7nEz6aZ2O3zL/wrKbG2bkYKL P5w6vfJawiT69lNvyNuYvZi2GPJgVI2q9Z1pixBuu069Y5I6YAPQ2F9xmfgbcZlB LMHQY+b5YgOyonV6miZGUN4797CdV3a/Qu6qP7mcvdboyNLLKzuu5Kf/Q== 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= fm1; bh=satIn0D2dr0dKCzgUTF/ukd8o810xusPKG6T6TQ2h4M=; b=F2uVzt61 cK13UPu9AOkV4FGVyEjgs5sg6m17AeksdwVEWKWkWP7BSmXHOCVAtgi+I/ZSpHsn 6xuhXBpZ5NpAYvW3uMs7oVraR8CMTEMcy7Fq4DQT1QpxSds6GZ7FYsMJeRrMTUS2 sbEyZ+WxBOZaEHghVhCKza6blKIrkbKfBWy7SkHE69acNY2tt5qddPHb+kltxRQm S7rmRTgBsXc4AOpqEVjRmOGl2ZrvtQpYt+EaFCjwBHoAlZWQQotOlNhGAvxooC8D H+Oj/HabK2cKYLPlWb4oxHwlv68+BxuEbllJ7VWFArf/ZhxbXFGvvAavqZLqxyJP GjLDUSLAMXIAPA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedukedrtddugdelfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhuvghl ucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecuggftrf grthhtvghrnhepudfhjeefvdfhgfefheetgffhieeigfefhefgvddvveefgeejheejvdfg jeehueeinecukfhppeejtddrudefhedrudegkedrudehudenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmuhgvlhesshhhohhllhgrnhgu rdhorhhg 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 id D504F24005B; Wed, 13 Jan 2021 01:06:16 -0500 (EST) From: Samuel Holland To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Liam Girdwood , Mark Brown , Rob Herring Subject: [PATCH v2 1/7] ASoC: dt-bindings: sun8i-codec: Increase #sound-dai-cells Date: Wed, 13 Jan 2021 00:06:09 -0600 Message-Id: <20210113060615.53088-2-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210113060615.53088-1-samuel@sholland.org> References: <20210113060615.53088-1-samuel@sholland.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210113_010622_798712_E3CAF730 X-CRM114-Status: GOOD ( 11.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Samuel Holland Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 --- .../devicetree/bindings/sound/allwinner,sun8i-a33-codec.yaml | 4 ++-- 1 file changed, 2 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..3e02baa1d9ce 100644 --- a/Documentation/devicetree/bindings/sound/allwinner,sun8i-a33-codec.yaml +++ b/Documentation/devicetree/bindings/sound/allwinner,sun8i-a33-codec.yaml @@ -12,7 +12,7 @@ maintainers: properties: "#sound-dai-cells": - const: 0 + const: 1 compatible: oneOf: @@ -50,7 +50,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 Wed Jan 13 06:06:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 12015823 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 BB54CC433E6 for ; Wed, 13 Jan 2021 06:08:34 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 677C523131 for ; Wed, 13 Jan 2021 06:08:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 677C523131 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sholland.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=vkEg8JBlY9b3zR+Uom23foeD5yzSpboym6uVHbVqTTM=; b=vOGUMpp1xxpCx8q/+RJOPIioT LtK7pHR7tOgEsBSxnnWObmyegVKJIQT0pw3d2HeKbxyl8yvxIJtmVhyu7g+JgVPv+sdnR+EXjjCKn jP2dING8I1gLuBqeaVF5Ux/2zOJV9x3MkqtUcSQ51p5PWqRLfiRTokJu7ZiLRawhlf7ay4ObrRr6b ttWtIMF/5tBfMd452KW2di0Yb4fPj7CRjVMvdz/q6xCZiAPgEmJVjmDaoN0x2P03WVshHF+rmva3x dZjDh1E8OVK+xWEbI+DN+2vKiuE/0fTD5HjCZzZGidW+uGkoAue1WdpSO+LzA8Rv8PT+uUvRlEvVS HZXDOERog==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzZIj-00011I-Up; Wed, 13 Jan 2021 06:06:37 +0000 Received: from wnew2-smtp.messagingengine.com ([64.147.123.27]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzZIU-0000v7-1n for linux-arm-kernel@lists.infradead.org; Wed, 13 Jan 2021 06:06:26 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id 7C5671B80; Wed, 13 Jan 2021 01:06:18 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 13 Jan 2021 01:06:19 -0500 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=fm1; bh=O2ch6PxeaPKIY rDAylcvcJjLc0v52L8vH5z7zkCbnsg=; b=NSFYGKXSsI5M+y7vkGCKM2ltTTNhR wPdcjXSTY/pKOJWturaotNCPjIJf4/2/1IFjTDMmjsQ0hKFympp90spWwP5SK1hA 3WGJVBrm60fifmMIGRgohDfSijoHh8lYQnYNNI/VVz3Wg1OWEJZLCL4CRJ9FEwhX BuB6wbhQKXWY3nn9rDltUhKXAbXNqhJxveHvZZo7xxMU/PeQjC1ehW6M9Hr7aqNk DPsAZdmgjiFQwRJb5Xxeui982UqB3In4VsTSQmV4fpiSKfjlYQ/YZBqDX4ZnyGc0 bqfTmICT15mUo85CSRhRNUIvqBs7aBuGDB6VhFMdj6U7G37ty96O83QKQ== 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= fm1; bh=O2ch6PxeaPKIYrDAylcvcJjLc0v52L8vH5z7zkCbnsg=; b=NEybdZcS B0WODOP25ZWCQewJ9o88u9uUtXDgQSOacS8eqj7lCYQCGkzzELXGzZNutCS0FXpM /+z7OI7mOnd677KEMBR/+6WmCenprZX5nuNCjB3TFar6U9TIgtaRDFTkXvrhBFTy fwdQwWmV13R7LzdsGHxTcmqUr598b5DHE5ksTXwRdk+PB3nO05ScmFGzU32OzBSe rVNhF5L8pEoPJgDH0I4n1F1teeZTtLeh70PnSX4uXE6ZFszllGa+vkxCOJVgcMM+ 6s0r8QkxTUzqFyzQ8lE7aGeHjYH87SWVJIc2l148bAj7TL2gob0PDL6ZJsLnNYBN L4l74kLpmQL7Xg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedukedrtddugdelfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhuvghl ucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecuggftrf grthhtvghrnhepudfhjeefvdfhgfefheetgffhieeigfefhefgvddvveefgeejheejvdfg jeehueeinecukfhppeejtddrudefhedrudegkedrudehudenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmuhgvlhesshhhohhllhgrnhgu rdhorhhg 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 id 52DC224005C; Wed, 13 Jan 2021 01:06:17 -0500 (EST) From: Samuel Holland To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Liam Girdwood , Mark Brown , Rob Herring Subject: [PATCH v2 2/7] ARM: dts: sun8i-a33: Allow using multiple codec DAIs Date: Wed, 13 Jan 2021 00:06:10 -0600 Message-Id: <20210113060615.53088-3-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210113060615.53088-1-samuel@sholland.org> References: <20210113060615.53088-1-samuel@sholland.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210113_010622_346193_0ADE6033 X-CRM114-Status: GOOD ( 12.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Samuel Holland Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 c458f5fb124f..0b38f9f35074 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 Wed Jan 13 06:06:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 12015819 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 4807EC433E9 for ; Wed, 13 Jan 2021 06:08:08 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0572E23125 for ; Wed, 13 Jan 2021 06:08:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0572E23125 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sholland.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=6HX2H0D80A90JvEJqgis/uOsDU5Q/qAgviFdYBJ7waA=; b=ge14cUzHFP0wusPXTS3VsfCHf 3mGMG2ssJGJ78R4LfvhjSh6rXmiqLbQBilNep8OPY/UCt8mhb+cmmtK0LnoygSegwiBeWjehlmWfU yyUe0hVumxOMWI/qqinXKCOw35IBpoTuYqpvTC4NMN21tmX7KLf0CcNZnPHNefB1W9C1dS3cQ9yHd j51xkHwM226kTTWBVsZo1BcUh/FH9byG8Gl/59F8Py5Azu6dNYsD40nkqSamC4X7ocpc+ByaMPe8p tBMYxL3t5OnhREoCDk2K3uL+I5qJIVA4GxcQAT1WRY4iBawOTH4Q8tBD+pYzaq7S74QkSAe7kZbxL MfRnV0MxQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzZIc-0000ys-E9; Wed, 13 Jan 2021 06:06:30 +0000 Received: from wnew2-smtp.messagingengine.com ([64.147.123.27]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzZIU-0000v9-1H for linux-arm-kernel@lists.infradead.org; Wed, 13 Jan 2021 06:06:24 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id CDC631B9D; Wed, 13 Jan 2021 01:06:18 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 13 Jan 2021 01:06:19 -0500 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=fm1; bh=qi0fOw9H8C1Vi Fkj0YkahjjwxVo63pIP76xBkJLDhaY=; b=qqLUECSgo5nTZwxFLsawsi3L3cR90 NArrMg/z4vVlAKY62f53kMZO3pCzjOnsqqk3PttqXN1IWxZHRQiOjvwx36PNScsA wGAeJiSGcBt9/C2mNSQaNS0/mcztTjhukACnCt6VW//G3kT5fC9nDPc6LimK7cUZ 37lI3n60XsUfFwzMeOiXDTGyDLaDuxThPsQ32CuT8+Lyk8NzX33nSawgV73OpFWz Gwtr0hreOKOyhxceAcnNoBhJ5OY/uYpUzSBQ/ugLmZc6795SQ6Nfjs0lqN3eVLvX inQTewhUuKGfK6cBBWgd6iBLzL8HUNIR+usEWfrJaQBap1ASTxWx9tP2g== 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= fm1; bh=qi0fOw9H8C1ViFkj0YkahjjwxVo63pIP76xBkJLDhaY=; b=TKAAkpgS fD6lxJw3LLnY8NIwPj43Gff9MSEtx216vBK7QgepNBbDzDcmg7D2psjAdJTV6Rfp 5MJZovAo6YIqbwYyUlDA0M6jg3IrTxWf2p90Mh12NcKs9mhT+zPP8DRACBnWS7as mLh7oEfO6e/CMjNC//cLrRnRxclubdRnrHou8n3i4VPZtYU+WpM6ldUCSVVVI3RX SvXsIhpMCJFXFo3c7oGYdKn2QD97yMzM+5M7/gONWyEO7IQFkmmZChuDmpjq+QOd I3Hp28qJjXuuXYXok5w3rHMk+Q411f9zNPl4boAGQe7QAj7xBBr8gUHPyZaLJfTr QhHIYWAiN9mFCA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedukedrtddugdelfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhuvghl ucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecuggftrf grthhtvghrnhepudfhjeefvdfhgfefheetgffhieeigfefhefgvddvveefgeejheejvdfg jeehueeinecukfhppeejtddrudefhedrudegkedrudehudenucevlhhushhtvghrufhiii gvpedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmuhgvlhesshhhohhllhgrnhgu rdhorhhg 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 id C336024005A; Wed, 13 Jan 2021 01:06:17 -0500 (EST) From: Samuel Holland To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Liam Girdwood , Mark Brown , Rob Herring Subject: [PATCH v2 3/7] arm64: dts: allwinner: a64: Allow using multiple codec DAIs Date: Wed, 13 Jan 2021 00:06:11 -0600 Message-Id: <20210113060615.53088-4-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210113060615.53088-1-samuel@sholland.org> References: <20210113060615.53088-1-samuel@sholland.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210113_010622_172769_79FB5092 X-CRM114-Status: GOOD ( 11.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Samuel Holland Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 51cc30e84e26..e788251e582f 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>; }; }; @@ -874,7 +874,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 Wed Jan 13 06:06:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 12015827 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 C1597C433E0 for ; Wed, 13 Jan 2021 06:09:05 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7F3C323131 for ; Wed, 13 Jan 2021 06:09:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7F3C323131 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sholland.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=W5vrnzjbWss5BDPZzf5/kfZKgeP3vM5Z43fdSXGSzM4=; b=uFJpTjIf5+n3IIBJODe9kesgf jNXQxEdBCVURAHu7HU5T/by/VNSZxktOfaG7k4er/LSwdZZFikf4q6j5tGxRN843mSARoAkuFkmCI 23FLqeTBwux9yAVJ8InzYWreFi7DTa28djoSEkLApUren//5sef60ZKxIt+nuEG+q2gb02sabOkTc 6nVuYmwNeWtfheAF0ctEDfZr0HSJtxTAJ8P6YX8Q+gjUcd26pMDA6MFZeuABau9BWNxlrasXmoUEH ppyQalRSP7TT+dUHEeX8dQ2QUlnymDEtOXlAys/+D59Wxd1Qx+gx51Cz9am5VrzMAHA5MLfJ74fr/ dSUUGskWQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzZIv-00014U-Ih; Wed, 13 Jan 2021 06:06:49 +0000 Received: from wnew2-smtp.messagingengine.com ([64.147.123.27]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzZIU-0000vD-2r for linux-arm-kernel@lists.infradead.org; Wed, 13 Jan 2021 06:06:26 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id 462D91B9B; Wed, 13 Jan 2021 01:06:19 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 13 Jan 2021 01:06:20 -0500 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=fm1; bh=ZYsMQQjTX9JKz 4LOeiCvHDrsib2JqS0VKF0I+SixF8c=; b=U4VZi+lct8w2G6VsOrcK7zGoJKcbC kGWNIrPrZRZ+rj5R8NsGFNkWgOeZorsqnWlfwayfi03kJs7qfJTs4y70TeYHsvDD cssjgQ7u68IYZwMSHteC2wAqdkyymobEe4WVX3eFMg3AUecEcraNOC5dWwVya8Pj MZkKgsQGExzGD82i+RRQWnFVCFRheihsswl6bpTyXUwMqRAcysa0VP8KJwwVUyy8 8CrGz6oyU/sCeYwh9MtsTYgh831nIDiDyqxBXTocccW8Vwz6+rKP1B+cPWQn58my YkTR+Mnov1FiVNBEoqdtP7Dbuh32RzzkaS8ZZj21lsLgjBmP4P2D+QF0w== 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= fm1; bh=ZYsMQQjTX9JKz4LOeiCvHDrsib2JqS0VKF0I+SixF8c=; b=cFjuIyEf KiLkbZOzM4scyeolbk0h4n2Lq5ItD3HNFbvfYO18WUgfvrUYHntD/EipU/fobp11 bB2COac2hxc8NUTVJbV2bw+/h5YgBkvP7HAbUlPP6U6AECoQgi36iG3Yqef9e5YJ AuStHMdihgPPzBz9X7d6g3b0SGnRHkZYxTs09Gv8vFpLF1IwL55o1qpz0WyFoMWv 6xWkWpfUTV+LxJottYbAeIhNBpGBvbI7naqN/qyvbzHYhNpQNdOLkvGTmn13SrNi 65oRZfUNduEwQ87Ggb6A1bfyfuyxR0jwkqduKasaf90IIh8PtCrLvEHkbSCxJ84a YKgvjQoW+KDVIg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedukedrtddugdelfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhuvghl ucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecuggftrf grthhtvghrnhepudfhjeefvdfhgfefheetgffhieeigfefhefgvddvveefgeejheejvdfg jeehueeinecukfhppeejtddrudefhedrudegkedrudehudenucevlhhushhtvghrufhiii gvpedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmuhgvlhesshhhohhllhgrnhgu rdhorhhg 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 id 4125924005D; Wed, 13 Jan 2021 01:06:18 -0500 (EST) From: Samuel Holland To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Liam Girdwood , Mark Brown , Rob Herring Subject: [PATCH v2 4/7] arm64: dts: allwinner: a64: Add pinmux nodes for AIF2/AIF3 Date: Wed, 13 Jan 2021 00:06:12 -0600 Message-Id: <20210113060615.53088-5-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210113060615.53088-1-samuel@sholland.org> References: <20210113060615.53088-1-samuel@sholland.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210113_010622_364312_E77B1AD2 X-CRM114-Status: GOOD ( 10.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Samuel Holland Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 e788251e582f..4bba468d8ec2 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -654,6 +654,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 Wed Jan 13 06:06:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 12015831 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 D4D19C433E6 for ; Wed, 13 Jan 2021 06:09:14 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4293F23125 for ; Wed, 13 Jan 2021 06:09:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4293F23125 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sholland.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mgUap0vuuafoOQC6pjNLCdPfr+R2z7w3On4xWraYFhY=; b=feuA8voyPFq79D4tVbJEjC8jO psW7lBVMN2mfJUBH+qSg4BZT4Q7xuta7Ajviy7/m168ZYNb41s7orMrrFeZBIf9nOmQo4Yo2MRC9A l64+nAAkE+fJtOlFCiGWvYGvicWbYbOuMVGHpH7pRy98zrCuJfS389poh6OvU4nLDTIfd7Nm3Z+cY 7XeGvqUxCQpL4RssLKFjnKi9B1V9Bd5DLjd1jDhkxHTkVAgdnPJu8t0AN/ixK0jTaPptnSFiDlirq FBUuJRbPoP/DQUfpdnANGKNNo1CzPys4t9eAJfPrw0M3O6JLrIukoyS3qTNlrBbp5n3WanfwfoO/b XBM16PrlQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzZIy-00015Z-81; Wed, 13 Jan 2021 06:06:52 +0000 Received: from wnew2-smtp.messagingengine.com ([64.147.123.27]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzZIX-0000xT-Fr for linux-arm-kernel@lists.infradead.org; Wed, 13 Jan 2021 06:06:29 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id 043591B94; Wed, 13 Jan 2021 01:06:19 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 13 Jan 2021 01:06:20 -0500 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=fm1; bh=Oda4KQahWE9Uh MYoMLXF4jmERx7gEcdKJ0UOyDojC+8=; b=feUoPkU3lkUTQlnh9ACSfdVpJwdlR Xc7y5IYcBRp2dy9LYEEVDOHsKdmW0F/uzc3R+YLWYJlbB4riXfMPBaz0JOWUMVlW 3skstspY2PN3QhcVXnMtVJoqIXkJNIvyGylwxxplpSae3y6lQMM1V1uUQwgqD9Cu /+UV5N2JYbLYr25gSmTYLn1WMtPJrZVq1BLJmvVrbesx+l42NecBMCSMz4aCNoFa AohSQkrQ6zvBZE6vkbj5NF95msk5rXHWRw3c8T//jozYa7KLaQ0qtdumjAvwk9ZX G43KpelOS0tV+DV8eH+stMNwxmg/9YNC4dPwH505xN4USUSidVL9YvT9A== 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= fm1; bh=Oda4KQahWE9UhMYoMLXF4jmERx7gEcdKJ0UOyDojC+8=; b=WT9yw4L1 Luc0ygtIoRUVsW03y2KU4GK0auAmJ/3PAKifBkP7rdEi+Ft5E/RoBbhgcAdJ1YCB 52ESEHR8+ktRTzsw77G29IWvspMntXYMWV8eSOMnmgcx/n+E5HT99oHSFVTliu83 7ioI1VfGwMASFowiT9o2lL1lRDshKVtCd6Vm6eRIncv0UzsTNeWyL1AJ9tt/0qmo TcxevckqI3kEZjO2d2oc7xljcTvB+SqfDhfWLE3zcguydaEQ7HgXXRnaaVs4dkHC VGrFSv1Sy0Gyr4/MIRAgIbjjxnoyX7HWbaPsyp1X5QWRhS3b2QH9Z+cTOUc5F7r7 Yutqyw/B84j/8A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedukedrtddugdelfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhuvghl ucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecuggftrf grthhtvghrnhepudfhjeefvdfhgfefheetgffhieeigfefhefgvddvveefgeejheejvdfg jeehueeinecukfhppeejtddrudefhedrudegkedrudehudenucevlhhushhtvghrufhiii gvpedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmuhgvlhesshhhohhllhgrnhgu rdhorhhg 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 id B190324005E; Wed, 13 Jan 2021 01:06:18 -0500 (EST) From: Samuel Holland To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Liam Girdwood , Mark Brown , Rob Herring Subject: [PATCH v2 5/7] arm64: dts: allwinner: a64: Allow multiple DAI links Date: Wed, 13 Jan 2021 00:06:13 -0600 Message-Id: <20210113060615.53088-6-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210113060615.53088-1-samuel@sholland.org> References: <20210113060615.53088-1-samuel@sholland.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210113_010625_746897_C7D0482F X-CRM114-Status: GOOD ( 11.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Samuel Holland Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 4bba468d8ec2..fd9a278f014a 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 Wed Jan 13 06:06:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 12015829 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 A3F28C433DB for ; Wed, 13 Jan 2021 06:09:13 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 403E923120 for ; Wed, 13 Jan 2021 06:09:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 403E923120 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sholland.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=UOYuAtg+9iLmjLgMpNH9BUsmVbZn0J414ViOINfoBWc=; b=0RPZqeRZbouUYzFAqs8oVLgeC VXHlDqnuJoYA2lN/i7ERbpQtckxIY1rsux8LXWsTTW+UCWjRsro5gAz8E1v/OzNpdIaf0ay9zZHmU It7HN1MZeTP7/ewalYdXdQXziDsYy7/RofbyDlzHzsnU/4j9y+LO0dJPUGCVvjCNGsICAbsJOp0qr vv/DAk2bUiU13wCq09y3NQqBzRAYA1Oq8O9C1Rfo/1CFJkXEv3DBt59dThgC3IDqfJ8xTc4ZRBArp JglUBONuULefJmrPzxqDoyspsJxtKios0QjhQ5qV973LIowp7vQgIjju1sc9tSrN/dud+1fvqLqlq gRjrcplIw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzZJ0-00016a-VC; Wed, 13 Jan 2021 06:06:55 +0000 Received: from wnew2-smtp.messagingengine.com ([64.147.123.27]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzZIX-0000xR-FQ for linux-arm-kernel@lists.infradead.org; Wed, 13 Jan 2021 06:06:29 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id 1318E1B99; Wed, 13 Jan 2021 01:06:20 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 13 Jan 2021 01:06:20 -0500 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=fm1; bh=9cip7s1aFbMII yrk+2/l9sW3AVhWwueouG9RqkcinmI=; b=KeGNzJda1CU72Iy7QVydjqLvHebj9 WFBl1fjCeI7lykworSTVFxE9n48qpKxQrX/3xjiP2s3c68lnvatFekmdpOHOB7Eb 8NM7m3JhUItS4Ixv4mM4cL1UyHs4/AAp1gwhCm6S+bU3+xjr1ueALVvBF4JgTcWL yCJiY1Wf4HRo05wHWaFHO8AsrTC5W3FQYzcddl462EnbdSw00l6GHTwOH8J/sX9f k69ML16V1YqgYcp8Hx5kqKwEPiKWvzuHp10fofooqLXWjXMxG6jNyUYAfR5h8jKa gKRwcWc1k4hbFdgO/r4xM/FJXMjsFOoao4xQZ6+KHWEfbkZyuT6RgaYZA== 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= fm1; bh=9cip7s1aFbMIIyrk+2/l9sW3AVhWwueouG9RqkcinmI=; b=I+ll3Ibh RCxEFTUvQfGHqzRzp1HJEck4tXwh3VUAOyRtPxhkQUNchXdufYxHLFMtR3kHIey+ 4wCzNrFW5UFr/ThHjbKlbA8up8qNWwbH6ZnfKCcgybz4kaeFG6PCfzmCrwhuUCgD OggQxUCVXozjjJq3hqrgBZw/nFiFMadWxMrp6eOgc37HFwWJ3WBbIpq5iQsr3RkG UtLn82W9UE6k7gExrSgtFLnSu0R0lBIm0rG2cJIH/8xmNXi4LRp22l9g4BKUVMA/ RDjuoZ2KXT5Es2Wi6H8/cwVRmyI5L6C+C+N9vQ4C6ysR0NqeVncLflRkqvQIeoHc 243mCw2CRdRcDg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedukedrtddugdelfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhuvghl ucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecuggftrf grthhtvghrnhepudfhjeefvdfhgfefheetgffhieeigfefhefgvddvveefgeejheejvdfg jeehueeinecukfhppeejtddrudefhedrudegkedrudehudenucevlhhushhtvghrufhiii gvpedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmuhgvlhesshhhohhllhgrnhgu rdhorhhg 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 id 2DAA7240065; Wed, 13 Jan 2021 01:06:19 -0500 (EST) From: Samuel Holland To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Liam Girdwood , Mark Brown , Rob Herring Subject: [PATCH v2 6/7] arm64: dts: allwinner: pinephone: Add support for Bluetooth audio Date: Wed, 13 Jan 2021 00:06:14 -0600 Message-Id: <20210113060615.53088-7-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210113060615.53088-1-samuel@sholland.org> References: <20210113060615.53088-1-samuel@sholland.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210113_010625_649938_5675980A X-CRM114-Status: GOOD ( 12.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Samuel Holland Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 2dfe9bae8c67..e0db2f1373bc 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi @@ -24,6 +24,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"; }; @@ -82,6 +87,8 @@ vibrator { }; &codec { + pinctrl-names = "default"; + pinctrl-0 = <&aif3_pins>; status = "okay"; }; @@ -439,6 +446,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 Wed Jan 13 06:06:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 12015833 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 DF10BC433DB for ; Wed, 13 Jan 2021 06:09:17 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 726D623120 for ; Wed, 13 Jan 2021 06:09:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 726D623120 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sholland.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=1TSSgpkyPEw43llGKIziBlp0Q065viaTFMYfWUZT6pI=; b=CkDy6dW8DNuVVJJcmLp0TzQL+ OMieGHBckyHT/WrCXDpld6lPIy6FhneMduZF8FHDkcCLdvWJqa5qd3e7bRYysgqEKcBMBE+xyYedt Xb2w1rlHg9hiY/uMkX+GizMKAPXIpAFQ3+RTGHLwy8mQoiNUurPY5nGQv1CVcWglyrqSL5NdKpP+2 DXdAIhfKmX36HAjV5j+2EWUguHMSwvCH0taRKPwfBftL2PSrAf/oPnuOusC9g08mn8x8TYue0lhQA axwhnTnw3KXYAKe9sLGgECQ/6Fzz2sE0TY/8hsjdy9CdDZnEI8Kci6rEbPeDfUviZiYqepLWpyUuu DEc3U6boA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzZJ4-000180-ER; Wed, 13 Jan 2021 06:06:58 +0000 Received: from wnew2-smtp.messagingengine.com ([64.147.123.27]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzZIX-0000xU-Fw for linux-arm-kernel@lists.infradead.org; Wed, 13 Jan 2021 06:06:29 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id B880C1BA2; Wed, 13 Jan 2021 01:06:20 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 13 Jan 2021 01:06:21 -0500 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=fm1; bh=UPQKNjnKYcvfU tSZvIh/RoQ33u+HBfkHdg3flk5F7LY=; b=SMRDqMvKCVIy4jszgS4R1HlPRE0OT Fzlz2h8sxqaKOK1LpQWuOZ4NboE3mJls4tX3sNkDRdBWxP6wqTWHMl+2sZ6aytEG pnbVSnCQp+W32sfhaYk2G5Vbl/gLnPET0VrS7nU3cfsn1q5yVo6QajhGA5Vc2ZbX d6lqRxA8Pf/CaiheBgC6v7z9IMFIeb8b+6jKatQmNKO008AG4c5XxHtgza5m2ewS GcJVFplwRqUhq37p5unTiHyP3N6c0jEwQsLiMGJmBVgxeZRCybNGIj2nXECP4mwn gOEwH6rsgjs2Ug5EoisfJwGci0GycZKg1pdDNB/2jTNFU35egtdA1d/QQ== 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= fm1; bh=UPQKNjnKYcvfUtSZvIh/RoQ33u+HBfkHdg3flk5F7LY=; b=PUU9cBF1 NNRl+/gI/l93aeZyLxj7VFAMpED/I7dOjsgTlHVt58QEbRUj16f+Zpqxl4L68Zi4 wpJ9TIPcirTqPVwX1ZyjTlD0GeWWgmwX5eqvbuhOy8AJKD/aVB6FeJ4MdtNYtkEs MgnPquIXvwriv015F78vQhwzOyk42ndNFwcP7wecXedesFEbtT65KUULipGPmu6S FwnfweHC/+PaGs3+87gA/XZs66GZQ+aD3sB9kofcOV3iEo5f8pn2+0tf/pO3ilKc /j5PTYbV3zrni/8zcX0pRZev3MPWbZB2HiNSmbc8Q48XHizkXhSQjCSO/T1idHk2 vrvkuLEG4zOUWQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedukedrtddugdelfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhuvghl ucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecuggftrf grthhtvghrnhepudfhjeefvdfhgfefheetgffhieeigfefhefgvddvveefgeejheejvdfg jeehueeinecukfhppeejtddrudefhedrudegkedrudehudenucevlhhushhtvghrufhiii gvpedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmuhgvlhesshhhohhllhgrnhgu rdhorhhg 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 id A00DA240057; Wed, 13 Jan 2021 01:06:19 -0500 (EST) From: Samuel Holland To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Liam Girdwood , Mark Brown , Rob Herring Subject: [PATCH v2 7/7] arm64: dts: allwinner: pinephone: Set audio card name Date: Wed, 13 Jan 2021 00:06:15 -0600 Message-Id: <20210113060615.53088-8-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210113060615.53088-1-samuel@sholland.org> References: <20210113060615.53088-1-samuel@sholland.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210113_010625_745833_F607BD6D X-CRM114-Status: GOOD ( 10.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Samuel Holland , Arnaud Ferraris , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 e0db2f1373bc..cf6dcdd135b5 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi @@ -425,6 +425,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",