From patchwork Mon Nov 16 06:20:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11907425 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38EF4C4742C for ; Mon, 16 Nov 2020 06:22:22 +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 8436A2227F for ; Mon, 16 Nov 2020 06:22: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="v+cxuUEb"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="W+mB1NlC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8436A2227F 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=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=JJ9nivxukvKIbq8fXPNGwe8CqtPI7qtcTKov2ifHeXg=; b=v+cxuUEbDmvsWBIahvplL3+aqJ aUVooKv1vkwXMA62v/L0rYxWpPiMFPH2VW9Bqa86k456KnI3Mrl88jaMsYiIbLF978ks3cnKKNU13 aeTTUubPwW8HCN9ETvE+jdnqORxwEJ0Ayv70/SSvlGlewbyJGJLjbwaVx3aPMlzGXZal+f++bH7dP CJSB5EohXFSB8naCz/L0eV2EKs1roCImYS4RKG9ujYvpqN5SYWTk2ln1e1DF3HJoPLgKAjHqTOPit mW2m1sS8dvsu5nFU2hwIKjCxBDB+/0PeDs+Yw8/obMfXZlRz43rpi4Z/VZpTfvlzDlsh7/FjdGgxy E1Le2+Nw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1keXsd-00017R-HG; Mon, 16 Nov 2020 06:20:47 +0000 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1keXsU-00013q-Ck; Mon, 16 Nov 2020 06:20:39 +0000 Received: by mail-wr1-x42a.google.com with SMTP id k2so17419055wrx.2; Sun, 15 Nov 2020 22:20:38 -0800 (PST) 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=W+mB1NlC2H1+vj/gVQqlYXnEWkHgsAO24vZIi9pz20IpYaV3YDCnVnm52SEtMu74ga 0prdFzLY4GzBCBdbhMTseqWN4nD1oc+NI9ivyc1E/v70v6AALE0oduJpAwXpyLQ65x/H ANSimfsx1NIZZhGDXF679gmF39FrgbbjFaCh/CjL0rNkmTAf6ydFE+9+0/QI43rpv/Xd 9yLu07nVfpJYPcaB1T9nqTj5Wd+gSAB0R3HFIbY2q34nEO9CSZ+DO/3tYy24Q6rxn5aO VsAZV3pbjAREiN6UXD192tyiOXQS9pVU4lsEEcJNc+fT1FrNYtlZKpH6VCAELG492UJV R/bw== 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=rji4Y5SlsM5+fGnzHed5wjjO1MvxH3vwguxr46GJ49LdnwIppzr4XQ3c7lrCNb8Peh TYvwdJnoRqNtXztoJ84ZxPVug2a8kiyX4TYr7sCaHcQ+96vml1mn9Hk9W7U8f/rFJYRW xmiNK64EJ5K1Lx8WuEEief+Dg/MzgFiaEzN9816dd3Av+ITUOA5Rjph6Bc82QM4Y28nD S44SA83giRPxFxOwKlEGPoJO9Gz3GwAqI2dGCBB4sqcdIThhmoH7HQkVlkdhr+/FBgIu eLq6laEKmmXxd1VBs5yuj0UYo4O+bwX/TbdhNuBtPIQVgV61ldMp0zZGQH7fSNrCI9CG YjHA== X-Gm-Message-State: AOAM532aaj/F48UE67ylHY8WvxJv/ualOFnt1wdhmCdHsa1yY9zh/H63 +87Cd5sfJhheWSy1x7ZOHtE= X-Google-Smtp-Source: ABdhPJw1jWE/jLVlMkHw4VsyWrjjt8pDzvDYLQhanqj63agvp4cq96/BakhhffvQIMqt0u063QVVUA== X-Received: by 2002:adf:eacb:: with SMTP id o11mr17467481wrn.208.1605507637390; Sun, 15 Nov 2020 22:20:37 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id m3sm17065985wrv.6.2020.11.15.22.20.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2020 22:20:36 -0800 (PST) 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 v3 1/7] arm64: dts: meson: add audio playback to a95x Date: Mon, 16 Nov 2020 06:20:25 +0000 Message-Id: <20201116062031.11233-2-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201116062031.11233-1-christianshewitt@gmail.com> References: <20201116062031.11233-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201116_012038_527703_2D47A4C7 X-CRM114-Status: GOOD ( 13.88 ) 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+linux-arm-kernel=archiver.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 Mon Nov 16 06:20:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11907407 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B918C4742C for ; Mon, 16 Nov 2020 06:21: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 C554C20657 for ; Mon, 16 Nov 2020 06:21:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="inYXgCkt"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HTG5fnT3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C554C20657 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=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=q6yD9G/W6BqoUatsVcuq8+Ian2mpXCUgYMY28Pgl3a0=; b=inYXgCktbyXk1Eui9v3JuPryee DZWKMh5P2T0lu2NFzQkz4ntHeOXyeeNWhf6WoK3timsjBAtrtXSUxi/3L8iPYEhv54nNaZOhih2XY OgNkmAHqcoVsvs0v6xdz6WG8AOXXDbYBA1JU1BOYU6hmTrDQDGFqcbwzf/UQTV7zfxCB8wU5+Zt+O rGCZUQbO/E1qo88dYqw2I2kjnILWBWyr6X1mpHGwN08D07cUQayRO1pPQXjjU6ihO2sBNGybpDVd0 Aeqb1mbH6N+nubZIXUGBb1dtgvcVVxDyOrO6TcWXtCgdnMcNZl8CRTPR3aOUA34eDui+nil/+sNxc hNCTYsHA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1keXss-0001BO-Gq; Mon, 16 Nov 2020 06:21:02 +0000 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1keXsW-00014e-IY; Mon, 16 Nov 2020 06:20:42 +0000 Received: by mail-wr1-x433.google.com with SMTP id d12so17340291wrr.13; Sun, 15 Nov 2020 22:20:40 -0800 (PST) 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=hYiWLdXKkzPeHdrQPfgrV2RjQ9E5+nTOH1ppXyWYIkY=; b=HTG5fnT3HJe751cxn7ehGB/SWGvCNm86fAMak0bPBh6vbmDlFLMgoNFp0USjV+3uUD CZxpIBv2h51wgul+lSCw9fxbjrRAcy4gn7EiBZQ9ZW4H1IsIvf8w5iaPkOOpgfMsXF9I QsfPTnCFNG0PL97HsI9VR99h+WzAOjjFIDJbBwDCk7AJibY4Ou54ImjN5adXo6r42DCG xqAjL7V/O7WZAy4hVDeaFLuu4QYsZHFLXxXGAqjPENRiiOwBSCPGM+ELI8KvoTQxURNV ULkJb/onDyi0VkcqsP+NyJxyXp0jtkhPctSerkON2EPBhk0bRViagYzz0NCwe5WEiBaQ 2/Yw== 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=hYiWLdXKkzPeHdrQPfgrV2RjQ9E5+nTOH1ppXyWYIkY=; b=ltnn3c3LvMqaSRbk224BvVSGjrz9dpl/EptM+9bR/DCX+xfClTwcprkYaQZEkAP+8M KUOVZpZFPqMyCLfKRZqU/pObAkpp7H4zmwD5cnznewrdNi+zhZoqGl6w29FaCTYvapmG JwMJ1SjIK8thsV3OL6NQPStk9DnZqEODUAH717859hm58fkPBCvt6i1Qo6x6dgTr++Yo X2kutWpbaOcPy6x/bc8Mry0EAubAzfyAeZ7N5YNwowFsJrVl6xBMk4LhfBVs7MAn2y0s KLa+U/dr+iubZAx7WVbkgvsXzCkAVMVGR1DkQ2HLtxUVDeirAo9y910m2lC7zzFMBSMi eKTA== X-Gm-Message-State: AOAM531ALbFPA/d5oBYE7sCt0+PwRHyngP3PMVxiwSAq2Jav7peAeORl hvOxQZJ2lkQFCSHrhcwx2NY= X-Google-Smtp-Source: ABdhPJxLfaHICNguiyOYcs7944lNnn8viM5jjfq3HveUvEWUl73g5UbldCOK1lDXxH11Va6cR/8dJg== X-Received: by 2002:a5d:448b:: with SMTP id j11mr17004655wrq.236.1605507639509; Sun, 15 Nov 2020 22:20:39 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id m3sm17065985wrv.6.2020.11.15.22.20.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2020 22:20:39 -0800 (PST) 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 v3 2/7] arm64: dts: meson: add audio playback to khadas-vim Date: Mon, 16 Nov 2020 06:20:26 +0000 Message-Id: <20201116062031.11233-3-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201116062031.11233-1-christianshewitt@gmail.com> References: <20201116062031.11233-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201116_012040_703488_744049E1 X-CRM114-Status: GOOD ( 14.51 ) 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add initial audio support limited to HDMI i2s. Signed-off-by: Christian Hewitt --- .../amlogic/meson-gxl-s905x-khadas-vim.dts | 43 ++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts index 8bcdffdf55d0..de5361f20cd6 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts @@ -5,9 +5,9 @@ /dts-v1/; -#include - #include "meson-gxl-s905x-p212.dtsi" +#include +#include / { compatible = "khadas,vim", "amlogic,s905x", "amlogic,meson-gxl"; @@ -63,6 +63,45 @@ }; }; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXL-KHADAS-VIM1"; + 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 Mon Nov 16 06:20:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11907421 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A300CC4742C for ; Mon, 16 Nov 2020 06:21:49 +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 2D94020657 for ; Mon, 16 Nov 2020 06:21:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="U7kai9oy"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dyS4m4VP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2D94020657 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=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=D36d5zzn+kY38/Txp+sasWl1gStaHMz/YfCZN4NHu/0=; b=U7kai9oy87teUZMaynDOGnu8kM cU6Fd8CvC6p00vIpb4G23jIOLc5hHRnvbe3TonIwvvvNoJ/bJhDQzIYabIJ/wVDXX+Mlss9mfiiGX 7H5rf3BQtc9XPzBX23dzS0NvwJyK2H4O/lfw+aUggCmIsrqrY6yrrhCkZrOXQs0XYtPlNSvlUJzei dBhxvjomdLsyoOteGu6NocFc+LlU5XxtavgGq6A2FsqxM2NF+ULyLO/RHXEaovQzUslv9LPYTdcUd m9bbOU9pjKF7/Up9ZQExVQ5WzuVuQKFrVCQvE3Eh41penV15khwFxreoWQHBsuX8x1KN2FVIKb1vC +CT3oxBw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1keXt2-0001Fg-T6; Mon, 16 Nov 2020 06:21:12 +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 1keXsY-00015Z-JV; Mon, 16 Nov 2020 06:20:44 +0000 Received: by mail-wr1-x443.google.com with SMTP id p1so17335256wrf.12; Sun, 15 Nov 2020 22:20:42 -0800 (PST) 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=dyS4m4VPWFRukkjQ39dZz3y6F+S5CWL50MrRNVrAaPWuqOlbfdTc3MYw+ztts8F80W CwgUaFxC2F2ysgDeR+ZGn2cQZWSmARarf5CX5+wsdTvD/IyINLxYUncSIfMKZfWnPfz5 jlHpAPgAth+zavg39MQt2dVx7vvdWY1S/NLel760g7ZkGeuSbUGk55KLDE8QfIkyBy6g 5rTIek1jS1H4ALjv8OjWKcSfgA5SQdH40HgYdX3M22jqX5yVkBigFm3IQqGGlIyVuGzn wo4jTFfxdoqOID97txcb7sV6Vzp9kgkPt2Edb/r6eDANu34MJJHQag0JxfyJ6o+PYIQK mAZA== 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=BezAGa/njvaFJLL/nMyDPQIut+AcRNvsw8roztWy2dX+s/DAYKnaHHv9eZBt9TPQRK N8edFPIBGM2C99d2PNH+3QfH8XeZHLrNo2V4N5IAdzNir8EX/g+SGivtNMHVVA8KkYnT 9591zWAAms64fi5U8Q5D8+AECKrxt8KwiV1VPJpaZN95BtZKJggAmgHJNIVq6m9b3nBc CT/C16K0Y6mtJ55Ed7BPXTWnwNsLBjE6722KCYOL2PponhOEuiwJqjtvXaGQLRS73HR7 nmtJPcSgPzw2yrkO5xqn5+7W0zXK0HZQZpyKO6uA6vHPrBIC4YxCVkAcQBV2kY42vf2l 3RUg== X-Gm-Message-State: AOAM533iiKdK9jmRca/ikODVJXOjDYzDMKpwmx2zp6ytO8HOc5X5IhDi +7omkLSyeoql8Vl61jDYqCE= X-Google-Smtp-Source: ABdhPJwRn41L6QLmNecPltMeJiSirI8tr63H8VRB4YLtWAHaygJz0KkkIcHVv3yZNHxsv2Ful0aR9Q== X-Received: by 2002:a5d:514f:: with SMTP id u15mr16666218wrt.385.1605507641663; Sun, 15 Nov 2020 22:20:41 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id m3sm17065985wrv.6.2020.11.15.22.20.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2020 22:20:41 -0800 (PST) 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 v3 3/7] arm64: dts: meson: add audio playback to khadas-vim2 Date: Mon, 16 Nov 2020 06:20:27 +0000 Message-Id: <20201116062031.11233-4-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201116062031.11233-1-christianshewitt@gmail.com> References: <20201116062031.11233-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201116_012042_750053_76CAF47B X-CRM114-Status: GOOD ( 14.51 ) 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+linux-arm-kernel=archiver.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 Mon Nov 16 06:20:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11907427 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF019C55ABD for ; Mon, 16 Nov 2020 06:22:57 +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 6C0732222E for ; Mon, 16 Nov 2020 06:22: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="N4hHvFgS"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="oVwJCEoU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6C0732222E 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=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=UDzyrzrTZb6T5fVeIme9LJExPmrkFXQWNvtPOew6X50=; b=N4hHvFgSDx43WYw9CCH5MTNwj5 nGu3zEKiAA8u/LU5aoB9dKIFAPDP3Nlr9OLwD0LZliIEuua3m/PaldZbZa3ju1Ca7ISFDG8MtEAzW DI6vb+Gr+zZGD6fz0oznNu5EqwFlaZqlNWyfPt8u1jF9VqeqCtK2DT8vihwpUex4HlB9x9ENpZgwZ AC+h8Hi+33FQ+83YpDQo0nAUN4+CfO1ZVSAyaLKd75BOBp0/AIgZNugW/7McL2gEtuiKvMjOo9tsP 8Z7GvdIQH1KKpwfUN6c6FEK+Ge46LkdfmFgsZ7tDakcGrIuH2ZhuUGwVZctgCA37Pfft3N3vtW6pe 91S+DT2g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1keXtS-0001Rf-A7; Mon, 16 Nov 2020 06:21:38 +0000 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1keXsa-00016W-SK; Mon, 16 Nov 2020 06:20:46 +0000 Received: by mail-wr1-x436.google.com with SMTP id u12so10157489wrt.0; Sun, 15 Nov 2020 22:20:44 -0800 (PST) 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=oVwJCEoUO0cPE+bysHQys/P8gwJ4OSvwnJA4An072DSCY4iXPFcNH5wtV9UTVXxE6l DzKKbcQJrtAZrekquPHe3ihM4nKjwo2rGZ+sRj8zdhS7wJG66dfd8n26n3q0cEkgeMxr 1cOJO64BQb2ClGanobW+xcd9G31OkyGekoMhJTt9aQWPIQQFTr4/loTS2OLKJo18nrjw jev2rgn+vK0yVGjEJOvcYHt4gMf41pnjydlpVz+yG8nKFYgeuDs/3FCTQ/TMwt1A7lOT 4/xmPVhyydXRAAMEPOLvsLbEZIf71WZtEecDMbbyymOk0/kKesGkg5t1YhosoXy6M3UI de6w== 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=PX+yZTOITO0NxUaZE7X0qg7L5QAtJVwfpsB0yFhW99v5aA1wND7mmRUzByo64c3IYG 48Krlfxd3/eYnmkLrcjs56+Y3ITJIe9dP61UstZWjnNW1DIKWRANPvK7Kzw4ANDl22m/ myAzQYgZbnZ9E9t6Q5DuQyrbOdNirlOCT1gCgwHWbPQU0HOtRd/326lmKU6Cst3sOQkd k08IlsS+1MDONdaQNrHRbvZfJicKWqFxo0u5uztqm6u9BSuQmgyKbikN+rISWv8rqfJP e5iofj/HRkUaVo0szVEQVF2UmF+cXNsGwqyIrk0xy2cu18jA0CDshZghbvG1xgWKlLmw RCpw== X-Gm-Message-State: AOAM531ADflZQYCBTP71mjhIC0Zim79hA+n7QVzP5leEbhLt6k2xyPoK dvqwylBElBHLpfvSHbwbJBU= X-Google-Smtp-Source: ABdhPJw3LqdgZebMeTfGoydpX1BZ+cu0qP7A/4FSFPeRA62GMGxV73zIG8beWWh+IHU5qZo4UVAf4g== X-Received: by 2002:a5d:550f:: with SMTP id b15mr16793905wrv.145.1605507643792; Sun, 15 Nov 2020 22:20:43 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id m3sm17065985wrv.6.2020.11.15.22.20.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2020 22:20:43 -0800 (PST) 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 v3 4/7] arm64: dts: meson: add audio playback to nanopi-k2 Date: Mon, 16 Nov 2020 06:20:28 +0000 Message-Id: <20201116062031.11233-5-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201116062031.11233-1-christianshewitt@gmail.com> References: <20201116062031.11233-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201116_012045_129630_97DDF1E7 X-CRM114-Status: GOOD ( 13.89 ) 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+linux-arm-kernel=archiver.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 Mon Nov 16 06:20:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11907419 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50DA0C63697 for ; Mon, 16 Nov 2020 06:22:13 +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 B76B920684 for ; Mon, 16 Nov 2020 06:22:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tyllVLmc"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HxZLwRsL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B76B920684 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=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=x1RPJNOsamtG/NJ+Z9xutLN6+UJRt5h/0oft6PI/TnY=; b=tyllVLmcKVGwrDjlQkv5mCjdyh vOjk6Lqmmsx2pJnDyAr5UDbAfX5yxRUd18XNbNDdWF++bxs2LsoFtrmGMz4U8xP1Td97mpnny6vBW LcOi0EE9jbdkCNunaqAmx+QXnGN+UME6l2WhyDJ2U/5rvHZFMEnk5MtrL+KXb1Def9X0BGLqn9ifU fAfiRzzwBfiVyYKhoTJVMtA/W2pA0RBsvH5zW0RXrTUV/GLA62F/tLv9Ib+GmgcuDWvl3BouB/Faa 6FZdVHT8yF7PWNgm4ATKBfyOvRcUXA0SfV2F8RjZscyEw03YO9aYinMw6XiH9vyT+BdJCV96oYr8Z ODxVEwkA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1keXtY-0001VV-7y; Mon, 16 Nov 2020 06:21:44 +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 1keXsc-00017H-OY; Mon, 16 Nov 2020 06:20:47 +0000 Received: by mail-wr1-x441.google.com with SMTP id m6so200418wrg.7; Sun, 15 Nov 2020 22:20:46 -0800 (PST) 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=HxZLwRsL9L3clU/gWk0Q9ZInhSslRrsA3tfRAZPyQtD9eDKYPLlgBIS2bTqeZmqYqb uT5GZrmkK9M6Itn+7tOyMtiqZKSfXYHC/XbiW3c9doJhHlrf4LD/6+7Dr3QUTpXoicNF CLbo7/Mp9lNnC841ZwXezHm0M11uK0hrfFynPB/1ONz3kK2dtyP7SLUJ6HrQBbceh2cA zIUydObcGuEFBYCAfH1AOOv9z1FAtSN/NYKs8wdU9UkP+OvTrfosFH+8Q8xbKr3AGf/W qRc+862chJCB9r/dghsQ6H61/jdNXFHdKBVgLmxRfrcYdgA/CZj9Od06wJuzHLGt2BJu M9sw== 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=OoqAviwRpIFvJzM5Tj5iJuHRS+oOvKOI3+T2yfLoTdeQovh4X16wJF2BeQAwCzRXWI TG8unjKvEovAtgQLEyqntHlYxHLzREt9VXHwdogJFMCX85I9NDh0MM0uu38R2SKo4oKe v8EeSeEqdW8lnbW094wdT5nA0Dy3CdO+pdtrkUAOSPfrNpW/jy/O0FdyTfmn+Wjm9WwT QWn6WPVz2sH0YbFQpXPjXfuhYfW7Wsh6QJmLhFDQaNQNogErFT2UaQoB8narGfHZGmvF t9t4f0Hwz2JikpTkxH3pji3ifxfud5wd2XGE02cHa+wvHasAMWXYsD/+F6f9jxJEuJYZ uV8g== X-Gm-Message-State: AOAM532AQhNJP99IEWBQM1L25QanlrjRrxoKLyCt2EX427IxLkfFPqgH WzqqUf7EdDNv9f0T32yL/Ws= X-Google-Smtp-Source: ABdhPJxWY5DjtO0AcBcOkDH5D624IlsLS+3TwQg7ls2RUOyHEZm1AaMxIVyQh8Y4+yULr/0oNbXAwA== X-Received: by 2002:a5d:4c52:: with SMTP id n18mr17452650wrt.68.1605507645868; Sun, 15 Nov 2020 22:20:45 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id m3sm17065985wrv.6.2020.11.15.22.20.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2020 22:20:45 -0800 (PST) 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 v3 5/7] arm64: dts: meson: add audio playback to odroid-c2 Date: Mon, 16 Nov 2020 06:20:29 +0000 Message-Id: <20201116062031.11233-6-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201116062031.11233-1-christianshewitt@gmail.com> References: <20201116062031.11233-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201116_012046_868835_1877003C X-CRM114-Status: GOOD ( 13.98 ) 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+linux-arm-kernel=archiver.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 Mon Nov 16 06:20:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11907429 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E431C4742C for ; Mon, 16 Nov 2020 06:23:09 +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 AF3C2222B9 for ; Mon, 16 Nov 2020 06:23:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="i9alsRaO"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CSyeqbDM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AF3C2222B9 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=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=+OFv11fWWRAN0imVAgL8aS8pFCSNbG2bVknT7XQG/a8=; b=i9alsRaOAudjCc1tAM6NOKnTok s2CpZqxYDoJVw3Bsg1NEO3hzN8YGjEtyXs2qAgOtBfuZ3cfK+FWM3TYfgl12smMlAp2GAnH+mX5Un fcYAQ05Ln8mZ40KkzPeutbIwUblxBqS9cKDnmPNBNxqVTJDcQB+1atYiWw6/zFYzdvqb7SEOTKdZx eghT+ZoXVDY0b4x2S3P7Z7XY20P4yJvUVrCRms+q3RpVWj8gpllav/3Ym3z6LBpBY0EBijvTWnSSS LQBWxhYz8C/s8evtQ4ScMi3dFuCUjk8K3JE6qlswSB0egMJJ9R8O4ftaURKA6BOskz7bN940h/ksu wqiojWYg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1keXtd-0001Z6-Qd; Mon, 16 Nov 2020 06:21:49 +0000 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1keXsf-000189-2d; Mon, 16 Nov 2020 06:20:50 +0000 Received: by mail-wr1-x42d.google.com with SMTP id u12so10157628wrt.0; Sun, 15 Nov 2020 22:20:48 -0800 (PST) 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=CSyeqbDMvdjKLX8MtLbreSDP02EDh+7Zm+zOmhScel2VP6cQwl95sF2y7Jblr7RzVf JmjhyoWj3YS8KND+fhd7LSWv8NilLxgCxhGp8VCMrDtwcPs89eSYQjEdGf/m75RgOa5E 5mCzn+B26V+GwEqEtBEyAHU4QaRat5rkn2ZhFhQEiGxInbwd3WUeY6BctNNuh04K/602 Wykf7t9k4HHphoEmZ6ywlhxKVpjYbfTi6oS5tW6rG+iPGVvItzVgzKLDJu3o+Hf3R2DP oX+kytguYUw2SiRe/5r1SxVjjz5d70HtGEIzMiAN1SmT7jzZvOWUgj4jcZwia6XDCieg aQQg== 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=dbY7AJuq/3S1hDrms3nrEpCnUQjqu9dSvQk9222UIaaus4b5nHatza9fe7V40cUU5c WrO0c3wVSA2DDsGmXyv5TBYJEiIoKPzZCqB9yEs2fydq5QA5cLQGC2WEffWMOl1q17pk CchiLYSggvoyqgRhI+Hw/KV7gs/qBsYFavM8AELg8CPXVoyeFYECVnRnyLuTWe/JEiWW p7Xe1FEzCC6nPaboSMUo31m+nZq2AShe6BWMIfETj7yjFQaLzCDFJONGxP9M2oEFpTaA meVFyZNScH9904p9108kNyA7ArpzylooVXJ52quMa0ePeEgeuW+p8Xql9jaN8X1vg0an Kt3w== X-Gm-Message-State: AOAM53257UNXC0lUTamQP2LBCq3UsAjJaSHN1VW+DqpyLTwsBh5ct1v4 lSzaNSOf575gq6Ck5hrpZ5w= X-Google-Smtp-Source: ABdhPJzmrLFU5dvMmXy7h5EUkBgwiGp4rm9nBBhE5RBvs2NeOPKorE9a+wIGzCM2EpS8YoQDOXrSeQ== X-Received: by 2002:adf:a191:: with SMTP id u17mr2437524wru.421.1605507647994; Sun, 15 Nov 2020 22:20:47 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id m3sm17065985wrv.6.2020.11.15.22.20.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2020 22:20:47 -0800 (PST) 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 v3 6/7] arm64: dts: meson: add audio playback to wetek-hub Date: Mon, 16 Nov 2020 06:20:30 +0000 Message-Id: <20201116062031.11233-7-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201116062031.11233-1-christianshewitt@gmail.com> References: <20201116062031.11233-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201116_012049_192844_E9213702 X-CRM114-Status: GOOD ( 13.25 ) 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+linux-arm-kernel=archiver.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 Mon Nov 16 06:20:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11907423 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3228C4742C for ; Mon, 16 Nov 2020 06:22:28 +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 141602222E for ; Mon, 16 Nov 2020 06:22:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lnAx2HcQ"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Mj00KA0a" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 141602222E 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=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=5JHvUWUqjKd/SWuwtJF9+Y1kKBl+/vlsY7OW14xiR4M=; b=lnAx2HcQMFm0iEtSrSzwmvonK1 dXS7K2FkD5ejJLg00UYTKm/Y7FsB9JGvdTweI1AjOFVjc4J4CoepENH65PRSs2iTffyb4qNs88on7 9qU0cZz8JKMScooRmI8ei0BSlKh380vUTMEPiwyFfV1kdABlLAJJvrF6LD7dB/0+9zRjxJMZFlP82 pVrRnPxBkRKcdYHyuHu+GUUa43XFdEeRDWQE3h0+9RnkDt1pneJOg5uuHyIKsfUIJG0nrLTjmuGn1 dYu8TO/4gUOLTLjdcPG5D9L9UO14YZj7enLYfgndrOVM18RTBjcZ5Q+WzV34fYe0QvTANVVO5E4mO 62R9CbdA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1keXtn-0001eB-7R; Mon, 16 Nov 2020 06:21:59 +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 1keXsh-00018x-C3; Mon, 16 Nov 2020 06:20:55 +0000 Received: by mail-wr1-x444.google.com with SMTP id 23so17346201wrc.8; Sun, 15 Nov 2020 22:20:51 -0800 (PST) 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=Mj00KA0a7s4QpdkqkPSUoIVCe5VfTiL38H3A13Q1CwiP6l6gZBjrN3DfiIYzehSVeR f1mtaedQdInmz3m+Ia+ZCoWGtDYtbk7ilngUhVrgqE92Xo9a+eX2HYlfaYSc6lwesVvK zeY21EZy2lhcd9txYzzgKj5KI2sdIi6279Evj4GTs+iQfiCXGPaCxn5RNDjbXhoWaMXg HRO8OoYoJuUiX9S7DCZ1Bs7cEc5l8sMTNb0kNSLJnPnI0EUU+uEYb3Yf8zsRkMbmgw22 mYIb47ZhxzetB5ykPRGbaRsH+c58y4VeE9LAmvxOv8VLeOKXwKdtaf84STQRVJVqKOTM w+nw== 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=EuX1R3vcNZtGAnVK0Ub2/V/oXq70ycey7GsSOQ7tK9Gfu8a1pZUGEMZsubSV5fWfQ9 ITgElSp5EXRxxomDoVy1gPpMZu1AiJDlxjrKFZI7DyohfdJzDqLmrvN8XoSUHvK6CT2j o1UGtgGjInUEiEOFjR0O9V4WexJsJQrma2+lZrVJNb5lWI0ZZ+LN+iug6yH2t2qqfRcl dWAZO6qHvKuXFGoMJ5Rsge1Ixcm9t1uMxw1liFGPGWyvESY+v8P8mc/ZRWwMjCI3EwGO +Ke3g06MpUTnvf9Wy7JiuxbV7+FWP748H+5NpQdNdMijt92oMsPHkOR3AZDXmL/Hf6ks j5qQ== X-Gm-Message-State: AOAM531ebWpS8tR1CIMaLB3HahNy5OmV/R84FT/6Ms77SeT8hAI98KFC ladQWZcG5Cw7buZ/hC0poNs= X-Google-Smtp-Source: ABdhPJzX9nR3wvtsqiKz74R6KI/jvBf0xlZXoVn401YSQ4zdG0j+kueNoBq2SybGSrh59EePeSCWtw== X-Received: by 2002:adf:8028:: with SMTP id 37mr17153751wrk.111.1605507650109; Sun, 15 Nov 2020 22:20:50 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id m3sm17065985wrv.6.2020.11.15.22.20.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2020 22:20:49 -0800 (PST) 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 v3 7/7] arm64: dts: meson: add audio playback to wetek-play2 Date: Mon, 16 Nov 2020 06:20:31 +0000 Message-Id: <20201116062031.11233-8-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201116062031.11233-1-christianshewitt@gmail.com> References: <20201116062031.11233-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201116_012051_499169_61202DFF X-CRM114-Status: GOOD ( 14.12 ) 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+linux-arm-kernel=archiver.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 {