From mboxrd@z Thu Jan 1 00:00:00 1970 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 923A6C433B4 for ; Fri, 30 Apr 2021 04:02:06 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 F18B4611AC for ; Fri, 30 Apr 2021 04:02:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F18B4611AC 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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ybgvNG8n3NfQcNYWlrqpSqlraLTvH24JdFF0f5hFFTo=; b=f2b9mphK9ECC8nEGi50IJxOR7 av7p9H1QNpuhz27SB+Q0hOQ8pr9ms+pTi5kSUp9O1l3A1sDagWavyjFRFnks5LE0DNFmsWs8aIKC4 L7b4asuNb80xwE4Ine259142OzlS/GMR+GYcecbFg4w7ODN5ubN2103CEVfUCLr5kJU7oeXJXOKoE Rf6svdaeE8mVIZkMsgFRb9/JYgX67sTFlVr6wfRFxDs6j0mOsqa2yFjFiXPW1k2w5rM9/Aqcglq/G 1EDzJ6bylh40GP0Mw6BFr5BEu28YdN+T0jgbt0duBbXQ6wHtoBDI/OMDwjbScGldk2mYb/M39khOl 41HhQTf5w==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lcKKA-0076YZ-G1; Fri, 30 Apr 2021 04:00:18 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lcKJ3-0076NU-ED for linux-arm-kernel@desiato.infradead.org; Fri, 30 Apr 2021 03:59:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=Dvnv9iv8lzVpmqWT03DWw0xg+FDgyNq03CXrBpobr4A=; b=sdK+n+kg0jXRylWXOs5v2pEYbV Tk7achabzUvEGQrjypescmp2KGVAQhktZAqeoUoPWKAsnxuVdj5OOsl8twfLKCgeVDu/5npHM6v+6 FMxICh7hdXgu7/PGn0Xz0jONO0jBewsW0+0xmLV5jwA4clt86NmK13cLCFZQHi9w8qSwCB/UZIsDY x3itqv5wk8kgU+WedQXK6KXoA72B0kac+GTtL4NcwAYMoNp6ry3zSSBCM7dUUFCg8ZiWPi/IOTXwq a/xiWRDw5JWrwUogCir2LMP9v6Dte6FETJaRprxe4gRajj+JwUZu8XG21atynPKddIJwR9oyPSTYz 1h/Q9Knw==; Received: from new3-smtp.messagingengine.com ([66.111.4.229]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lcKJ0-00162s-T5 for linux-arm-kernel@lists.infradead.org; Fri, 30 Apr 2021 03:59:08 +0000 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210429_205907_025240_FB718E36 X-CRM114-Status: GOOD ( 10.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 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>; + }; }; }; -- 2.26.3 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel