From patchwork Fri Oct 18 10:05:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11198053 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E908E913 for ; Fri, 18 Oct 2019 10:07:01 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 C6F6A21D7C for ; Fri, 18 Oct 2019 10:07:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="He3U2uSD"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nsGuiiyc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6F6A21D7C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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: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:In-Reply-To: References:List-Owner; bh=nx+/pPBDx2YFpgocXlx3jDcR6CuLZlf7NJxd1FaYNtc=; b=He3 U2uSDRuO4PryP8UR8MQFUOYPcxjePQ9VJGYS/2gO03jb7aJNZgUuDs08G28TrCd2FYTQPUCLdmZNS x6SuqNhCO0coQ+oo2nMWpRMBGFBoFPAEA6v/Qe0eIc4gcAWw9o5GQGD27Y4WC+Kwf9OrRjqyC95gZ aMW/r7KgyQLVw8NiQgxdH8poUgamNZ9WDwhK/U5NX/F+bqnGPR6WMb09cRNz/jdCvTdrqvhxa2M9/ 1ZwGqOU31g1GyNhdSSANby9nqnX05mBqOdM8oFHcBCQ+Xu9V9HTaxM9cVspEW+SqQbqFl/jDlUGOW Ji67sTAICERQnM1gOMk0nbbL/mi7Icw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iLP9s-0006RG-Bb; Fri, 18 Oct 2019 10:06:56 +0000 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iLP9o-0006Qf-8Z; Fri, 18 Oct 2019 10:06:54 +0000 Received: by mail-pg1-x542.google.com with SMTP id p30so3116871pgl.2; Fri, 18 Oct 2019 03:06:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=0eiHvls0Nus4fxRx6FaGv3bpIKyYEdO98HSCYTKm7Gw=; b=nsGuiiycXx2WSdCzMwM7OGdczvN4PM5MqGuNK5KbBK+mP6CsDDjlfBKO8iOB7zaLQW jGoS/VU1QmMNOP59S1QiR2CTOneuCyCtsYTCKHNVT5sBT3J44P+GmLqQ3T1hLMbz2qHR CKSQquvIQQZTIYmJx1WEhCU3YJYbZwdsJUHSFRQX3/T5relvq932rSmQB4A1aBGZvWxk Ef2bVxtZC+5hgrsqvB53rI9BxWYsFCVTF3BHt98UG+ith0nm1zYvqDP29WwAvasRpRII GAQ3CsfXbpDqiodJLTpnL98azqjUuCnqUhjMGCJc8J3Aq6bnSgStIauiU9Uxh6tiQaqU f/CQ== 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; bh=0eiHvls0Nus4fxRx6FaGv3bpIKyYEdO98HSCYTKm7Gw=; b=kGr6q8+xpr+esATpsRoAXEdBH/imfHthbSWxUnDglPkn8kQ6X8vtyBevnPlcZQWta/ nM7JW93bzmGkbv7x+69OLlYpNBdSvk49uL9kz2VzbvrNjhmwt03BUbIH52Mj4Pof/puE Ks3rNMlx6+0Tp/EQo/CWCh21t29aIs5CQ/2VaBe3b+k6gITR5QzXDHA/0GDyNtDAUpgH QnY1zkI1h2zERaU8kUpiTSG7FJ56dX1ZHk2mcziIMdKwUJup4qY932OTW1fP5FxV21jo +AOlkKPF9cJkjN9V7eYvjLkbFjItPEe5n5pLl6OE/iRpHaiRZ6gaZseMPfq5LQlkp1Yk F/XQ== X-Gm-Message-State: APjAAAVUvbx03LeaSTrC7NcilZjl0ZKPfyv1yh2e+kafAZoDg1rHoxFb khTtqQhmoh2cDpwOq4C3HQg= X-Google-Smtp-Source: APXvYqx70UPWeYUMTbnQAuBkpbFgsYi5YR99nRWGb7ZPCImvo6SlfmyLcPJ5O9X29TjUttG7WWpTOQ== X-Received: by 2002:aa7:9d89:: with SMTP id f9mr5918915pfq.25.1571393210682; Fri, 18 Oct 2019 03:06:50 -0700 (PDT) Received: from localhost.localdomain ([94.204.252.234]) by smtp.gmail.com with ESMTPSA id a11sm5361901pfo.165.2019.10.18.03.06.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Oct 2019 03:06:49 -0700 (PDT) From: Christian Hewitt To: Rob Herring , Mark Rutland , Kevin Hilman , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: dts: meson: khadas-vim3l: enable audio Date: Fri, 18 Oct 2019 14:05:52 +0400 Message-Id: <1571393152-3698-1-git-send-email-christianshewitt@gmail.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191018_030652_326760_D4A50E6D X-CRM114-Status: GOOD ( 12.21 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:542 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (christianshewitt[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 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: Christian Hewitt MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Add and enable the audio nodes on the VIM3L. This is based on the recent submission for the SEI610 device [1] and the existing VIM3 dts. [1] https://patchwork.kernel.org/patch/11180785/ Signed-off-by: Christian Hewitt --- .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 147 +++++++++++++++++++++ 1 file changed, 147 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts index dbbf29a..d07f0cf 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts @@ -8,6 +8,7 @@ #include "meson-sm1.dtsi" #include "meson-khadas-vim3.dtsi" +#include / { compatible = "khadas,vim3l", "amlogic,sm1"; @@ -31,6 +32,86 @@ regulator-boot-on; regulator-always-on; }; + + sound { + compatible = "amlogic,axg-sound-card"; + model = "SM1-KHADAS-VIM3L"; + audio-aux-devs = <&tdmout_a>, <&tdmout_b>, + <&tdmin_a>, <&tdmin_b>; + audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0", + "TDMOUT_A IN 1", "FRDDR_B OUT 0", + "TDMOUT_A IN 2", "FRDDR_C OUT 0", + "TDM_A Playback", "TDMOUT_A OUT", + "TDMOUT_B IN 0", "FRDDR_A OUT 1", + "TDMOUT_B IN 1", "FRDDR_B OUT 1", + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT"; + + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <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>; + }; + + /* 8ch hdmi interface */ + dai-link-6 { + sound-dai = <&tdmif_b>; + dai-format = "i2s"; + dai-tdm-slot-tx-mask-0 = <1 1>; + dai-tdm-slot-tx-mask-1 = <1 1>; + dai-tdm-slot-tx-mask-2 = <1 1>; + dai-tdm-slot-tx-mask-3 = <1 1>; + mclk-fs = <256>; + + codec { + sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>; + }; + }; + + /* hdmi glue */ + dai-link-7 { + sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; + + codec { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&arb { + status = "okay"; +}; + +&clkc_audio { + status = "okay"; }; &cpu0 { @@ -61,6 +142,24 @@ clock-latency = <50000>; }; +&frddr_a { + status = "okay"; +}; + +&frddr_b { + status = "okay"; +}; + +&frddr_c { + status = "okay"; +}; + +&pdm { + pinctrl-0 = <&pdm_din0_z_pins>, <&pdm_dclk_z_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + &pwm_AO_cd { pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-names = "default"; @@ -93,3 +192,51 @@ phy-names = "usb2-phy0", "usb2-phy1"; }; */ + +&tdmif_a { + pinctrl-0 = <&tdm_a_dout0_pins>, <&tdm_a_fs_pins>, <&tdm_a_sclk_pins>; + pinctrl-names = "default"; + status = "okay"; + + assigned-clocks = <&clkc_audio AUD_CLKID_TDM_SCLK_PAD0>, + <&clkc_audio AUD_CLKID_TDM_LRCLK_PAD0>; + assigned-clock-parents = <&clkc_audio AUD_CLKID_MST_A_SCLK>, + <&clkc_audio AUD_CLKID_MST_A_LRCLK>; + assigned-clock-rates = <0>, <0>; +}; + +&tdmif_b { + status = "okay"; +}; + +&tdmin_a { + status = "okay"; +}; + +&tdmin_b { + status = "okay"; +}; + +&tdmout_a { + status = "okay"; +}; + +&tdmout_b { + status = "okay"; +}; + +&toddr_a { + status = "okay"; +}; + +&toddr_b { + status = "okay"; +}; + +&toddr_c { + status = "okay"; +}; + +&tohdmitx { + status = "okay"; +};