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: 143292 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp888649ljj; Wed, 1 Aug 2018 06:40:57 -0700 (PDT) X-Google-Smtp-Source: AAOMgpczxESdSMeZWx96Xi+pHB55nQ2p/ChSc/zqDc6jRG2cysSMiMh3TlY+nmUXiSlXw6uLZj0S X-Received: by 2002:a65:5245:: with SMTP id q5-v6mr4746936pgp.67.1533130857264; Wed, 01 Aug 2018 06:40:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533130857; cv=none; d=google.com; s=arc-20160816; b=oeNtcBtLm6opDzDJVaFVhWekBxqBToyTzReyQpO6dIc7gNbnf2unTP4TNax9bG0pXc MEfqf5w4fZl4fOeeWXIuj+yqaUiVdJF0i2NfPHnpYFDotyUvUDNakjj/0Mt8erZyrjEc 9XG4qZbQgJWNS1cjkFTPjiSVTTpL/CUlIti9pn4Hi6KyWbTXmaGG/Jf3ELSDJYh+Nd01 RvhqaXiwXJSvW+UZ1Ixs0EZjZy/WtSgghj4zbLrwft97d1lJ5gjj8yzpfGQ1Hu/xIG3B eNG1FnVCD0jkSmClAsAxskgzukmbv2FlnZa2K2lsAkYs0RKZcZG3PiBOYg427PbmJj2N mpdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=/E6fIhRE3dLA0i5nGkTLVuoWqI+hiTTn/S57jEQ7FPM=; b=N1rbnZFMPtrnDnAbfVh1ZfmmGdgFI5wmoET0sNSL22hwK0SvWsj+KAfUTRa9EIyPrI epqzMvdP7eG69mcmzjBELTAgli7t+PcVnH8Dw3w/FQpDZsdXnHr6uMLs7fgJ5gpQYemx lZlu1PP+sr296hNtRDjwTtAjJRKyAI4wFOn+mSO5w01PD+fzkkhh3OqiquQgaH3+0cTO LCHMQ2lNUcKcuQNTbTz9Eg/pQwEBrLXXb60jTiIm8OAo7lwkUcraRPGckodSnbti//mj hzy57l5hDn/pzNkMZRExY7cfuU1Dp10OfvOydVDqc5SHE1fKvxjPrd7wfw1FeptQX7GZ IaGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=eHeCVeTC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h24-v6si10447291pgl.381.2018.08.01.06.40.56; Wed, 01 Aug 2018 06:40:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=eHeCVeTC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389439AbeHAP0p (ORCPT + 31 others); Wed, 1 Aug 2018 11:26:45 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35106 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389311AbeHAP0o (ORCPT ); Wed, 1 Aug 2018 11:26:44 -0400 Received: by mail-wm0-f68.google.com with SMTP id o18-v6so7157226wmc.0 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=DK/sRWHXaRbhuyQnSmUb+kU8LqJw4bOiYe+kS8EcD4djwagFHuydcx6oiRRNqZ2sZM UlCsNJtuEIuMdVZmlXfwXv572G7aSzhNGfcRO5eP+DnOUbzRbPyWYFexLSVwQRKTjA3r ej30c27eJoJcbYXswHH/uCAAfFvhdSuwuO8NvcZE16Y3tjtpxUTkLg2wEJ0FJKcYQ9Ik FHOqeMMS0tc6yzmX4LNp/HlInkU0iCrdDuV9YBdE2aL05YWy2du0ydMoCt5scfiuEQg4 BOTFzy/MBQtsNs5/fVVrO0l5S6WcX74BOWx7TE8HyAGe3BENQTkfFWKAMZuQV2IxYFFG Q3Eg== X-Gm-Message-State: AOUpUlEJHA4RJLtGUMw5r7m5d0t5vdBXmdtsO+LB3Xde//oMHOs2jJzg vWAeJ2RxTFlS6DEAdQynqYAm/g== 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 Cc: Jerome Brunet , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(+) -- 2.17.1 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: 143293 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp888695ljj; Wed, 1 Aug 2018 06:40:59 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeJwX/i02pk61VY9u715z75gN5taS5uuzPfQngoF00DZ2uQJqIHXoyssSpHQfFOQdBAlIVB X-Received: by 2002:a63:d54e:: with SMTP id v14-v6mr25154335pgi.264.1533130859803; Wed, 01 Aug 2018 06:40:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533130859; cv=none; d=google.com; s=arc-20160816; b=i/uUVhuqnneqcDQaAmBSlO/1fMI9HeBr5dN4TgJhcLXnuA0qv3/tczBhBcxviZRWI5 ctmH1EVN54tl722MXwW0rRDVpO9/VOmC2SwaM7lJ1pK/ecNeeB8q22NGdIF8Ks2obIZB unpH3fwUZZnMaAGj3iDo08fPMFqaprXQSE5QTkyEZAu/58H7QvCap+21ZJA+QLX6GIVf WsqPWoehWxmbdsvxBzVsPIEHBqzwJw7CfptcPk5p1XwzmGWvmKnOSJ20pVRmsfFFgbMx d1SRddObjvYqeb6aLgxQm59mr/NtRoVW126hl7C1zkQAAQgFOBKyI/H/qVs7MKdzDoGR AOgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=dhrrIcplKhvGFZAEbzKElBLgg626+Wi/iYjqAD2M6x0=; b=Jgd0LbnM+zVvNVnYQlJYzTlcOo43h5LQspzZvux7D+nVmyUqAWbz9Z9W6WoZ6AE3tr r5A0WK4GCmox2HGYgjGyD4gEl/xANAeiX+8CnSGqxbP27qIgFSKtWtbq06ZmY/JRg2i8 00HzEGo04qDYJeqpBR0D8St9E0F1I73R8xjtHz6R0sNLBn1j2YNLa2xe1iXI7vyGZ0YX /H7kFmUHebSOHp+wVvbhPhqfs1+BfRJqiMp+Gkq/Ze097WcOvYWn5ahE7aj59CE4V0ss en5YkdsQcaFkOKpCrZmqeY1Y88EEJLB1ALRAyLxZHmSVH4TVl9UazA/LA/T+pEI4LXS0 FQeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b="Kh/eLLQl"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b5-v6si7583619ple.241.2018.08.01.06.40.59; Wed, 01 Aug 2018 06:40:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b="Kh/eLLQl"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389465AbeHAP0q (ORCPT + 31 others); Wed, 1 Aug 2018 11:26:46 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:38226 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389408AbeHAP0q (ORCPT ); Wed, 1 Aug 2018 11:26:46 -0400 Received: by mail-wm0-f68.google.com with SMTP id t25-v6so7077716wmi.3 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=ZYqLdCOwkTF/PMsvSTpzGonL4g0/b5KoGxjmGY7YIt46f7SLjBmyvIYe/jGT4LcNR2 kbcsTSocHRvQclkMXoMsHObSldjSoPcvvvzfZo5LfwHhCLQ4CrOLVDpnigMfyoAbRvhN nzCg/0tvqSFdSgKEmmDc7czpj8b8bjiKIn/ulkrEmWqptERtGlQLHxyA3FEPtJTFehZW KV39lm6VPlO4yb0vWFFNeIBf1xrTI5nWgb3lWPHOiO8vKNZe8S0hthcGRnRpXGRaIJKm S1n1bdNjQ2CyetQZIEAcdFmu3uYjwOqsJwlc3OzvawTxEnx6+XYsKMA2bGohdlPxHD35 Aufg== X-Gm-Message-State: AOUpUlHBjiSKFjio05DplYjt1DVhGB9PO7d7+uS00ZBCP5OJz4xGIoql kOA0D1ApwOHfuZAqmEbVZOL9HakLZVU= 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 Cc: Jerome Brunet , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(+) -- 2.17.1 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: 143294 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp888707ljj; Wed, 1 Aug 2018 06:41:00 -0700 (PDT) X-Google-Smtp-Source: AAOMgpflzUaBU16+agc2yBLUtYAJG4FLJ9fnnoS540EjDx0tulkND8Z/JE7hAwQ1URgK+kz0vham X-Received: by 2002:a62:4ece:: with SMTP id c197-v6mr27222460pfb.240.1533130860206; Wed, 01 Aug 2018 06:41:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533130860; cv=none; d=google.com; s=arc-20160816; b=NRqOGM0IOSmuKTCScEHA+lztEp/W0ldibfQzfrZ8CsNQzgk2j9ShRrBWqGRKP/9gOe rbfn68Wi3+j3MmvOJtWFtfhfpb9GrCrg7wfUTVi+bqkQWUK2RlS5l/u59fCmk3YFI4HZ VMrcjP/JOLz28xOMV6tw3V55fdVVal8qauFYRLAD6CwBZ1yS4oxFiTAlxjrStelbN/uT vXVH/5Dyr2VbGNcNk8d17yQbCvY4FSnDH6JPQTL1EBFgiy4UMXL5VJnbUceAu0y8alei pO8tvw5/xRUsw5rA2NGrCMrp3yYTVL1mh/h9+SokvpbNVjKo7MmmX7o2giXDOOs5jE4C /hhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=UYEBmVAVpj2krPvDto31OgUp5hzgNQb2z8iA1oiV9yE=; b=ZYHKirJXIhCfxsN5r8hkhcV5pDSo/Vsa92PbYUqQbjmP3PHxq4qhRKDN621+IfgRAq n4SZoXMJMK8dUeQCO1AuY+ZsK/r+aiSdVd9mh0gz1fjQzCNFQGP8R2Z78zs61WlxW17m 2QLwgdgmccd0kOMW4+UM4nKgVDPGLzhBSturg7m94BBhLB0y21HcBfrE0GN87uKmHZA6 LGv3/J30sm2eBtC7HHv1EKbS7J5MB+mTUOWwsFaEzJZzsvtXeABHG4G7YZp2yhtUx4Wq niF2TUCwN76eoHRlGnAo2V67JuaKxjYgApeXITTFPsszCGZWh38gwFMm/dr4w/upLX40 lmsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=gYMD+bDE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b5-v6si7583619ple.241.2018.08.01.06.40.59; Wed, 01 Aug 2018 06:41:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=gYMD+bDE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389483AbeHAP0r (ORCPT + 31 others); Wed, 1 Aug 2018 11:26:47 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36955 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389311AbeHAP0q (ORCPT ); Wed, 1 Aug 2018 11:26:46 -0400 Received: by mail-wm0-f65.google.com with SMTP id n11-v6so7097981wmc.2 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=USKfsfhEFAzcgy75K4qSyIEJXbTx8BzZkElqb06c2qExqe6FcmQOygF3nLwGfK6w12 xjp/1WD0WtzfmWORHZYtgJZzbUD58d2tcGSv00EaCJ2ThPXxaUgpGlHxo/+fFcSFQs5N U9bT2hCPVKZ9JxwRTOIvcsZ+24c2HHqMPE2MoNngQ6kjNwPROxbcd7SmXjipNfpZQoLB XX0II0sbtIp37xhiASFgbiYZ0OAiAhb7Kcwo+scR4CEYDQJ2COJOfTLgiqE3o7uVGP6A oT5WAtYsDktYPRSvlQR6Sgbi1eYDy5WByUIIQjm75vlAUdGteh60+6JOjtzNm1bz6CX3 yn8A== X-Gm-Message-State: AOUpUlHwsQwfAelqwphFAYPCQqOfyrp53AIozRjhtk0G1lPGqKTNID0o Eyk3NPHoT6oIb4ef1NPJrMd6nA== 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 Cc: Jerome Brunet , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(+) -- 2.17.1 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"; }; };