From patchwork Wed Aug 1 13:40:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10552343 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E8D8015E9 for ; Wed, 1 Aug 2018 13:41:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D82132B44E for ; Wed, 1 Aug 2018 13:41:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CBCEF2B4AC; Wed, 1 Aug 2018 13:41:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7A9A12B44E for ; Wed, 1 Aug 2018 13:41:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=MJBKryRQmgx248sRl1yMQ8MuRzMFO6RyfnoDnNg2lTU=; b=BwQ8FEu1+7/dZbrsokBKcYt0PX kOxIFi7aqHON8r7TOn+LSA+obt+H1WIufGSNzAv1D2dTp6Yb1rTqB9HqhB2o/lX76PxPGo3WNyHFN Iyetuevj9mU+xINlwtDADR0nsJTlV9ThJINmxawcXmy5jlaCQ3f/KyDwGES1zdZTiQWDClz0KxC0+ 3Z+6QeuMyRyNZpO4n6lsKpN7xlXeelb6XHImRUr7njAVjjTA1LtCDo75oXfZWp2HKoBvG2W0IE5Pc kZGPYYgpeul/hZF2SOPhAgJx0DKsr/pKFKri7vAo6mz4iJoFiW7+xwF4po9IrcJTPhA2+f7jMP70W 8cVmP/iA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkrNl-0001I3-WF; Wed, 01 Aug 2018 13:41:42 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkrNB-0000Qo-7q for linux-amlogic@lists.infradead.org; Wed, 01 Aug 2018 13:41:08 +0000 Received: by mail-wm0-x241.google.com with SMTP id n11-v6so7097823wmc.2 for ; Wed, 01 Aug 2018 06:40:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/E6fIhRE3dLA0i5nGkTLVuoWqI+hiTTn/S57jEQ7FPM=; b=eHeCVeTCpLc18rtYN6sJSHW65vAsUq2yAW/vZXg0CnQ2CbXJ8wUBNBOB3em+Nf16Lt nZ8KTuHzugCQ7kTzxL6CaFIg8cvqYpvcyQlyJMiDOOZUAdwqnk/Opg9J7KCUWOFIWouG Eb6ySdBrDqog2R6O2aXjGJD0O0OcMf1rPWbcxY+nNL2KpAWnVLOnURYvf8Zqy4BL3kTV p2TY/2G72s2zg0ugUk7sq2/bYj/m5yW9h9/5ZfUWMV/cY/wM4p46CNnvIKiapFOucCBP slbLsn8J8bpcqiJFk8jxBz14v7Fy9LAXGDyCEo451qjLmFR7oIWpMJ2e4lVrPKePb8lD AtyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/E6fIhRE3dLA0i5nGkTLVuoWqI+hiTTn/S57jEQ7FPM=; b=fLIpixz40Fbdp+cksfLuej9iR1mGEyPf76/nfQl13toEiRLHljsaVo4kSAhOlfW3rU wIsmXe9Z8AJRAkcmK1krA1LcYuDXXoj/pHezrKKIYjb6YfVOa/IMWICclnLpYJQHEy0W HTrdKZCB5p9Alz/6uFB/X6sXy7fBf+ZbOP9Ks0u1hwvhATXMtcD8VK0zulOEdaXjygje J+uLuftF++6m7krPzGfDw+UFhleKy0LQgM3FhyqOq/m/kb4h+GFlRAw7GcTcJCugosgZ 4XL91KlNonqd0zd8661+MB/dLf9/L5Yxcy5sMz1zqKqD8fzv6QrQQJ5tWragQg1oyQdw ScPA== X-Gm-Message-State: AOUpUlGvkhYMsavpenlIICRJGu+tU0Rs23x2T/XIs3+0ef9fltCHtpsj vke3jahcC03p8igKXVhnouoRTA== X-Google-Smtp-Source: AAOMgpc37eiIlSHtt9DOaTGxGFQbZOnfFOkUA2290aaCumaA/dxC9KFuSmLcwDpoeSmcwyoeDqydrA== X-Received: by 2002:a1c:8313:: with SMTP id f19-v6mr2677438wmd.144.1533130853495; Wed, 01 Aug 2018 06:40:53 -0700 (PDT) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id f8-v6sm24347080wrj.9.2018.08.01.06.40.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Aug 2018 06:40:52 -0700 (PDT) From: Jerome Brunet To: Kevin Hilman , Carlo Caione Subject: [PATCH v2 1/3] arm64: dts: meson-axg: add audio fifos Date: Wed, 1 Aug 2018 15:40:31 +0200 Message-Id: <20180801134033.21739-2-jbrunet@baylibre.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180801134033.21739-1-jbrunet@baylibre.com> References: <20180801134033.21739-1-jbrunet@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_064105_317723_A0268549 X-CRM114-Status: GOOD ( 11.37 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add TODDR and FRDDR audio fifos of the AXG SoC. These fifos are the capture and playback memory interfaces of audio subsystem of the AXG. Signed-off-by: Jerome Brunet --- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 67 ++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index c518130e5ce7..32f6dcacc2bc 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -11,6 +11,7 @@ #include #include #include +#include / { compatible = "amlogic,meson-axg"; @@ -223,6 +224,72 @@ resets = <&reset RESET_AUDIO>; }; + toddr_a: audio-controller@100 { + compatible = "amlogic,axg-toddr"; + reg = <0x0 0x100 0x0 0x1c>; + #sound-dai-cells = <0>; + sound-name-prefix = "TODDR_A"; + interrupts = ; + clocks = <&clkc_audio AUD_CLKID_TODDR_A>; + resets = <&arb AXG_ARB_TODDR_A>; + status = "disabled"; + }; + + toddr_b: audio-controller@140 { + compatible = "amlogic,axg-toddr"; + reg = <0x0 0x140 0x0 0x1c>; + #sound-dai-cells = <0>; + sound-name-prefix = "TODDR_B"; + interrupts = ; + clocks = <&clkc_audio AUD_CLKID_TODDR_B>; + resets = <&arb AXG_ARB_TODDR_B>; + status = "disabled"; + }; + + toddr_c: audio-controller@180 { + compatible = "amlogic,axg-toddr"; + reg = <0x0 0x180 0x0 0x1c>; + #sound-dai-cells = <0>; + sound-name-prefix = "TODDR_C"; + interrupts = ; + clocks = <&clkc_audio AUD_CLKID_TODDR_C>; + resets = <&arb AXG_ARB_TODDR_C>; + status = "disabled"; + }; + + frddr_a: audio-controller@1c0 { + compatible = "amlogic,axg-frddr"; + reg = <0x0 0x1c0 0x0 0x1c>; + #sound-dai-cells = <0>; + sound-name-prefix = "FRDDR_A"; + interrupts = ; + clocks = <&clkc_audio AUD_CLKID_FRDDR_A>; + resets = <&arb AXG_ARB_FRDDR_A>; + status = "disabled"; + }; + + frddr_b: audio-controller@200 { + compatible = "amlogic,axg-frddr"; + reg = <0x0 0x200 0x0 0x1c>; + #sound-dai-cells = <0>; + sound-name-prefix = "FRDDR_B"; + interrupts = ; + clocks = <&clkc_audio AUD_CLKID_FRDDR_B>; + resets = <&arb AXG_ARB_FRDDR_B>; + status = "disabled"; + }; + + frddr_c: audio-controller@240 { + compatible = "amlogic,axg-frddr"; + reg = <0x0 0x240 0x0 0x1c>; + #sound-dai-cells = <0>; + sound-name-prefix = "FRDDR_C"; + interrupts = ; + clocks = <&clkc_audio AUD_CLKID_FRDDR_C>; + resets = <&arb AXG_ARB_FRDDR_C>; + status = "disabled"; + }; + arb: reset-controller@280 { compatible = "amlogic,meson-axg-audio-arb"; reg = <0x0 0x280 0x0 0x4>; From patchwork Wed Aug 1 13:40:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10552341 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E139613BF for ; Wed, 1 Aug 2018 13:41:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF4BB2B44E for ; Wed, 1 Aug 2018 13:41:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C38FF2B4AC; Wed, 1 Aug 2018 13:41:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 73C872B453 for ; Wed, 1 Aug 2018 13:41:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=Ah03z48GHAu7Pl0wQGMh7aJ01mMRwtA6tbNqPFqc2fE=; b=RBg5X9sQMV5eGrvTXE/jZ+xNKk IRyyj/FbnT7A0ni4VEDxldVyuvw3kP/h8d63QgE8iRlMb4REaWScrC/cIlDceV0qfs2mKGTmD2wBm GTAq63wfCd/tdQOy34nFdu0mDuVuy2Zbz2Zfca3bkMEQL0rS98t+H0bGIa1V5hJvXzAaKwJwYqyia MzZqTmiRa3u+HfW8VGkWmJLoVdNhxikE27RyJGSwF5/2UrfN0ztUl1OOcVfjh7VerkbFEvLgLDqx4 BCYarSFbLZGJBSUjZkoIygd6DXWMgDTy7DiMAaG8mRgVof/ANZuaKi044gyxfca4vS8kjqu5ixKsv UKHeNRjg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkrNj-0001FC-S9; Wed, 01 Aug 2018 13:41:39 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkrNB-0000Qr-7m for linux-amlogic@lists.infradead.org; Wed, 01 Aug 2018 13:41:08 +0000 Received: by mail-wm0-x241.google.com with SMTP id y9-v6so7117497wma.5 for ; Wed, 01 Aug 2018 06:40:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dhrrIcplKhvGFZAEbzKElBLgg626+Wi/iYjqAD2M6x0=; b=Kh/eLLQlIqWYDEoH2y+53cwcYDrCp9jGiO78d1HNLgMDslMnww7exyGZwZx4wmCJTs Py9Sw3CBdaG9PPOT6CJ6p7rLddZ8QPn5oouvhd3JBDnwkNvAy2NFF6EamBcoWnRka7oc /KSmGorLsd/i3aI7HKLYLDGJoZ8AidUep5KFO3XDR8de4tDUquPNYP4yrpPDlSou0W/n FFzowY04475AhTz869U03lgAdIQnU+BDjKQxuosFCgytTtURDHdxN2rhFFQtsee0cZ41 ppYoFwgukYemKUgQ2NB4GbdjbrE3KM8ZlGsne/4Uc1bIIR0QgipRPKIbUjNaV05YKet0 w4jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dhrrIcplKhvGFZAEbzKElBLgg626+Wi/iYjqAD2M6x0=; b=SC8wN5/PA62w2+T8DfKBfR3hk3OmAOBZv4nTaI1Vqbzd3UzRuGNhTGsGKeuEPSdBQR So1TWXjQKCmKJI3SH4b10rs7Zb29gQv7P7gtohhQxoQVFN4oud3vb58P6YLvP/6Kf6v7 UCCEgLXA8IbC87o/HtXvm2L+hWmCoAKkn142+0DWmdB4EGPPqNzaVBQUu+CI7oBJHU4S N//jSpWPtm3iVmclCbo43cIT9ysIO4up27MKJMDnt3cdT7zSidg8+WUxAPzZogrvZK0S fOPYhqzZp7FETJR2FslYN1tc+0RUQrSUqvq8KRh99fG9bA5CHUxZQp+AMi2UOIAJUeXU o4tw== X-Gm-Message-State: AOUpUlEkC1nsiCGt54xwzLbT0I0974supQEoF/YSZxVwOQMTYRTVgrTs pkQmaNo60g7ViJmMgnoJSbA5lA== X-Google-Smtp-Source: AAOMgpdwGtf2esM61NCSy6XBWoZwIl2hlXgH9jg+jibltJPh2V+boemZ12+5m3jFT+c3+m7MKPULRg== X-Received: by 2002:a1c:6f44:: with SMTP id k65-v6mr2659765wmc.19.1533130854495; Wed, 01 Aug 2018 06:40:54 -0700 (PDT) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id f8-v6sm24347080wrj.9.2018.08.01.06.40.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Aug 2018 06:40:53 -0700 (PDT) From: Jerome Brunet To: Kevin Hilman , Carlo Caione Subject: [PATCH v2 2/3] arm64: dts: meson-axg: s400: enable audio devices Date: Wed, 1 Aug 2018 15:40:32 +0200 Message-Id: <20180801134033.21739-3-jbrunet@baylibre.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180801134033.21739-1-jbrunet@baylibre.com> References: <20180801134033.21739-1-jbrunet@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_064105_322354_A921402D X-CRM114-Status: GOOD ( 11.23 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Enable the audio devices on the s400. Signed-off-by: Jerome Brunet --- .../arm64/boot/dts/amlogic/meson-axg-s400.dts | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts index d5c01427a5ca..9f5d81c3ee29 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts @@ -226,6 +226,18 @@ }; }; +&frddr_a { + status = "okay"; +}; + +&frddr_b { + status = "okay"; +}; + +&frddr_c { + status = "okay"; +}; + &uart_A { status = "okay"; pinctrl-0 = <&uart_a_pins>; @@ -334,3 +346,63 @@ status = "okay"; vref-supply = <&vddio_ao18>; }; + +&spdifout { + pinctrl-0 = <&spdif_out_a20_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + +&tdmin_a { + status = "okay"; +}; + +&tdmin_b { + status = "okay"; +}; + +&tdmin_c { + status = "okay"; +}; + +&tdmin_lb { + status = "okay"; +}; + +&tdmout_c { + status = "okay"; +}; + +&tdmif_a { + pinctrl-0 = <&tdma_sclk_pins>, <&tdma_fs_pins>, + <&tdma_din0_pins>, <&tdma_dout0_x15_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + +&tdmif_b { + pinctrl-0 = <&tdmb_sclk_pins>, <&tdmb_fs_pins>, + <&tdmb_din3_pins>, <&mclk_b_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + +&tdmif_c { + pinctrl-0 = <&tdmc_sclk_pins>, <&tdmc_fs_pins>, + <&tdmc_din1_pins>, <&tdmc_dout2_pins>, + <&mclk_c_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + +&toddr_a { + status = "okay"; +}; + +&toddr_b { + status = "okay"; +}; + +&toddr_c { + status = "okay"; +}; From patchwork Wed Aug 1 13:40:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10552347 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5D85A13BF for ; Wed, 1 Aug 2018 13:41:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C8852B44E for ; Wed, 1 Aug 2018 13:41:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 409D32B4AC; Wed, 1 Aug 2018 13:41:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 07C992B44E for ; Wed, 1 Aug 2018 13:41:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=0AkEvMAWI+z3TMlYJ9lFjn89K8PT7x8GG7RAwsloT2k=; b=ovLWNObTM549C29DOIC1hKC/rx 1Ns2wkgwRewCnMeGeHbHaIG8pKzeJDaBzN6pMUplHL1P/+cHQZVJ1WdtfsN/IfCl7S6PJA242ZQLp /NvywR+xcCdf/T9Mbvp+NR6cY0Nmi/tgmNhkps92B5S/P6/gxq0vAIdYsLmDlJMQSR1wR8zFQZcSy 5/1Y/wjIUzEnKmSm+nqGNACWC3Ok3VfYQqFqq1blWSmSJopaibWmmq9U5Z+AOLTRj+IgNYWsZ4Cm5 x4BC0sT5QBMoLipJJaX4RXew7yCw25Arv4+cHTkxetfbJaFPMyAmsc2s06PMs6npNXI45mynMPJwL vzhgxqcg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkrNz-0001aG-Pw; Wed, 01 Aug 2018 13:41:55 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkrND-0000Qu-14 for linux-amlogic@lists.infradead.org; Wed, 01 Aug 2018 13:41:11 +0000 Received: by mail-wm0-x244.google.com with SMTP id r24-v6so13859155wmh.0 for ; Wed, 01 Aug 2018 06:40:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UYEBmVAVpj2krPvDto31OgUp5hzgNQb2z8iA1oiV9yE=; b=gYMD+bDEmM6kCggp0w+/7IgreRUpyMDbHWOVyg1zGC6+Sne/SC7BQ29HS3wnd+a+K4 EXpLz25q9Jt5ZZkuKoMIWeBw4gyHEKXZ9k45t2dFSHJ7XH+RcGYsRhLSN5/WlM7bSdr+ KwvY/xN79gzr3tjU4lfHw0TjREuzCJJbPvTGC0A9PUynwkvQmoiKBSbmvs8mcWtnrL8W LZWOdoNkuNgUuabtIaoCjoWIwh5rr4+e4dbwqz4v/hqtJe5S4vZplySKFYMl9WYMo1Qz bVE/WLTNtSJ9s5jddy7FuIFtmMejXTyTEQhUKtjX9t7GSPuEdAcG0sR5seyI4fzpxESH 513Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UYEBmVAVpj2krPvDto31OgUp5hzgNQb2z8iA1oiV9yE=; b=CaeJe+y94xRcelCVYovZ3B5gqLPBthjo6LjSnukOReGtEIgdSRxJtGhJEtgk3spO/N UQvdk/VNe2xJPe9f0w1N+eR5L05Ww8izZp4MQCSyMi66y056iUI6mdL+rajhmLWO3Ugk EqWIXUljWAStLSqBfZ+DIfJeAnI2oIsSw+JNQ/737iaT3RvrLuZQIJLCUmtI5bNCbyNk n//+yRUbrT3RvD+j/lg0CnsFwI3R56RBqjDCNkj4bhC5xYg/WySvqcoejKWzmA0EbfoI N06iyIZET/kt3CGDMfkt6ViBjR1ud37uWeCXSk3Bay+kNfjbOZHp7nNw3QwXWi1oV3HW AneQ== X-Gm-Message-State: AOUpUlHBn+eQ7HI9wbAJeWTkUSn0jiX7X8lerKbpv8Ix0ZYMgS4PGw/8 AY0hbRPegB1HNo9PKwRfnU+BkQ== X-Google-Smtp-Source: AAOMgpeEgT1tgCq/krNltf8ExF1ziiL3vrChVo4t1P0+/Tz0/e6thEsdhh5gmGPPLUCaNQev6v/mNg== X-Received: by 2002:a1c:13ca:: with SMTP id 193-v6mr2712344wmt.127.1533130855505; Wed, 01 Aug 2018 06:40:55 -0700 (PDT) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id f8-v6sm24347080wrj.9.2018.08.01.06.40.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Aug 2018 06:40:54 -0700 (PDT) From: Jerome Brunet To: Kevin Hilman , Carlo Caione Subject: [PATCH v2 3/3] arm64: dts: meson-axg: s400: add sound card Date: Wed, 1 Aug 2018 15:40:33 +0200 Message-Id: <20180801134033.21739-4-jbrunet@baylibre.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180801134033.21739-1-jbrunet@baylibre.com> References: <20180801134033.21739-1-jbrunet@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_064107_214175_7EF72F14 X-CRM114-Status: UNSURE ( 9.81 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add the sound card of the s400. With it the following interface should be working: * Lineout * Daugther card speaker 1 (same output as lineout) * Linein * SPDIF output Signed-off-by: Jerome Brunet --- .../arm64/boot/dts/amlogic/meson-axg-s400.dts | 108 ++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts index 9f5d81c3ee29..d399078d1f0c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts @@ -204,6 +204,113 @@ status = "okay"; sound-name-prefix = "DIT"; }; + + sound { + compatible = "amlogic,axg-sound-card"; + model = "AXG-S400"; + audio-aux-devs = <&tdmin_a>, <&tdmin_b>, <&tdmin_c>, + <&tdmin_lb>, <&tdmout_c>; + audio-widgets = "Line", "Lineout", + "Line", "Linein", + "Speaker", "Speaker1 Left", + "Speaker", "Speaker1 Right"; + audio-routing = "TDMOUT_C IN 0", "FRDDR_A OUT 2", + "SPDIFOUT IN 0", "FRDDR_A OUT 3", + "TDMOUT_C IN 1", "FRDDR_B OUT 2", + "SPDIFOUT IN 1", "FRDDR_B OUT 3", + "TDMOUT_C IN 2", "FRDDR_C OUT 2", + "SPDIFOUT IN 2", "FRDDR_C OUT 3", + "TDM_C Playback", "TDMOUT_C OUT", + "TDMIN_A IN 2", "TDM_C Capture", + "TDMIN_A IN 5", "TDM_C Loopback", + "TDMIN_B IN 2", "TDM_C Capture", + "TDMIN_B IN 5", "TDM_C Loopback", + "TDMIN_C IN 2", "TDM_C Capture", + "TDMIN_C IN 5", "TDM_C Loopback", + "TDMIN_LB IN 2", "TDM_C Loopback", + "TDMIN_LB IN 5", "TDM_C Capture", + "TODDR_A IN 0", "TDMIN_A OUT", + "TODDR_B IN 0", "TDMIN_A OUT", + "TODDR_C IN 0", "TDMIN_A OUT", + "TODDR_A IN 1", "TDMIN_B OUT", + "TODDR_B IN 1", "TDMIN_B OUT", + "TODDR_C IN 1", "TDMIN_B OUT", + "TODDR_A IN 2", "TDMIN_C OUT", + "TODDR_B IN 2", "TDMIN_C OUT", + "TODDR_C IN 2", "TDMIN_C OUT", + "TODDR_A IN 6", "TDMIN_LB OUT", + "TODDR_B IN 6", "TDMIN_LB OUT", + "TODDR_C IN 6", "TDMIN_LB OUT", + "Lineout", "Lineout AOUTL", + "Lineout", "Lineout AOUTR", + "Speaker1 Left", "SPK1 OUT_A", + "Speaker1 Left", "SPK1 OUT_B", + "Speaker1 Right", "SPK1 OUT_C", + "Speaker1 Right", "SPK1 OUT_D", + "Linein AINL", "Linein", + "Linein AINR", "Linein"; + assigned-clocks = <&clkc CLKID_HIFI_PLL>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <589824000>, + <270950400>, + <393216000>; + status = "okay"; + + dai-link@0 { + sound-dai = <&frddr_a>; + }; + + dai-link@1 { + sound-dai = <&frddr_b>; + }; + + dai-link@2 { + sound-dai = <&frddr_c>; + }; + + dai-link@3 { + sound-dai = <&toddr_a>; + }; + + dai-link@4 { + sound-dai = <&toddr_b>; + }; + + dai-link@5 { + sound-dai = <&toddr_c>; + }; + + dai-link@6 { + sound-dai = <&tdmif_c>; + dai-format = "i2s"; + dai-tdm-slot-tx-mask-2 = <1 1>; + dai-tdm-slot-rx-mask-1 = <1 1>; + mclk-fs = <256>; + + codec@0 { + sound-dai = <&lineout>; + }; + + codec@1 { + sound-dai = <&speaker_amp1>; + }; + + codec@2 { + sound-dai = <&linein>; + }; + + }; + + dai-link@7 { + sound-dai = <&spdifout>; + + codec { + sound-dai = <&spdif_dit>; + }; + }; + }; }; ðmac { @@ -272,6 +379,7 @@ PVDD_B-supply = <&main_12v>; PVDD_C-supply = <&main_12v>; PVDD_D-supply = <&main_12v>; + sound-name-prefix = "SPK1"; }; };