From patchwork Fri Oct 2 14:31:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11813639 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 4724F618 for ; Fri, 2 Oct 2020 14:32:10 +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 03B7120795 for ; Fri, 2 Oct 2020 14:32:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="jN7RO+Di"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HzKtPkn9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 03B7120795 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-amlogic-bounces+patchwork-linux-amlogic=patchwork.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: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=SwPE7rYRrDzCfV9XiYuGzUsSIl+umzOZTugL1URDwQM=; b=jN7RO+Di5MwH5mlDSSVnukvLRO 35jSE9ODXqWgCc5m+VQxyRm5+HLvKD12oYu7QCOIIlYwbAocOs3cGGbIaHsrAptUOSW1L7FI9Bzod Z7QFDr2MwQfieaIy6aLGYvOrYkZstpCDJnbwfKiBNe0iS1YeHFZgQHn0XzcLpDDS+JYUXF3MTKzxO UbL4+uTFlB05nUbEvPo42E2tE6UmXn9MZCVSpDslXau51hqdF8aeosTQWZgto9EuJ1Nt/r41X5o26 KI8iwsYujxIZ+T/lMf4M+oqTuNMc/O9/8pubhxCbuU60NTvwfsXLPUXX5aB5zgy2QdXdIS92tbGQy wKeAoawg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM6H-0001Mg-SL; Fri, 02 Oct 2020 14:31:57 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM69-0001Ic-AH; Fri, 02 Oct 2020 14:31:50 +0000 Received: by mail-wr1-x443.google.com with SMTP id z4so2076642wrr.4; Fri, 02 Oct 2020 07:31:49 -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:in-reply-to:references; bh=UrTzQqJfmOE3wc4LgtWfzvjavE1CxqA487snNOvdDF4=; b=HzKtPkn9lPvk9zekQGxzBIYhDFNmhiIH2IVZUA+5GBMe8/a7f/oD87qbUjd8TsEX8L UfoFMPFmFb/kcEijFUgXnBuySA4y0wW203Ck5X5rkAxkIm3xI8dl+OS1ZWO4/wJ6Xvue KpThXqWs50Q5OyciJu8wYfitbRzkMaz5RVMrsw90jn5d1Jo2709FafQmjG63al/ak9wC 2hZydOSZH+RZ7xnF5U6GvoDEKOSCzPNejVzm+APlbm4ufNTICeFPN5cARj4BQOTYYcrR +wGcFF1WFx66MqyixJl7WvGlWAP11AJRwZWVQUKfBJhRvYugXJFTONBlPO9DI4mNUvWa zBOQ== 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=UrTzQqJfmOE3wc4LgtWfzvjavE1CxqA487snNOvdDF4=; b=SxP7sbclE3dp7oc9/fPWWByPRsd4ORoV22DrSdZTSbyjffVrWIuM4pbUePEZem2ap0 6e2t7TklISFFSISntJU2DDPgUaWHBfEPARjIXGSIxO/YbCq1cl4crgsaHnvPB8a3ig2R aHUVL/7G1EkM/7orgaqiYenMPo+BJ1NEkxXkYLxcoTfL4lC1crndwdKmr0XXLI0Au2nJ 5uq/SwGceae1yJscJTOvV0x2QtP+bbKmI8VU/6yuyZVO1v+iPdzYW1VMXlidrO2wHHrd N+JVIFqoBw/lB7TCx6jgvMs4vGoEL+v0Xkz/GLscMNyd83ynGbStjnIhs84vP9Ws9sEP Qg9g== X-Gm-Message-State: AOAM5316oa5iZTUFzSRGA8eSBaPgaIChC515sAWDWBG80gyRJd1OUIAZ m8PFhprlsqhhwoM1SPzIvMA= X-Google-Smtp-Source: ABdhPJytmUAYV37QaWavgwlpzOpwki1PMc3p+mJ1MwKtsGs63D+2RGUUGDMrlc9koWdviIlzszwzzQ== X-Received: by 2002:a05:6000:108a:: with SMTP id y10mr3640936wrw.41.1601649108246; Fri, 02 Oct 2020 07:31:48 -0700 (PDT) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id w7sm1907392wrm.92.2020.10.02.07.31.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 07:31:47 -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 v2 01/10] arm64: dts: meson: add audio playback to a95x Date: Fri, 2 Oct 2020 14:31:32 +0000 Message-Id: <20201002143141.14870-2-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201002143141.14870-1-christianshewitt@gmail.com> References: <20201002143141.14870-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201002_103149_419288_7F27C8CC X-CRM114-Status: GOOD ( 13.94 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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 [2a00:1450:4864:20:0:0:0:443 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [christianshewitt[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -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_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-amlogic@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-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org Add initial audio support limited to HDMI i2s. Signed-off-by: Christian Hewitt --- .../dts/amlogic/meson-gxbb-nexbox-a95x.dts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts index 67d901ed2fa3..b5b11cb9f393 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts @@ -10,6 +10,7 @@ #include "meson-gxbb.dtsi" #include #include +#include / { compatible = "nexbox,a95x", "amlogic,meson-gxbb"; @@ -139,6 +140,45 @@ }; }; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXBB-NEXBOX-A95X"; + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; + + dai-link-0 { + sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; + }; + + dai-link-1 { + sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; }; &cvbs_vdac_port { From patchwork Fri Oct 2 14:31:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11813643 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 6D896618 for ; Fri, 2 Oct 2020 14:32:19 +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 33F09206FA for ; Fri, 2 Oct 2020 14:32:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="X7cWc9JZ"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EUAtA80U" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 33F09206FA 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-amlogic-bounces+patchwork-linux-amlogic=patchwork.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: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=3FBTSPx8eXa/Zui0fUoLE/JF7S+VMQpqFafQBuuMRjM=; b=X7cWc9JZ9KOUKj4GlsRpCesZ80 s44PTPy/dIQqoHHQJJLJQ527it8gCZPAsPsDp+p1jIQUwtiuobh63l8vThR6HLHTc5mRt4ZCl4636 vprlptCQP6nDF0wUUuuFBoV4KfxkaN/DCKIbaL5DneCkC82Q52DG7YcAN+gS19p42GRrOyvdCucEc cWAMa4O4mSTWAjYeaY2xQUOgdfWgQzPGxq5eqPNhXARUe19uenM7wqIC7bonGu4Mk0NFU75IelHH1 qVHVntTlj3oD+6T/9BROnuANzkg5qzNVLagg5E8MSG5/9t6dPg/e9dME/MyAmSlMteGoZI9wIXa1n skTSOjiA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM6R-0001R7-45; Fri, 02 Oct 2020 14:32:07 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM6B-0001JW-LE; Fri, 02 Oct 2020 14:31:52 +0000 Received: by mail-wr1-x444.google.com with SMTP id g4so2072957wrs.5; Fri, 02 Oct 2020 07:31: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:in-reply-to:references; bh=d988cBXnFVQ/GWsV54ibiM2GROtIFfDIzMG48hK8mIw=; b=EUAtA80UQvGNQ1xuv489KMoHytHnOyynUzzXh4vFWyfNE6vryCNvSPb6JE38dse+ty Owh/rlSQHrpE0vJycQQ+QDzCO8fG1uONM6imaKPYv63KmwBDNIhatYiEPGNNAIU3jZGz i1TeJ0r/WW/kDo8ChFo19yQ7MSTbS3FnKkBfXh4hFobaaI3ZL/93eODs3bWXCRbTrxLK HAxfnu3O9NzWEwp9yaGiyRcmzC2ZAvpwUCGGnnmygy/otUm7UntLxRroQ+tAENGsmvli oMzZKouaZzWTGXn8LJAAb6dbMEDMe8Z56rWOCdcWk8NFzZHM9JLTgDist40BLDjKIXlV cnDQ== 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=d988cBXnFVQ/GWsV54ibiM2GROtIFfDIzMG48hK8mIw=; b=IcWGLK5oOpt8A1WDSyCaz5LBJesOMXbLhiy6REU5/IK6ye5m9TyjAMHbSfkxTYR1Fl urAmt8jAllE38TpM4kt6EUfTz5pffeuqQDk6PQ7VFBBwPQxTh3ZX+bFP8SY9pFXPu41v VhPC+LsewUp2ReScXuLzmFsHT3JQLgzfosX2ANLXN8/9dOon3f1ffyrPMXXSsRCoe+Vd xHqzBpnMLyZUXTdlHmZF8YeVnqjADlJiafhwqPmUM2bAj3f6thcOo2kfP0MYo6g0D554 kgmd07FuTNgcw83LM+GyxUCjZC9rBwF270goXMipfulcJckr8sm/i1fjyDY3Ui/MxLdr 81Mg== X-Gm-Message-State: AOAM532v8KVBAgVElrK5G3v9Xs6aIR955r9ABDZiAtTCzOy6V6JAuzJ1 oQ4vvAftnrC3Kt6VB1Lf8iM= X-Google-Smtp-Source: ABdhPJzZyEF2XAzBOv8Q+l28V5KehUzLh6WUUtuevsVRxVzF68N3vnbNHOGFmHT4k6vXTbyc1hxBCQ== X-Received: by 2002:adf:dd49:: with SMTP id u9mr3672712wrm.392.1601649110552; Fri, 02 Oct 2020 07:31:50 -0700 (PDT) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id w7sm1907392wrm.92.2020.10.02.07.31.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 07:31:50 -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 v2 02/10] arm64: dts: meson: add audio playback to khadas-vim2 Date: Fri, 2 Oct 2020 14:31:33 +0000 Message-Id: <20201002143141.14870-3-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201002143141.14870-1-christianshewitt@gmail.com> References: <20201002143141.14870-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201002_103151_739954_C066E402 X-CRM114-Status: GOOD ( 14.27 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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 [2a00:1450:4864:20:0:0:0:444 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [christianshewitt[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -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_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-amlogic@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-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org Add initial audio support limited to HDMI i2s. Signed-off-by: Christian Hewitt --- .../dts/amlogic/meson-gxm-khadas-vim2.dts | 44 +++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts index bff8ec2c1c70..d4734220443c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts @@ -7,9 +7,9 @@ /dts-v1/; -#include - #include "meson-gxm.dtsi" +#include +#include / { compatible = "khadas,vim2", "amlogic,s912", "amlogic,meson-gxm"; @@ -145,6 +145,45 @@ clock-frequency = <32768>; pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXM-KHADAS-VIM2"; + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; + + dai-link-0 { + sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; + }; + + dai-link-1 { + sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; }; &cec_AO { @@ -154,7 +193,6 @@ hdmi-phandle = <&hdmi_tx>; }; - &cpu_cooling_maps { map0 { cooling-device = <&gpio_fan THERMAL_NO_LIMIT 1>; From patchwork Fri Oct 2 14:31:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11813647 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 AE6D4618 for ; Fri, 2 Oct 2020 14:32:25 +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 7C9A6206DB for ; Fri, 2 Oct 2020 14:32:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LyoV0rfT"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bQ8HuosK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7C9A6206DB 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-amlogic-bounces+patchwork-linux-amlogic=patchwork.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: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=asE5S9SkJwiFyxEVX1d4dB0PPFcoC8gFkgyBO8KVPRM=; b=LyoV0rfTyFBRlVKoGjQOFKxXAo 1GAVzNxVTxwfESnCv4+JxACEFODwvVp0mjuaHXljJQIn0oG8IGQBThFSQbiRNEg5kAcW+MuEU7uHQ sKog5YTOOzVcPAxyeHDAtT0Xa25n5c+JigQKWgh1wkt01zWqerc4ra8l6DIT6grKjkNccwkp7ET9T WVoGkgQn+4Nl6krpCNv6W+0kwqy2Vv/9S54m0RApoGo9eWMA3ExjBqRWcjrR2q8TkZh8xncnFA9Da IWIgsroFGhhMWtTCSLdAK8ax37G+EIQ7UcX2A3xMfjAjjCOyygucWE2866d0z5cvbD9mZYEE8/kDP WQ5ZMKbg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM6X-0001W1-Vh; Fri, 02 Oct 2020 14:32:14 +0000 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM6E-0001L3-9i; Fri, 02 Oct 2020 14:31:56 +0000 Received: by mail-wr1-x42e.google.com with SMTP id x14so2049012wrl.12; Fri, 02 Oct 2020 07:31:53 -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:in-reply-to:references; bh=0aTKJ5HZFsSQ+eCcPAw4QelVRGYoHt0VsuUcLv/a/yw=; b=bQ8HuosKyxmeQ3WbtUyTHC4zSKTW3v4sCj/w+hkIYKGWd7XdCAZD0GBPUL7DLxQLDJ 36GQTQg2Y12jWPm3ewVItJvqSrnt9pR/Wr4JyKxDDhzlOlv8G5QRqWubIbQwQr90ENg4 xkcTBaQMnQvTxw/WVhlSeiOvxfvKvNg74hMXch3/rxGQraMhMLKfZuaSE0Ekow9McZNk QjYDmuUq0K5MjR0uEv9zL8OH4ZpAEiS14ZCs2RdeERbOEkKIS0TiwcOKaqlSCj0WYvOa r3wmT06NDWs6sqL61W0oa2vup1/eknpbsQgIsbCX6pslMBVRdKxrpZ2aYAegl28QRqii 61Gw== 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=0aTKJ5HZFsSQ+eCcPAw4QelVRGYoHt0VsuUcLv/a/yw=; b=Qj0Km1PWPP0Q+xAxQraLLjzhT7oQOT4SCKOUYI5P/DXm8xKuZtIMT59EcKkXEKq8Ef DK6ay0cJDzGM96swQ2jA8jkIgLmqNJuQxLhAnX/Q7fHBLGqXX6wX93TeLFyuNAJlRJbm 9UJLgECtQkSPnZ6Apf17PgpAt0RrTgA24yVJ0Tg/VmTe6/4aeZimwXQ7Eeu7pChNJx4u Q7givoMxbjR8veJjee3xkwyeEUP+llGyrr3VjTEqOMjydeVSrI1rqJD8FJomlJdf4F3a 8qD50yZyTCJ09PB6HgKi11o2YVCYIR2DF5yYZuIQ0kztw597vPlQ9/X7HboICZdT5KTd AMkQ== X-Gm-Message-State: AOAM533PO9rE+gBeAI0rzG2BW+0unBEm4CWSB7oXFLexqyOknQqK75P4 vK4A7wRvh/tDxBErtaMsVmo= X-Google-Smtp-Source: ABdhPJzmGKTSVIyJKZrq/Ucd6LZFnwsseoUQA8ZLNCQLzqK4EYyKzRlzyq63/XFTwQCkOAT7QSFprw== X-Received: by 2002:adf:eacf:: with SMTP id o15mr3660294wrn.12.1601649112935; Fri, 02 Oct 2020 07:31:52 -0700 (PDT) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id w7sm1907392wrm.92.2020.10.02.07.31.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 07:31:52 -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 v2 03/10] arm64: dts: meson: add audio playback to nanopi-k2 Date: Fri, 2 Oct 2020 14:31:34 +0000 Message-Id: <20201002143141.14870-4-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201002143141.14870-1-christianshewitt@gmail.com> References: <20201002143141.14870-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201002_103154_419380_9F47C47A X-CRM114-Status: GOOD ( 13.95 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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 [2a00:1450:4864:20:0:0:0:42e listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [christianshewitt[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -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_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-amlogic@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-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org Add initial audio support limited to HDMI i2s. Signed-off-by: Christian Hewitt --- .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts index 7be3e354093b..8e5df00b06a2 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts @@ -7,6 +7,7 @@ #include "meson-gxbb.dtsi" #include +#include / { compatible = "friendlyarm,nanopi-k2", "amlogic,meson-gxbb"; @@ -130,6 +131,45 @@ }; }; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXBB-NANOPI-K2"; + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; + + dai-link-0 { + sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; + }; + + dai-link-1 { + sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; }; &cec_AO { From patchwork Fri Oct 2 14:31:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11813651 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 452516CB for ; Fri, 2 Oct 2020 14:32:38 +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 0BAC7206A5 for ; Fri, 2 Oct 2020 14:32:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="064m4UsY"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AaUyGK84" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0BAC7206A5 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-amlogic-bounces+patchwork-linux-amlogic=patchwork.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: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=N3d+1qMAMCn/Ioafkz8OMog6BT9KDCTieY6SDpBFTj0=; b=064m4UsYXT1HxxyDBaadgcubkM 0nNTV2kfubYv3nf57RIJiMQC73EKI5mLSfWhEJnXkVXnXK2iZ3hA6m+2sm4KkOuznc8zt6v/7vY1m pJTRg7nEjITrqCPsSh8qUJrAjuxXZkzULfUOfdAN4EBRZ0T5Bk388NZfVZoY+PiBYdCuDASZt6SwO hQsSI6gKPy3FtzCIR6qyuuAr1AHu5evKBCTXGdmV8PYjQBwX728WqSSuc9K0KhjLRq2zRQ293k2tC ssmmkks4ejPC9y+DYb2g4ShX98zf5ykO93WMY4sz7VtQH/IGg36nXqhxowRjm9i+SFg5sjPQ7GbpV xlRdtpZA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM6h-0001bJ-Le; Fri, 02 Oct 2020 14:32:23 +0000 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM6G-0001Lp-KC; Fri, 02 Oct 2020 14:31:57 +0000 Received: by mail-wm1-x335.google.com with SMTP id w2so1913185wmi.1; Fri, 02 Oct 2020 07:31:56 -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:in-reply-to:references; bh=6vYF1uN6y1MEmfx/aSCmf3xT19pRJOVeWursMQGhdC8=; b=AaUyGK84xBFyPVOg0YZiTXYH5egnyUTDIGSp4B3YsaOkc9U3nnFYHcwiwY3ia2ZJd0 zJjULreOxlvZEtIwUPLlPum3+szJpSsWj7kv7xETTJqISiBgjiQXMa5GSJKusmOmRibo Wsr7VJiQkaqQCPXqCr2FYuRfpYTH7pdIyrnjbPoWt4sPobl7CVYSfAXOqf3RGF5U6f1Q OCybM9VfznmPRqUuCcQe2vry+0WGUk7pj9HCOj6gU0H8l48UUzCOJs/2+adCV6S2whs6 QcZPwp2MaJyAAURazMnjYt9KOtfw/mYobKtWrdixyRn/BGMKxUzCigAb+HmPkW4R7jmg xUXQ== 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=6vYF1uN6y1MEmfx/aSCmf3xT19pRJOVeWursMQGhdC8=; b=ot08dI7IlOwk1CQwmT3PWWPtl7bswnMm5g2P42Jo2HQvk8vIx4RadPhGzvNHhYs4O7 AxlS3rjFUv0H15w/ISTlshlX78Zh/+mszSyyeKStOOuCycHuldnB6SsHTKP8uxrSSKCh XYThBQd4Bl0wZlwwlTsZVOBV4jKr88dLpvUGcehBsqd2XwlXaVBrSQIXxxTHxJhu9ZG+ KVBTiuBG/S2vT/7h8XZDtbPqx3UNUwsc4JMHnMJSjvCv1dfLJ5yc+1pE0lkywxVYa1lc btHyv1UHn9V0Nv3AGsp69jUGQdWQMuJ44qFEZYoXWWEZ+K+/vKEY0wJN44UqxKG+PZyj 0fAg== X-Gm-Message-State: AOAM530IjJn4MqiVo/iOpnPWY9MubNZvhTnL8PcbjP2CD/jP86j4CBUL UnSzBAI3QkSxZks+4IiaWFo= X-Google-Smtp-Source: ABdhPJzq2KLlz7Op/+6RpflhE0nKkBEmL5fs38a+YROdfaB2AoGUhFbZYrhx5MjHepSHaJ41Q7AYdA== X-Received: by 2002:a1c:9e0e:: with SMTP id h14mr3202779wme.18.1601649115216; Fri, 02 Oct 2020 07:31:55 -0700 (PDT) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id w7sm1907392wrm.92.2020.10.02.07.31.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 07:31:54 -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 v2 04/10] arm64: dts: meson: add audio playback to odroid-c2 Date: Fri, 2 Oct 2020 14:31:35 +0000 Message-Id: <20201002143141.14870-5-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201002143141.14870-1-christianshewitt@gmail.com> References: <20201002143141.14870-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201002_103156_680438_EFA440A1 X-CRM114-Status: GOOD ( 13.84 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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 [2a00:1450:4864:20:0:0:0:335 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [christianshewitt[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -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_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-amlogic@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-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org Add initial audio support limited to HDMI i2s. Signed-off-by: Christian Hewitt --- .../boot/dts/amlogic/meson-gxbb-odroidc2.dts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts index 70fcfb7b0683..9d8c919c6e19 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts @@ -9,6 +9,7 @@ #include "meson-gxbb.dtsi" #include +#include / { compatible = "hardkernel,odroid-c2", "amlogic,meson-gxbb"; @@ -172,6 +173,45 @@ }; }; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXBB-ODROID-C2"; + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; + + dai-link-0 { + sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; + }; + + dai-link-1 { + sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; }; &cec_AO { From patchwork Fri Oct 2 14:31:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11813653 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 6052E618 for ; Fri, 2 Oct 2020 14:32:42 +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 223D6206DB for ; Fri, 2 Oct 2020 14:32:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VIUD3AfA"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XbqwofO3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 223D6206DB 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-amlogic-bounces+patchwork-linux-amlogic=patchwork.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: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=9Pk3vF50ESHZcpfQJ9f1EUt7hVg4dMuyz9kcXUOW7Gs=; b=VIUD3AfAg3KhZSeGxk6eXbq0yM JUHAT/J5Gf4e1fmP6MRzIv9Lf+cwEXmmOWh2ShLGTIeX2zgwBFmJDKiuZqWCUaz0g8bpY2FQpYf4r cJ46hhaRjCoZxMMOWDFCjTn0uHO/nZmKovmWPloSVguc1KGnDfWeA/E8Y5rNQVQMQk59dvcLoN2+z XZmS5XILFx+HU/ATdlmleuFkFJ15lTBGowYzWDaLo2QBwD8ln+TB6/qtkxjsyPBI0q3+HX2ZvG9kz JzSzLqMLVOqUG27ZFXcYnccVsV0eVrFKmW3h8YAQKDMiBKkQaO9e01mLMnjmMdqV9MmAUMp0zI+A9 Ebnp7EXA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM6m-0001e1-3d; Fri, 02 Oct 2020 14:32:28 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM6I-0001Mo-Cd; Fri, 02 Oct 2020 14:31:59 +0000 Received: by mail-wr1-x443.google.com with SMTP id z1so2078138wrt.3; Fri, 02 Oct 2020 07:31:58 -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:in-reply-to:references; bh=ylzKfvJHgekxjZxp4VQuW17EoD7pYVoukf8XeW0SJg8=; b=XbqwofO3O11m65QXRe/QBPxMtlN0jHNDW1/9N1+6KY/kcOu4HpE6dpJb6A26HH3P8F 1aKh9GaoUe2mGwk3lS6sYEvr8hKBKSFa6PxhJhe1IRjH/20J+qH6Nx1IVRqopBAqFp4b sHv+YoNSmLmrrgXOUyUA/xNYYYHix6ETd1bK7mj5mxeFBY5INPHFeF8GC1RQT9cw+qtk C0M8Uk4WjFZdsaaRa/omRTLiTz8RtjTQhJ1lPQ7JkltIDIL7Gp2YrUgL4vslq3+K9P0d 0QVjmLEsJg1yxcMOR8aIhwLSg2lg5XBHAz4zTKCb3tXhD3wJ9llY5+uU4hHOGKZFX0iI 9PHg== 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=ylzKfvJHgekxjZxp4VQuW17EoD7pYVoukf8XeW0SJg8=; b=a4r9mkRenhVguKjPKZH43KSwwLPQep5W5L3/UAwXgQMrIIEpdDnXSUD9FdlQwly7cZ d+4Kr3ExHuDJwD+GeEznnUMccZlRCIQvNA7fUkUbR+Fyl8fFbqPBVsNb7R+N8EuPf5b/ U04wpk8EJjl0toJ1HHcRTiMfbNeGMhAfYjlOzvxrCgLLTXz99rGRUU+LeyLO0kV6BK2s f29rReXHWl3SrJqNL1YgfLcRJbLU/LABB2CGOj92HgJq4EKQBHZzpYFwCfO6zTF4teVi UgXQ7s7xa2xU7eLGV/vS/7SB07KWQS61eehrRjVZoEoHdGE1pSQetjym5Vvtkim5huzJ JxXQ== X-Gm-Message-State: AOAM532NHL0xgyvggBv3EjHA2imsFjJNPDEeXzlG67UfqZYzoqyEcCHr yztkR57tamqQ67trYBjVyoo= X-Google-Smtp-Source: ABdhPJxuSUH+cCX/j54h5vSEXs1aca7IwudIaTc+P/uCLZpygcYQ2z5Wz5xyMZvEumEh7cMnuc9l2Q== X-Received: by 2002:adf:ffc2:: with SMTP id x2mr3327483wrs.48.1601649117431; Fri, 02 Oct 2020 07:31:57 -0700 (PDT) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id w7sm1907392wrm.92.2020.10.02.07.31.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 07:31:56 -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 v2 05/10] arm64: dts: meson: add audio playback to p201 Date: Fri, 2 Oct 2020 14:31:36 +0000 Message-Id: <20201002143141.14870-6-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201002143141.14870-1-christianshewitt@gmail.com> References: <20201002143141.14870-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201002_103158_465351_240D2D07 X-CRM114-Status: GOOD ( 13.14 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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 [2a00:1450:4864:20:0:0:0:443 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [christianshewitt[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -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_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-amlogic@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-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org Add initial audio support limited to HDMI i2s. Signed-off-by: Christian Hewitt --- .../boot/dts/amlogic/meson-gxbb-p201.dts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts index 150a82f3b2d7..2e2bccbcfd43 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts @@ -8,10 +8,50 @@ /dts-v1/; #include "meson-gxbb-p20x.dtsi" +#include / { compatible = "amlogic,p201", "amlogic,meson-gxbb"; model = "Amlogic Meson GXBB P201 Development Board"; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXBB-P201"; + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; + + dai-link-0 { + sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; + }; + + dai-link-1 { + sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; }; ðmac { From patchwork Fri Oct 2 14:31:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11813657 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 1E0A7618 for ; Fri, 2 Oct 2020 14:32:58 +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 8973D206A5 for ; Fri, 2 Oct 2020 14:32:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="AoAg5SUt"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MT/dm23d" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8973D206A5 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-amlogic-bounces+patchwork-linux-amlogic=patchwork.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: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=Y17kKEVlBSrZBxTR0WFjnwVod5LtYPPsA2ZKDMxR+Ps=; b=AoAg5SUtgZYc2vFVhKNZ3MOwxa uBL3smvuSbkYvMQ1aDB70FHaUP3f8jVNiRXeYrUhqfQiG2gwg+KXadx1iQrdU8hJ2lqAMZ2LXmbDW j43GJVykzwMXLD6ePu16eqXdAH0hbgAHhf+GKcYWXIKWmu6WTsqdBkEUe7b4pn1LZy/rO46rhRyvK c3pSSkfUiAK3fUelfpH+2xxPtOO609v9HLvbixnlMkAxCa1bIDIlueUToaV957dLtctlps/T2/cl1 m7lndeiGGtuItS3uJg6+jo5nEo0MJC28ps4CKixET3m0fFtVz53Y1RQXUAwdpWEz9IccPiaDrQkYw CwDXx4ZQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM6v-0001kL-Az; Fri, 02 Oct 2020 14:32:37 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM6K-0001O9-OO; Fri, 02 Oct 2020 14:32:01 +0000 Received: by mail-wm1-x343.google.com with SMTP id v12so1985163wmh.3; Fri, 02 Oct 2020 07:32:00 -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:in-reply-to:references; bh=3IIVS7MhfURH0UVnp76zcUfKlv8hfdezuu29h1qTO9Q=; b=MT/dm23dknknl82NUiKS5toDjY8Dspqh3oVRx6cYbQvsHxdLfjJWVbNgZzypwLeabf oOuITmGGf4OYIRwKH6bwjLX8GVWNVI82hCm3QfoWk9V4xqg/umNEFtMAwgIfoHjRsSbo tTYa7XrKRAjYEErslFHmdRDeEw5vBtJFQtM1/isIpN96Qg0SIag8z/uucfCQF7nTP8tO jYjyxZKUsi0xe4qBduKgRIvHY1iPEFZZXEMvetBySN28M/VkCUIILbVJlimPoyRvtSTE uZBvvpBqRIlNDcziMG4eYGHW36sDNIp1fkgPvWRQeBIRbSvKtS42ReFg0AyURmVFLr7I gVBg== 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=3IIVS7MhfURH0UVnp76zcUfKlv8hfdezuu29h1qTO9Q=; b=N6BivS5q1BouOQzO+p0FmVr+dN40/TVVMlWPr549ZMdE2eV0HZD0bVpYYZUx/jD1Ia TnOEs1gMfc4bNe7tFlEt5UliQyH6GaryQkg2Nokrqzi4CDLdl4PhBcEU7IZZIqiwi/kK OKXX6ujPxH3ATAjo64vi28Da3gvyo231EEGIt6sBcPIgBLWHNw14eP7gRzHcuPOq9+we nbGSsQtlyWGAjkKHK7lxcmA8aFi7Ibsnp7ZKdmQCJnJDWU0WfKkvC4/SIskjEMP3L9Aa WttGXr8AKOlIyqVDsBQj1iBmWmYLcqmveZMijuU1nCfx43AggCnJVRzPghPWk1Ikrada kxtg== X-Gm-Message-State: AOAM532Ks1tx7dMTIoLBXirPuO+T9tcQgpNEqtW/AqYuuq2wPPYD4yYF 9slPrVSqm7kOYx4E3DiwOYQ= X-Google-Smtp-Source: ABdhPJxv1FFukIDOsjMvcoPqLpB+sbG6b0+XAnD0u2gDzADjf1Rjnv7//yRTGH7MKvpfzkEGMlv0NQ== X-Received: by 2002:a7b:cc02:: with SMTP id f2mr3137007wmh.1.1601649119669; Fri, 02 Oct 2020 07:31:59 -0700 (PDT) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id w7sm1907392wrm.92.2020.10.02.07.31.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 07:31:59 -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 v2 06/10] arm64: dts: meson: add audio playback to p200 Date: Fri, 2 Oct 2020 14:31:37 +0000 Message-Id: <20201002143141.14870-7-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201002143141.14870-1-christianshewitt@gmail.com> References: <20201002143141.14870-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201002_103200_845573_B646D028 X-CRM114-Status: GOOD ( 14.40 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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 [2a00:1450:4864:20:0:0:0:343 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [christianshewitt[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -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_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-amlogic@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-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org Add initial support limited to HDMI i2s and SPDIF (LPCM). Signed-off-by: Christian Hewitt --- .../boot/dts/amlogic/meson-gxbb-p200.dts | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts index 3c93d1898b40..a16dac72600d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts @@ -9,11 +9,19 @@ #include "meson-gxbb-p20x.dtsi" #include +#include / { compatible = "amlogic,p200", "amlogic,meson-gxbb"; model = "Amlogic Meson GXBB P200 Development Board"; + spdif_dit: audio-codec-0 { + #sound-dai-cells = <0>; + compatible = "linux,spdif-dit"; + status = "okay"; + sound-name-prefix = "DIT"; + }; + avdd18_usb_adc: regulator-avdd18_usb_adc { compatible = "regulator-fixed"; regulator-name = "AVDD18_USB_ADC"; @@ -57,6 +65,59 @@ press-threshold-microvolt = <0>; /* 0% */ }; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXBB-P200"; + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; + + dai-link-0 { + sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; + }; + + dai-link-1 { + sound-dai = <&aiu AIU_CPU CPU_SPDIF_FIFO>; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-3 { + sound-dai = <&aiu AIU_CPU CPU_SPDIF_ENCODER>; + + codec-0 { + sound-dai = <&spdif_dit>; + }; + }; + + dai-link-4 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; + pinctrl-0 = <&spdif_out_y_pins>; + pinctrl-names = "default"; }; ðmac { From patchwork Fri Oct 2 14:31:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11813659 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 89B3D618 for ; Fri, 2 Oct 2020 14:33:03 +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 493FB206DB for ; Fri, 2 Oct 2020 14:33:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cgdObibH"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hA7YHt1V" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 493FB206DB 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-amlogic-bounces+patchwork-linux-amlogic=patchwork.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: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=066PBO4up08RESHKbJddZF7DnqHfW2H2es6x7reyC3Q=; b=cgdObibH5bhg3yRsEt3Aa8+NFt ZgXG2S1XGe2YxSnPSBeUwDTY9jy0F00SnjVH8XZ9elcbJSml3iACmU8XKbd5nFeFZ1Ia6/qtAUDyT 69OqaCbdJrxxtHmdgnpzCkkBbC2cqxWK4fqIy0RXXQR4kvBHlL0Y98aJQcT00nPt8+dFkiOgkTNW/ JNnP+WOW1UqOgol5CoUrzsq6GKFjBzqFeO9zd7ouFvoDmBOkEBjOOzdzCBNlSqD4g1MTSa6nDRNe6 KycDZdJKfoHzT1f3hPt/n1P9jpArLgeqcl0vaN5IK/YgK4ddUSqF6CeMmiAaCFrYNjHhxhdH2ah3z /zSQQjug==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM75-0001qE-HY; Fri, 02 Oct 2020 14:32:47 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM6M-0001PL-Ur; Fri, 02 Oct 2020 14:32:03 +0000 Received: by mail-wr1-x441.google.com with SMTP id c18so2057864wrm.9; Fri, 02 Oct 2020 07:32:02 -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:in-reply-to:references; bh=DR+MN9yI45B0CbPas30C2sDxsoxmrDbz6ZTE82Yi1YU=; b=hA7YHt1VQf+I7mQTtL0IMemPkyrBpn14q39F9bkrXqgKjm6GF39cFze3zg/0sFyNRn SI1nL8BwioMNZhxPA9RBuIqWwLOXwpO8qjhw0fb7QkRu1b5TwOdyArOnZS51FvHKreOd qM7ylsMUE6Y8NJGjpPoMv5vS9BVdvLrm6FazfxWlJDZRJwTCRDQzAdfX11hFfb8KZVBe zs9G+uT4vqlBU2gRXljx63OZrYq0DIpqfhEcLYipci73WKwzovV9soeHOoujpjnqBR2C 4ghq/CTJJCvN/pTD4YQHJzGYhjssztqvtu00CexQQcdWWzxIgdUJW4I1IXR91H0ekfAL Vb/w== 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=DR+MN9yI45B0CbPas30C2sDxsoxmrDbz6ZTE82Yi1YU=; b=Pcj/BNkfaEDWNt8kT98XmbQ6XTVOQuQbLJNReMgqskPOphra+Iko5pZ+hoCisYLfzi dZzRbqrXorgmxo8wO288gDyIzBhToBP+N79a7DvqIkH9EBSP9xo6srrnbyWfxrDPCFmW KLtS8IVW11C11774H3GIdUdxe8pBwh6i0azcXvnUNx5PGWcZwcsF1iBvJcUoqM2AO84L cG9p/eVOLqYNGQOCy/UprDYcC4fI1ihK8aUDQOZ/t3qy7QMTIZ4CBMzMpC9w6ZkkEyep hi0IuFGWMEGM2T1pU8fo3Wqw4+hWnL6cm9wy2F4+/AJU6TxoMOqm8Nao7Zq3aFSkO6PY bQvg== X-Gm-Message-State: AOAM530u3UZTRedpgH/P6Uny/OnZkv/Vwa59QmXwZJiK4k+ocbMTEo4d Dej7dmV5qJADABkoizTKB9nu92GrQIQ= X-Google-Smtp-Source: ABdhPJzDRzc53W8EhYqCtpUVtGfSgBpzhIfazEvaTgRcMzr6Q/f+pHsYad3LwQes9oZBszHy/BCs3A== X-Received: by 2002:a5d:4388:: with SMTP id i8mr3398904wrq.365.1601649121861; Fri, 02 Oct 2020 07:32:01 -0700 (PDT) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id w7sm1907392wrm.92.2020.10.02.07.31.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 07:32:01 -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 v2 07/10] arm64: dts: meson: add audio playback to p212-s905x dtsi Date: Fri, 2 Oct 2020 14:31:38 +0000 Message-Id: <20201002143141.14870-8-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201002143141.14870-1-christianshewitt@gmail.com> References: <20201002143141.14870-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201002_103203_089391_5719AED3 X-CRM114-Status: GOOD ( 14.12 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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 [2a00:1450:4864:20:0:0:0:441 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [christianshewitt[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -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_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-amlogic@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-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org Add initial audio support limited to HDMI i2s. Signed-off-by: Christian Hewitt --- .../dts/amlogic/meson-gxl-s905x-p212.dtsi | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi index 05cb2f5e5c36..40776d42bf8e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi @@ -11,6 +11,7 @@ /* Common DTSI for devices which are based on the P212 reference board. */ #include "meson-gxl-s905x.dtsi" +#include / { aliases { @@ -85,6 +86,45 @@ clocks = <&wifi32k>; clock-names = "ext_clock"; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXL-S905X-P212"; + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; + + dai-link-0 { + sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; + }; + + dai-link-1 { + sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; }; ðmac { From patchwork Fri Oct 2 14:31:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11813663 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 A5757618 for ; Fri, 2 Oct 2020 14:33:21 +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 66DB8206A5 for ; Fri, 2 Oct 2020 14:33:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="aYbS9J50"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IBzt1wXL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 66DB8206A5 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-amlogic-bounces+patchwork-linux-amlogic=patchwork.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: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=i54K2S3tlbFoVJUQdVSuVkFBvnG+TtHSHamLti3iuB4=; b=aYbS9J50tYyWjbKwy+vD5/aWKg +wKLlflF4BBfBO1EsVSAQ+3SbnYYKx46eILeQq67gnh4QEZ/fV6T9m6+mY1o4plq4jRphpOm2iYzN hIElrfP71Z0uUWFWx2c9hWKJWArmpjp4mkU6V+Q3SY6ko7kQgi1iFEhEey5bxNTQAhcWz4u00N9py xxcj9khesTc0J+k+/8pMsgz2rXYOnBQzKnMlROlFGxz1TgLvSHU/8OfiARUKyk+iuPRWR285s/unT Kc9lSFY+aBWEe4LfMsD3CV4zLd6/omqly9npEA/unp34txq8kLAjdBPwJykIWTtHzUDc480YBZKKv ODiVHOyw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM7N-00021P-4h; Fri, 02 Oct 2020 14:33:05 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM6P-0001QW-F6; Fri, 02 Oct 2020 14:32:07 +0000 Received: by mail-wm1-x344.google.com with SMTP id 13so1917852wmf.0; Fri, 02 Oct 2020 07:32:05 -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:in-reply-to:references; bh=lDvI8JDwLjhA5jkV3AvGA6unyQL/mwAeBeK74iYRYOY=; b=IBzt1wXLRAP5OXl1AVCho6pGVibOE4hdXKs+io0/xIaGLM8ouAJxX2HfBFPzyOnALI uV71BLTVIZkhGOCDej5kv8RFqvhMCjXmuyxCRo2EQDytxPPlnXThty9dMjXTgzkx6ZJm grYbvcssaH883w0f3h23V2nqI9Omzm1xEA8OmIJCdg5CvfJhllKSwha+5rnraJq7kk+5 SXZQjRHm/tAd6szw4fV45KCwmJ1yVxYx5m6dYIu3HBXmSRoAGrobzpKyBhU4e9oSEQ4m A7N/T9HVHIm6i77XzBgPaEYr1LrKRhRJLX8mc+RCnhjIOa5TusI95bOOzC1vTRib9LkO Ye2Q== 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=lDvI8JDwLjhA5jkV3AvGA6unyQL/mwAeBeK74iYRYOY=; b=ih/0HKxLFNRHAi+po078yte/jD+sabuP4vlJcrY/KRcZAUiuPZPI6mTlmr0mWGO1KX xRug8faQakRiu7Y+42AwZF9VL8C+ME5iWKYKEP8ICK2MLbqjdCUGxIfUzubHOZNvsi2l b6Chkc4Ln5fZzyIoYsbwVmfn53D8yQrSDy+OXXoZXgZr+P92iBVsZpE2TztUcvb+w2Ua tb0Qor2xBrLdgOsTwUNAWA1eo5Sl+ZPfnlDyDcdxy7NCVWTmwsLH25N/6OGFyNAthdMi q/ib3X2I6B/pw7Fn8ILcQ+W2St0zz+npxHhqEYne9hdPZ2BI0rS0r8zhh0LUH5GazfkC S8SA== X-Gm-Message-State: AOAM533Dhxkip81liz3QZSCqFeuTvrS+eE3653FOG1YrEme4Yn+yK0IW 12ujKNaRdkcCHl9yCyxwXSA= X-Google-Smtp-Source: ABdhPJzY7XCXqlnxJ+uSLghfT7uu4+brizDVTK/yBPMA7+xAj8nlahY1gcv4AuHhISIxlo1gDyoRaA== X-Received: by 2002:a05:600c:21d4:: with SMTP id x20mr3182114wmj.26.1601649124151; Fri, 02 Oct 2020 07:32:04 -0700 (PDT) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id w7sm1907392wrm.92.2020.10.02.07.32.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 07:32:03 -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 v2 08/10] arm64: dts: meson: add audio playback to vega-s95 dtsi Date: Fri, 2 Oct 2020 14:31:39 +0000 Message-Id: <20201002143141.14870-9-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201002143141.14870-1-christianshewitt@gmail.com> References: <20201002143141.14870-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201002_103205_697481_B475723A X-CRM114-Status: GOOD ( 13.51 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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 [2a00:1450:4864:20:0:0:0:344 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [christianshewitt[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -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_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-amlogic@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-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org Add initial support limited to HDMI i2s and SPDIF (LPCM). Signed-off-by: Christian Hewitt --- .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi index 222ee8069cfa..1300585a1ec7 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi @@ -4,6 +4,7 @@ */ #include "meson-gxbb.dtsi" +#include / { compatible = "tronsmart,vega-s95", "amlogic,meson-gxbb"; @@ -17,6 +18,13 @@ stdout-path = "serial0:115200n8"; }; + spdif_dit: audio-codec-0 { + #sound-dai-cells = <0>; + compatible = "linux,spdif-dit"; + status = "okay"; + sound-name-prefix = "DIT"; + }; + leds { compatible = "gpio-leds"; @@ -97,6 +105,59 @@ clocks = <&wifi32k>; clock-names = "ext_clock"; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXBB-VEGA-S95"; + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; + + dai-link-0 { + sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; + }; + + dai-link-1 { + sound-dai = <&aiu AIU_CPU CPU_SPDIF_FIFO>; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-3 { + sound-dai = <&aiu AIU_CPU CPU_SPDIF_ENCODER>; + + codec-0 { + sound-dai = <&spdif_dit>; + }; + }; + + dai-link-4 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; + pinctrl-0 = <&spdif_out_y_pins>; + pinctrl-names = "default"; }; &cec_AO { From patchwork Fri Oct 2 14:31:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11813665 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 3BCF6618 for ; Fri, 2 Oct 2020 14:33:35 +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 016BB206A5 for ; Fri, 2 Oct 2020 14:33:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="UthTARbY"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pj+8VvXs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 016BB206A5 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-amlogic-bounces+patchwork-linux-amlogic=patchwork.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: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=PjICXT0jziLpg+UoF6nxWDTVYM+dw9tMrxNPojKbmCI=; b=UthTARbYaGm/RvitdYkHqu0oRV SD7V1RLYuFdGFYTFvvWUjBGh5THcuZQeNDQJDMPgbgRqWXNqnjgrVlqm+pTym/uFqrSQuS3ONtMhi zpJuafuvlTZWYrLTQEzRjCMbLI2A3rVYmggfp2YHSMUX9rBY/7sPV5kPvv/iKPJEwMx26/U5e2mX6 VobMAJ6PUXz2cra5zneHMewkLHPpLcxv6bD19YX1cP9KcwPOVaXrrFQX3GSgoZQWWCly5EXpwTCYR +sVCMGm6787PKc9fSzfWVBg1ZdooTjxpi45/4Fnvsq1Anih9s2VylqU1lcMPRNgm3kKN82VqxBb5v ACdhNxeA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM7d-0002CW-BF; Fri, 02 Oct 2020 14:33:21 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM6S-0001SB-9e; Fri, 02 Oct 2020 14:32:09 +0000 Received: by mail-wr1-x442.google.com with SMTP id z1so2078725wrt.3; Fri, 02 Oct 2020 07:32:08 -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:in-reply-to:references; bh=+sbzGxZrB59pV6U+pYub8QGMoi1y6WlUsM0RAR+NpTo=; b=pj+8VvXslvuR3nz30A+DMvVhA7P3mGzEZM4S+FepgZ31cslIdvG/+u0VyLgbloPvMK veU5sTbMR3FEVFx2IM58C0rYfDnujRBsIKrfgBaV0Gd91zjNkwYoKtSl5p9D+QSfbNmr ZiB75D6poMj95qN/gRi3fBbLFrfv6XJseAhKryMINkwN1JxPvwt+R2mvshlnxUP8/KVB Z/qd07ahj+xSmBYdyvaS4SJ6F7EtiDMRUegW7w1g4JEzEBMSWGV8InJSe1uNOVeZUkQg ESgtpboIla6tU69jWn6uN3XqOmy6mFH5EU+cBQu+kzAn0dQH6hieWfdgUktRKFIOW9Rx ur0w== 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=+sbzGxZrB59pV6U+pYub8QGMoi1y6WlUsM0RAR+NpTo=; b=iJmWKeDzTjDSQspgNG1LTSR6Mxx4zC5Q3SJCUltpe968xQ5ipFnXGrNuCSccOKeDw/ Y5ramyHkmnwLOMcFU/422cocAstUT7slkOfTBLM5Eom6/ziCRKcq9625+cQcuttPyM0v f5ef8WA5qFJ+SDCZBmUC2yvlV7Rr6KZClFsePYq4eUekY3Yi4zWJYznEmexeDWKW8lEL HkQDEzkQS4c0jpEvHt4eTNpRiaib9NaTz35QEJSV/4sVWADxrQo3YoM5aQKLLbCO4eBm EJMX95gwDq6oyPMmcmWeaHuhIrIZp0bs5WuVQw9k/H0OZ6triMyn+v2I+WK0BQlsaAsR oBtQ== X-Gm-Message-State: AOAM532BVgXrPYjrZwJTJladzV6Qn+jYWo4uZ/8oNa61By1j2STszfiC ooxM4aIYWG3MzsBabxvaiyI= X-Google-Smtp-Source: ABdhPJyAARAGtC9AIxB8XDdTw4yZaEo0GlJvTcgHnIwHrklz8Y0xB7FJfZCmlZBWWSx6HDVfZUzXaA== X-Received: by 2002:adf:fbc5:: with SMTP id d5mr3284284wrs.232.1601649127049; Fri, 02 Oct 2020 07:32:07 -0700 (PDT) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id w7sm1907392wrm.92.2020.10.02.07.32.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 07:32:05 -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 v2 09/10] arm64: dts: meson: add audio playback to wetek-hub Date: Fri, 2 Oct 2020 14:31:40 +0000 Message-Id: <20201002143141.14870-10-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201002143141.14870-1-christianshewitt@gmail.com> References: <20201002143141.14870-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201002_103208_458682_E4A389E2 X-CRM114-Status: GOOD ( 13.24 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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 [2a00:1450:4864:20:0:0:0:442 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [christianshewitt[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -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_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-amlogic@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-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org Add initial audio support limited to HDMI i2s. Signed-off-by: Christian Hewitt --- .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts index 83b985bb015e..0c1570153842 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts @@ -7,10 +7,50 @@ /dts-v1/; #include "meson-gxbb-wetek.dtsi" +#include / { compatible = "wetek,hub", "amlogic,meson-gxbb"; model = "WeTek Hub"; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXBB-WETEK-HUB"; + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; + + dai-link-0 { + sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; + }; + + dai-link-1 { + sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; }; &ir { From patchwork Fri Oct 2 14:31:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11813669 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 4F974618 for ; Fri, 2 Oct 2020 14:33:53 +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 1B542206A5 for ; Fri, 2 Oct 2020 14:33:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="nb+7fZCF"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MfBTfakv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1B542206A5 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-amlogic-bounces+patchwork-linux-amlogic=patchwork.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: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=EcjfQuuwiReBH6s/3z25BikQQoUPjwPNQI7YR/3cFHs=; b=nb+7fZCFYQoRLaM3HhYlkZTaXY gCCeYO+c40OORwGn595CKNeRNLRWj5zO6si2J13ZnkIeq8WYkdJubRMs8LrL49GZaTRC9Mkltfj4S /8/13bIFlLpE2/PBrr6s4kEgbKFopXB0UOM3SZSwAclCZEw7DWesDSIE9/o4NI4UOGrBBQjtB1vI4 MAju4GY2ObuumWvPG/MjQSoANS2MEEpPVmK452lIMTMzHrSYvqSJ96zo4RIcILBGs6E/uwvcu+Rn4 olLkzIRjzkBTvI3yFBM4UaPIrB53GiLIGohLByFTxhFMjaiNOLHzmuRNHh+cDDV2CNGOzhkdd68ms CYW8iEnw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM7q-0002M8-FV; Fri, 02 Oct 2020 14:33:34 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOM6U-0001Th-70; Fri, 02 Oct 2020 14:32:11 +0000 Received: by mail-wr1-x443.google.com with SMTP id m6so2093201wrn.0; Fri, 02 Oct 2020 07:32:10 -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:in-reply-to:references; bh=1gIivsKhrs5B4E2eM/SXdSVH3UTq3Ox3b3pPitMs8zM=; b=MfBTfakv1DRtuw9LCRw4XUKI/kYSLWvtvMK9+FY9LWPBYKa40UMI4u0TIeCpfNWSyU h8v9BKBhEWmYAAVutZzmZGlI9cFjvlgLBKuoVeZjZudhJa9W1uZKQnnHHV4x+cdm8Zc6 DpuKoW1hlmiQ6Nzuw6CTxk+aTMBmgidolj0Fj+ngitt+nHGa1wyHA/bR2bebyp2CoxVV kvn6ZdzqjxjDZXtcGhJ614im0o+M8ANk5EqdxwpyIXNaHwkGFneoX5kNowMHZd4GjBTn rdsI5WZxm8dpwai4anLgXgXvUm5W9RLNGkdtGY0xwMkagvbHJj9zf5wOlAcv90jMshdj dofg== 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=1gIivsKhrs5B4E2eM/SXdSVH3UTq3Ox3b3pPitMs8zM=; b=HyXkvtL8ArEDP0WO5pd8nNvUdLeSjzfpfEpW+TL/4we2z1zslquX+HXBHeaPqeuNAk fqY/fnfuBti5VCAtCwBwY4VAr6BzfwgkTrvYhBMTe7s2znyomnZ5hwGD3qQAk6EDCTNW qU1qP42AQ8R3pm7x/4w+gFvIXiUjttpXRTL6nq1uJwbFtn47qJRH2nSPJDZcCgAuvq/B UWul0k+33GyklkzJYysnSqXgKCQHjpT7N+RlyWp5iIOUsioChKwfuINZSgklfzjU+tPY NLvfQEcPWfts0vERNlnsd8578E1o3iyEfcoyuPWT4kaK4Pn9jhzAf0K1ZZLxEn0RDLWn XpIQ== X-Gm-Message-State: AOAM533BN5/S1I9vvWhzrgaX2A/eN+hK6JoBi0VyN/2n5MyoLmdmFbK6 i/85wAMzN6qCltZJeNIGevI= X-Google-Smtp-Source: ABdhPJxAsMJBFt1mDap8JdZGwOlH4Qktsgmqvksw+2k8HBZUYiiD/BrMPdckAeioJ12tY1m0Iy9+tw== X-Received: by 2002:adf:a18c:: with SMTP id u12mr3591224wru.90.1601649129282; Fri, 02 Oct 2020 07:32:09 -0700 (PDT) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id w7sm1907392wrm.92.2020.10.02.07.32.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 07:32:08 -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 v2 10/10] arm64: dts: meson: add audio playback to wetek-play2 Date: Fri, 2 Oct 2020 14:31:41 +0000 Message-Id: <20201002143141.14870-11-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201002143141.14870-1-christianshewitt@gmail.com> References: <20201002143141.14870-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201002_103210_477348_B2595B93 X-CRM114-Status: GOOD ( 14.28 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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 [2a00:1450:4864:20:0:0:0:443 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [christianshewitt[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -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_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-amlogic@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-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org Add initial support limited to HDMI i2s and SPDIF (LPCM). Signed-off-by: Christian Hewitt --- .../dts/amlogic/meson-gxbb-wetek-play2.dts | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts index 2ab8a3d10079..f2562c7de67c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts @@ -8,11 +8,19 @@ #include "meson-gxbb-wetek.dtsi" #include +#include / { compatible = "wetek,play2", "amlogic,meson-gxbb"; model = "WeTek Play 2"; + spdif_dit: audio-codec-0 { + #sound-dai-cells = <0>; + compatible = "linux,spdif-dit"; + status = "okay"; + sound-name-prefix = "DIT"; + }; + leds { led-wifi { label = "wetek-play:wifi-status"; @@ -39,6 +47,59 @@ gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>; }; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXBB-WETEK-PLAY2"; + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; + + dai-link-0 { + sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; + }; + + dai-link-1 { + sound-dai = <&aiu AIU_CPU CPU_SPDIF_FIFO>; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-3 { + sound-dai = <&aiu AIU_CPU CPU_SPDIF_ENCODER>; + + codec-0 { + sound-dai = <&spdif_dit>; + }; + }; + + dai-link-4 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; + pinctrl-0 = <&spdif_out_y_pins>; + pinctrl-names = "default"; }; &i2c_A {