From patchwork Fri Nov 6 04:15:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 11885963 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,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 3618AC2D0A3 for ; Fri, 6 Nov 2020 04:16:16 +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 9B2C8208B3 for ; Fri, 6 Nov 2020 04:16:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="eQuGdUPe"; dkim=temperror (0-bit key) header.d=sholland.org header.i=@sholland.org header.b="Y76Elr4b"; dkim=temperror (0-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Y+6JNkqR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9B2C8208B3 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=JQwmKsp4wlzfAQmgHWKZQfmQKS4lNC1Hl4q2ibZdzUA=; b=eQuGdUPenjWu4NNvtg7X4pzyi MN5fV6Vu2zZ/msFZWO82Es3H8OoBbsQ5M2lv8ojMioUuc4F9SZXoh4B3cDqFMpEWCksQHqeSTWH7+ 8/EAkgmotKMVXP4/DYNRt0LH0S073zDct9tqyCM3iqet4vdJEyIY7ZY9sKaNeo+L1MN8rfequ7uMO GsvrKE9D3137ANnFdP4FKsWV11VcBoqGsifKQK9lpofSBfeDgsvEZ0ZKvclDRjHOqduY+08O1q8r1 rL/3CTNnhcLrmhRQwYBL2R+XUQGmJeX1dPl0aX5gCWNI9/33YhZiMtreWkLni36/DWceUqcOc4aEd /NhDQdI4w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1katA7-0001xQ-7Y; Fri, 06 Nov 2020 04:15:43 +0000 Received: from new3-smtp.messagingengine.com ([66.111.4.229]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kat9i-0001o2-Gv for linux-arm-kernel@lists.infradead.org; Fri, 06 Nov 2020 04:15:20 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.nyi.internal (Postfix) with ESMTP id E82F258054E; Thu, 5 Nov 2020 23:15:16 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Thu, 05 Nov 2020 23:15:16 -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=W/MZfcPsKjjE0 7OoMylhK1zbNQ9x3iHbAhoJsJ612hI=; b=Y76Elr4bPsbKDNXA2/YsuSziM1Y6U SfXGbu5uvaHFmWDZRI+Moll6T+uOyQhJVoshJlSnZr7c/MpTIl9dpUTjNYk6zie/ RjkOsMn+7LQxvXoyPme5ay9nsA4G9NHqPeC78fVvglCSsZCRHzj6XJEFZcMA0R/3 vAMEOwAhN6gHOPGn1ABv1wcDg6A5+MqUkEkC7ug6uFfifZ9Y4x1mDI1fewGn6To0 XMaOQRASdIw9SDCyss2CgN/7kcJBbuwj+zg+WbG8Lnj8RisMdfCt1E5P4nImKrmE S/+hc3EI1dCfsXTCeISr+et9EvT9rhbnKF02rSgMQ+7NqcCbWHYdvs9Mw== 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=W/MZfcPsKjjE07OoMylhK1zbNQ9x3iHbAhoJsJ612hI=; b=Y+6JNkqR tfuYhFH0xWB2MG+gCyjs1au8FDitidc3wtuUd1HWiZZCLKXKSWnuWDzHDgqaQu/t /wgZ+xDTENWwv5EgrlA7jeTPtORu3BrywetZWOwx5GTF1O/fJn675Jh/7jxb57o0 RIwJkn+G4h8rxohNpogY+uSGzECe5+rwN94OHMwomdxMBdKeQmtQRamto6LEB35H 8N0EvQ32OTMI+O/T2ahqI9zppBUs44WjSwcOMUukjNQpuuMm3SxnWrBiaqS2rd/k M+qVg4q4Kpu6VFM/XlQP/L7lEjWiKDQLKBr3i4UUWBn61t1kkqnGzK9xuo9w5tQE nFOACrpnEPlEPQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddtkedgjedtucetufdoteggodetrfdotf 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 id 24BCB306005F; Thu, 5 Nov 2020 23:15:16 -0500 (EST) From: Samuel Holland To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Liam Girdwood , Mark Brown , Rob Herring Subject: [PATCH 5/7] arm64: dts: allwinner: a64: Allow multiple DAI links Date: Thu, 5 Nov 2020 22:15:11 -0600 Message-Id: <20201106041513.38481-6-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201106041513.38481-1-samuel@sholland.org> References: <20201106041513.38481-1-samuel@sholland.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201105_231518_712758_2549C9AF X-CRM114-Status: GOOD ( 11.72 ) 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 , linux-kernel@vger.kernel.org, phone-devel@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 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 97334e25ddd3..06c2b355d80f 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>; + }; }; };