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>;