From patchwork Thu Dec 3 06:00:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11947795 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 9D56090 for ; Thu, 3 Dec 2020 06:00:55 +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 5DBE620705 for ; Thu, 3 Dec 2020 06:00:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5DBE620705 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=THUFAmz4KvWEuAeAKnoWCuTzvx8CklF80ux4WRZem7A=; b=2ahlPumAe+WbKSZSIC3/Cd5nxy ZEhyiypMgRlK26jm8ErLQXMS556VUFrNmfN19BtU0j6P5wbgLtNuORsC/oWVut82ha7L/6Vao+hLq wm/drHXBsguj10tXki+8raRofel3/7v75nqDFn79LnhgJODthR1WJV1B/xEr5283jXXyKDzZA1Kmp /C9iNnDrGCtupVcNmINwMDS3luLfqIB/ksMiXNGh6etd5arYAoKf/kKzcebjQb9NuOcG4O/7Jp3pm NoP+I52dmEoQGzuv9UsTlkzG4SBwDo2uyZfUHTn9/IuUyRZGSkK7/drWI3xo4HKvMC5D/hsNzqUNY tRX1WXmg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkhfS-0008M5-JJ; Thu, 03 Dec 2020 06:00:38 +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 1kkhfK-0008Jd-Tz; Thu, 03 Dec 2020 06:00:31 +0000 Received: by mail-wr1-x42e.google.com with SMTP id 64so590060wra.11; Wed, 02 Dec 2020 22:00:30 -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=yQx2ZxmNKfhSKBL/RrXY6Av26UDGD56hcg2QvfdLjZ8=; b=Jd9yX4ZOB15VnyBC8HtYGGV+qWz0rzvNEOgyLezF/x//sq2cSjs08/RZlvSTb6vzzc IL7EFIonPtrRIdECE+AmNaYdalTg9LEAJi8HQ/flZO0t+6Onye8s6cJdQ1WzlIrPPau4 sg6OXgcT/7n3hBvQUOHL2Dmu8I/WjxRY92c5/D690ttwWsNHRhyXFOcxBuGy4VW4YIJO PjiryC/WXVbcmLbtFDLe6FjDl8/zBM88VPsCMUuLRARRJ7uAeGyAkLvBf/fMJD9EbziK G9hM8TnEGw+s5EduYmP64M55RuFReEV0OBrWFdvuCOod8CyWfTOve3JM8UKt7VNY/Bsa 7NJQ== 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=yQx2ZxmNKfhSKBL/RrXY6Av26UDGD56hcg2QvfdLjZ8=; b=bHufd6McnmLn07eSsqDxbw8KC7hM0xwFMjggq5JvH2ftnkjyscbOOpq8SvI5z66GI2 Mlueblwd0iBa7h4jfTY4crTq0YPZjSsICfXUrIrVl3FEYmTV2wRVXiSnupHBNXXjpySk fmI7ROFva/JzasF86vcaQmmSvF6KoUDILG2bF/ffRQs2j2eSPNWMe7Rrt2rgwvy96mwn NaUkWU3Dhsprhm+NjInhV8I9V9I+RQhuYG2aV24UqBLGbCzPGEvqG/inE+4Gar4PDfJh kbSJ5hAhtzJZHfuZwXMxcW+lkBgPiiB4NfTRVMj6QnNINQX8StKs6Rvqe0JwlzNKoma2 xQTg== X-Gm-Message-State: AOAM531FxZyfdGoS2DhOT4SPpsEHhuh+cDk4YO9oOjenvnss5sleal+1 HbxnZ+hw0B4jWNiz0dJSK/M= X-Google-Smtp-Source: ABdhPJz5touPQ8gRAj5bAX0jBVDBM4EYThkiQpjW8op4pjO742vkaxdCX2O0sKSfLgLIRh3HPv/WRg== X-Received: by 2002:a05:6000:45:: with SMTP id k5mr1750499wrx.108.1606975230142; Wed, 02 Dec 2020 22:00:30 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id i11sm218439wro.85.2020.12.02.22.00.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 22:00:29 -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 v4 1/7] arm64: dts: meson: add audio playback to a95x Date: Thu, 3 Dec 2020 06:00:17 +0000 Message-Id: <20201203060023.9454-2-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201203060023.9454-1-christianshewitt@gmail.com> References: <20201203060023.9454-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201203_010031_003036_3359A600 X-CRM114-Status: GOOD ( 13.37 ) 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 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [christianshewitt[at]gmail.com] 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 Acked-by: Jerome Brunet --- .../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 Thu Dec 3 06:00:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11947799 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 6CD9A90 for ; Thu, 3 Dec 2020 06:01:01 +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 3A76620665 for ; Thu, 3 Dec 2020 06:00:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A76620665 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=rB3SdaMRVKL/8552ESkaoL4yHvc4/X+fhngJH1vJPuw=; b=eTpPn03m9S5VMC5SYmlCoHlpm3 BNyeLIgChrNNAUl1duzddCz4m2GtwS8Ysonpiw1UqTUPqQFdqZVVmq7EDq9geFoX1sPvc3cO1VB28 zg5Y0LQ7X6Xa023NcoTAGdOwT/ClSFUSf+TPQwW5jEcr7JBnxuqxh7WBQQ8ZJTha5y/CMZ0Id7+8j OGmCtf63vXczQw7CxOxLh8P8KkXEit0+E8DuFIxUdY68ZaPP5i2YHaGmq8+PkizTqF+g4W0DCpcO6 k5oqxncUoFgQ/gpknwnmulMOgSSbjNinNN2h5wR+Ki+FAWkAcl3BNqvWdGlpu8w2Y5O+gXPzk5/OB xfmc+j+w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkhfa-0008PA-PB; Thu, 03 Dec 2020 06:00:46 +0000 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkhfO-0008KN-Dr; Thu, 03 Dec 2020 06:00:35 +0000 Received: by mail-wm1-x32c.google.com with SMTP id h21so2571638wmb.2; Wed, 02 Dec 2020 22:00:33 -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=dxWzeifwzXJ8noPCs15h/EHSm9BBgorS6bs8r2VapUw=; b=nfH7OYWIw0J+z1tIfWzUQM45lxCokcLmQcieCVApZEyurRmlPJ7PsupvrSVnLrFZbJ ZT7cnyXmxAJ0IEhdJd5XU+Az23Y4WBFBfXx6vAKdUAgrfxTCThXIjAErYcbu9n5WExyL iyKWXqwYTYw6drECbFRtEfcKbkuHriRGXpg0C/YXglxG6sJrMm9ckfcVkzs4bh0CuxoX guNQTxCdsqmhtKJcw5bd2RYFN6mzWpzWYivSO/63AmG9XxKq0vd6S2LNgOHoAD2uFOfX qDt+Q2DoF2r2APwTYmWhybcjNKESaCyQV8R4tnCdFgh+hFnA6mas1k+LjaB2sWqLKZF+ MH8g== 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=dxWzeifwzXJ8noPCs15h/EHSm9BBgorS6bs8r2VapUw=; b=d3B2oXJXy0L+N6oa3jMZfSt07ZWXoM7GFFqMS1UJin/9qqEYVYXTLvLI5uPjb/BRsM l+yb75uJA2SxTMB4s/VkqYs7mMoU07vZk8wa1/lFQQ4u57Nl5gCZf7h45zdQOOwzBkj0 DId/QfNca6RRoHgb46TIJEHIHw/K75XadUMKMFN+h2vqBwc1pC7LHrcsdCFxtP5eHYmp cWHkUCgzG7Ccv82cvEBN3cKFbBWUTKbYXnAZeIfgoFI6EL7D/znuP8dkSAmRxldGQ7lw 50JhTVfLz5U7KvWGePaG9MebJ5W7y41OzGdnN7pzUgveRhW9zOe6izzdOvYLCJKsGsH9 44TA== X-Gm-Message-State: AOAM532qrLt5WZzieqg7YsEagJCmupmJvXkkxfG2g/RAS6fD7sPHk58P y0XlTSUPLcPVu7Zv5qdmPK0= X-Google-Smtp-Source: ABdhPJyvD8UtGxEO3hLOc/p+glcLR1EiZYUEsRp5yrqNY5N9GUyR5uNJOY+xkfutM6LnJ23Sy6YABQ== X-Received: by 2002:a1c:28c4:: with SMTP id o187mr1400052wmo.40.1606975232264; Wed, 02 Dec 2020 22:00:32 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id i11sm218439wro.85.2020.12.02.22.00.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 22:00:31 -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 v4 2/7] arm64: dts: meson: add audio playback to khadas-vim Date: Thu, 3 Dec 2020 06:00:18 +0000 Message-Id: <20201203060023.9454-3-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201203060023.9454-1-christianshewitt@gmail.com> References: <20201203060023.9454-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201203_010034_497172_BE57D062 X-CRM114-Status: GOOD ( 13.57 ) 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:32c listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [christianshewitt[at]gmail.com] 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 Acked-by: Jerome Brunet --- .../amlogic/meson-gxl-s905x-khadas-vim.dts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) 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 638a5992d760..7aa08f74c49b 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 @@ -8,6 +8,7 @@ #include #include "meson-gxl-s905x-p212.dtsi" +#include / { compatible = "khadas,vim", "amlogic,s905x", "amlogic,meson-gxl"; @@ -63,6 +64,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 Thu Dec 3 06:00:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11947801 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 EA82B697 for ; Thu, 3 Dec 2020 06:01:07 +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 B8B5F20665 for ; Thu, 3 Dec 2020 06:01:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B8B5F20665 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=Yo/xVVfnq0AYfoiLs2SEBHScaGe/gzNvesM90EIT/ME=; b=aZ1nKXFQJOtEZwJuW0vZeyjGLj D8yX5TkqPqXYkjfsnFgxPHUjEYxcLEusGpO5UxivKcCsBrvVlwQXqsYtWsRo3q7Hvpp54KAsOMpYS njq5e0Mw/M53yc41rs+6UlJ5lppJyNS9tv6wIqUcPbdZuLzoGtdIWBBG6mF1LzTAK9rrHpGBHIzre 4spvpwqUZ/YbC0999Wv0bBWxTiZJqmvHubycYPQiM2hSo0DLK/cOY9hKUdjB75aGtqScnjDOwTcWF BsmlXd+1A6wVmn+Jx8WNBSPGPLQb7jG1UekUQdKFoAnHcAfSS4wA83F1JSYYVCYurgDSJSj8uSExE jzJcaNbg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkhfi-0008SP-Ow; Thu, 03 Dec 2020 06:00:54 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkhfP-0008Kl-Mz; Thu, 03 Dec 2020 06:00:36 +0000 Received: by mail-wm1-x341.google.com with SMTP id k10so1588043wmi.3; Wed, 02 Dec 2020 22:00:35 -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=qiNlJdqxsbnz4NC0VDWGxLMRJ3AyXGB8P9pN0Z7BvMc=; b=YGxKo493V2KvNC4Fntbenbw8xLGA4Q3xktli4n6/Rx/bhhZmQd7KG18wMM7sd6mur3 NDTp7OeKoyl0/tPuJ26oPgzGw0bAVm+JO4ekBF3n6Lr4IgWThv31tO0cF0MG90yoQBXy PPj0Cq9zM9xBH6SMRXjYYutc6P893/ST9oX31p4iRMyByE+yf/NdH/CEOM2Z6j2h+SJH +ze+lISI/hF2tDw6raVfApDG9Qh6t++5aeDl1JkGqMZDz+v+Amb5gdvI8zHAZyW/Bf2e uzZ5BM+awunwN5Yq43Nc65OSZb6LamHnde8EmOhVtBd2L7aZ/DKIU3XLJ8Sc2hzYWo+I z8SQ== 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=qiNlJdqxsbnz4NC0VDWGxLMRJ3AyXGB8P9pN0Z7BvMc=; b=HyLfPXrXXQZLKDTT2+ZUNIjJT6hMwM5p+4OyAF+lBCkgfhcNUHp37xBD6I7qXOyjeL 1B22q/Ikg/5hY47FGuheT5J+E/LBIQNgONbf0fXTXhlcNxTtXJ7AlyU8AkvWI17v6NXw zs2sDQBwWn5o6G2ul5t3VIBQ9Zxddt+5LkqbSVIPQgn06MrMEAskRGgpbNzNbr/8d5Hc 8+bXsPce0HKASRKK1ZW65gZt4UangiaRPFuZXate8u3aPAXAoLeV46pmGn6+gS7jQTpq mHziVIFTVnDzBvAewWSte2klTnl2D5uih2yqeSPDeMa7WEJScF8CrT1rw+2vzCsj4Kn0 yC9w== X-Gm-Message-State: AOAM533WQTDNj1MgPP2wRaRCnoHVZk9kcCCNHqKWQQlJcFWnh7cq0Mut iJon7k0jGChtQbaUrfdIJ7U= X-Google-Smtp-Source: ABdhPJzo0oIB2vo0mTvBTl9n+VEw61QX9ZG6RxT0SBPAFF9o8Jz2l2AvulMUhruFVEv55OYqb70RTA== X-Received: by 2002:a1c:e445:: with SMTP id b66mr1367316wmh.187.1606975234407; Wed, 02 Dec 2020 22:00:34 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id i11sm218439wro.85.2020.12.02.22.00.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 22:00:33 -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 v4 3/7] arm64: dts: meson: add audio playback to khadas-vim2 Date: Thu, 3 Dec 2020 06:00:19 +0000 Message-Id: <20201203060023.9454-4-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201203060023.9454-1-christianshewitt@gmail.com> References: <20201203060023.9454-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201203_010035_809790_87BEF972 X-CRM114-Status: GOOD ( 13.43 ) 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:341 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [christianshewitt[at]gmail.com] 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 Acked-by: Jerome Brunet --- .../dts/amlogic/meson-gxm-khadas-vim2.dts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) 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 c5ee55caae0a..0250c98dbe9e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts @@ -10,6 +10,7 @@ #include #include "meson-gxm.dtsi" +#include / { compatible = "khadas,vim2", "amlogic,s912", "amlogic,meson-gxm"; @@ -145,6 +146,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 { From patchwork Thu Dec 3 06:00:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11947803 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 BE52E90 for ; Thu, 3 Dec 2020 06:01:11 +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 8B1D920B80 for ; Thu, 3 Dec 2020 06:01:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8B1D920B80 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=yatVB7EaJXz0LMGCej9OPeT9dgFUZ4L8c3WYUxPDvIg=; b=yJnjpUL1LGC5KJZRkk0qEy7X/K +R4R2vTA7VNMmNVgbHO9Xr/tTRkGU/vhLx7T+jHmVZeOjMSDy0EXjAcm7cx2Oq+9idQSKsKOxEkaL br0OfISxTesx5pQ/Mbkjqp8tJDjpB0BgI945Y3M6nT4GxYoohOBYkK/SdyEOUhLN7P6ehsEYyZae/ uspcspr3iyOTZBswuKTBCTR0LIEmHgn35XYEclf8tRE45uROwEpOZGbWyC07efNYp8qhN0i9qOyGP wz9wkaHb6yzYipW4sPasnug/DW9NLPXvhRS333btuvyouS1GahQu3j9FMEjSVR2FXcpv6CyX+BPmo keNz/I9Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkhfo-0008Uq-92; Thu, 03 Dec 2020 06:01:00 +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 1kkhfS-0008LX-1s; Thu, 03 Dec 2020 06:00:38 +0000 Received: by mail-wr1-x436.google.com with SMTP id 64so590313wra.11; Wed, 02 Dec 2020 22:00:37 -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=Y6xywWA0Bg+0Yb66SGd8bpy5ReZjATNnwobMf9jnUk0=; b=txM2XXYv+owk/t9tGZPgZb5z+KXtTKNy9WLyz4ek8IXqPi719LgMaQE42ITTlwr199 Mq+uTy3TOa0Y6nQnzhCNcXLAgNxVdTwZfqx84XO/d8kMTxAoOcF6g4OROqWUbB9jp0mC I1x+WNlMcYFed6KGp+Xavln2XueFo5WK5HXPK+QZj7/8aNbWXfSGDj1em/QOSqdBPYba 0xzM+htnHeA+6Q64eLyYWtg+ZRMOsjr2oyWQY65JTIcMsFxXJP7iOKVAOMkZFSUOBDbk vmg5mnSrclfvSiNQ/eT12Pwz1/LsXnAg2SmtTHFJ0dCefUEzNm0MFTQV/jM/xnY+ned4 suGw== 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=Y6xywWA0Bg+0Yb66SGd8bpy5ReZjATNnwobMf9jnUk0=; b=Htk2keQ+nX35SsjtNvGf7INlawL036HZg/M0VJx3RLqg5Bsd6+/rOE8Y65tw4xun7x 1Bhh+JRa1xnjXpPHPVFve331MJObr9L+ewwEfhKp7QbdzsyFgKzMYn+7NNvCkNZK3Jxt y08GJKK+Tx1616Qr3w1SoKAuS7NgpJqqxKn6YZGYJBdraz+XE+NmBIsGSWSiCQ5u7IPP wKYig8EhuGVKrhhrR3nuFAM4mKEzPpTzMuy0JqxaaMVSTaD7rbi0S4IGNSfiOl4SYVqK KFtXXdtmI1+8lYOPs4Y//tMpp5i2BEb6QH62bsTT16z0CeP9QVUBSbXf38SOzhU1rmXh g7Pw== X-Gm-Message-State: AOAM531uabXogahG5HblOb+QjZy0fsfMc0HtO2iD8TD8e75BHoNiFNKT uUKf+BDUfrlD/p3ZTBP3FSc= X-Google-Smtp-Source: ABdhPJyw9t2B/075IWN9syQsHo2Mci4h69VZm4AOiLICb2Jz/0++4DbImVQOULxhNLZGWx2hN6B0GQ== X-Received: by 2002:a5d:4046:: with SMTP id w6mr1736698wrp.51.1606975236662; Wed, 02 Dec 2020 22:00:36 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id i11sm218439wro.85.2020.12.02.22.00.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 22:00: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 v4 4/7] arm64: dts: meson: add audio playback to nanopi-k2 Date: Thu, 3 Dec 2020 06:00:20 +0000 Message-Id: <20201203060023.9454-5-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201203060023.9454-1-christianshewitt@gmail.com> References: <20201203060023.9454-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201203_010038_116000_7ADA9191 X-CRM114-Status: GOOD ( 13.49 ) 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:436 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [christianshewitt[at]gmail.com] 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 Acked-by: Jerome Brunet --- .../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 Thu Dec 3 06:00:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11947805 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 7FABA90 for ; Thu, 3 Dec 2020 06:01:15 +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 4A1B320665 for ; Thu, 3 Dec 2020 06:01:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4A1B320665 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=Aodl4D92wYbXddVOKAALiUn6bq9VvmM3zGFxn13LRb0=; b=UthesuyetVHPL1m+1EzEJvGVTk aKxaKuwpJwSBrJu7dWPcHZPdFW0npuxRWO5XGVyTVZFTSbcVruXZDlJSTIS4cgzrkOSSavbT42efa J1QB042UQ9YPMThfX2qS3ocl9sL0nJQ3JZKuxjPovo7iklSXfWNLee7fjDlkrXSHV7UJDg/BqDBfQ WjkKDAMUC1ZVZGVprz6KsUhaF8cy/1jRa379OQPp6OWOxqHn8qshBj1U9osUee5jCYfDhne/x4uBr Nbelkkejm8GzumVtaUG7lNhX1cZDRPo8OQ73LZUkGgQ9HqWH+fOvbgqVj4r7tZor+8yeHyvJ0Vh3+ PRZwvQIw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkhfs-00005h-Jr; Thu, 03 Dec 2020 06:01:04 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkhfT-0008MN-T8; Thu, 03 Dec 2020 06:00:41 +0000 Received: by mail-wm1-x341.google.com with SMTP id x22so1560339wmc.5; Wed, 02 Dec 2020 22:00:39 -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=zSxt96h/9Fwk+2Z2TEbldRZc+6ZVMG3i55XI3KvBZvc=; b=VFvg3Adxx0ksKE22uUwcKNp4cFVzM4T5QUBNmhSnxAnJLeGjsCnEdZjvpx05rqcDYt kJRYD3pAYdRfpw3DnMHK4fIMJdYQrx6tb3+lkWeMCZSZQTxSc3aPRrulmt6Ja4cJqYi+ G2MqocUhvUS70aSpU7HT9jCWI5bfok2OvUN8c8IiuZogL0diSXSEBOScZeFwSVW1HWib 2xXmDOHbZjLbRNP1KgPOqRwlRGvE+4DaUd+mOexaca2S1K7i1MLRW82hbSv1j+ipfAFg 5tI3RAHX+PYc5Ln7F0tbgQwdM0Mt7K7E7KjAgdw+uyUo0oGsHlqIHtiUZDTUDyIxbyzz c/3w== 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=zSxt96h/9Fwk+2Z2TEbldRZc+6ZVMG3i55XI3KvBZvc=; b=FxC5TY6rYKN9I2o7nPqjjgEMhRVTG+DwIX0CPUc+9Msq6FCwDzxLgHs5r9dmDYhIDx hlZp+91EOpASsL1J+sCO3bLf9m84d2/JhAEYx84avcrkXRhG8qLFZRFr4OGpJu19G4ei FvbWgkEvxEzuLJ2AnGq+RvhgvqgHUW5HbaPahseK/1GJv/AgPh/Cwq7hGQp0i+8NaINB JD/EmNJ64sEQPYkD4Fsl+sR7JFx00JAA3FoNpQbIqccaoPa4c7Q9UpbepoU7g9eit8+4 sqn8MDbaMhpriKKHtzW/HlDCTGEkMkLLPi+34xk+CGvbl4wHsQo7j5bY0sShKjLpm8bz gPqA== X-Gm-Message-State: AOAM530RggPPGBeVJItmzDGUTm65Ea+iRZDzeR9M5x8KiMW9uH32H/Gb CJgZGk5D/6adx7Avolq8RlM= X-Google-Smtp-Source: ABdhPJzHmIjDKNbLIWfBgHU0/GqU0Mf1N1LiuXCkgkMfJTjxj6NxVrWbNX+KayAjQr2//5v7SJMYLg== X-Received: by 2002:a1c:5946:: with SMTP id n67mr1360920wmb.162.1606975238897; Wed, 02 Dec 2020 22:00:38 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id i11sm218439wro.85.2020.12.02.22.00.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 22:00:38 -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 v4 5/7] arm64: dts: meson: add audio playback to odroid-c2 Date: Thu, 3 Dec 2020 06:00:21 +0000 Message-Id: <20201203060023.9454-6-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201203060023.9454-1-christianshewitt@gmail.com> References: <20201203060023.9454-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201203_010040_062059_9B3500E7 X-CRM114-Status: GOOD ( 13.58 ) 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:341 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [christianshewitt[at]gmail.com] 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 Acked-by: Jerome Brunet --- .../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 Thu Dec 3 06:00:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11947807 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 8F411697 for ; Thu, 3 Dec 2020 06:01:32 +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 5E8F120665 for ; Thu, 3 Dec 2020 06:01:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5E8F120665 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=t1xOaGwtqOC+1eBoeiD0azyIqQG1wJHGvNbxSgK9U3c=; b=H6IlbRC5FG/9yQnrnaO5yFZvDC 4e10GBO0eyFtU3plJy6mOWbxmOJjSH0ct33sYKsgy/IpHvW/Oz2/d+ZPOBOus01MWLKYCoqajIEW4 QitfgaLNj+92bVAkWcv+KqA2XwcmkHlt4ukaCItxSlFqfJ4MmqK7GwekuIomB8WyntzRp27nJDhSx mQENPUOIVMtRviFEDLHVSxza/Cms+7cNEBJXRSLl016fobcEBjWXUYjIehX9NAOKX36y4PPRVaQ93 fDfGg0BfvaYLA9lxaTX409p7RGuvxDhQgecZ4SUpi27TrgBpv7AVJAI8yRZW/xsyRoYt+hjW796sx vr4l0few==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkhg5-0000EQ-Gq; Thu, 03 Dec 2020 06:01:17 +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 1kkhfX-0008NK-43; Thu, 03 Dec 2020 06:00:44 +0000 Received: by mail-wm1-x335.google.com with SMTP id g185so2547582wmf.3; Wed, 02 Dec 2020 22:00:41 -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=flzzMcNnuQ2TK+9oOreZP7+ZK5g8q35jbbhYIv7bR/Q=; b=b4oROn2uYBd3EJILA6VTP3ZDTBrWylRxn6PJTleoUIkOvvCZOYF2O5TCsKirv7nKwd 8yxywt0SE3XJ8NZx1PY1nDQIWU7Pn7zvp2zIg8/Q3abg0d9k6gazejgLdybzJ5Phs6Z9 VCfFmaL3TrGx4ArFqlzCmqemyijff4HfifG0IAzqFCIUwpI6EJhOTrzJdvvVSIN5Wi50 RSDPuzJitQ70GCzfOyQXEyBhFrXxeEt9rivzMiHQF1Gl4hqeJwlsEQrI2MMVoxTnUmm6 s2VDOVOvRInrBckzN7BlAAlRHcT1PyX9qauil1ld1uZNwvJgSMF+6xlhtWARAekuCren rQDA== 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=flzzMcNnuQ2TK+9oOreZP7+ZK5g8q35jbbhYIv7bR/Q=; b=Qp3gCnz5KzTmz+Bi9DTe32igPkAgY9+h+bXGvn/4RIAey6lukUI1IRpEAWIo94RcON giPirxQqn2aPhpyy1YYUnb4Ld6H7LVOmmw0LGZy9VUo+FxRIwbDYMxNPbUkt/mhR9sYY IgFEWDde94x1G4jjDvAU9+BAjpLymN34VnmCCHaQklC2ST+FAIc7cMfK5Kzdj5lzoVWU zGmh5s0pxMSk7atFawT66Uyno/aPUOatG8Em4/+VRQO3ohcYP1nHT7nbrA5HZXGlSuHB ng5XfZ36KPFtAMy0pJwYlZWNIDQTnw+zW38bP7knJV+61jXqI5pYQ0dSCavcPvCUwBVP e/Sg== X-Gm-Message-State: AOAM531SRaQ+OkwkHZFWrYXmqIZqo1XzP4Y46jlMHFN+0n1Fmv71NPaT gEvA9AIuW7LB0eEeAOFtDY0= X-Google-Smtp-Source: ABdhPJyasl5FzioZeX74Iy3aXqmjj6CpZAy6X9j/0JXgw2knVm/Hcb1ZR5D932g1/aJpwkMPrcH6Vw== X-Received: by 2002:a1c:e901:: with SMTP id q1mr1395679wmc.148.1606975241061; Wed, 02 Dec 2020 22:00:41 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id i11sm218439wro.85.2020.12.02.22.00.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 22:00:40 -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 v4 6/7] arm64: dts: meson: add audio playback to wetek-hub Date: Thu, 3 Dec 2020 06:00:22 +0000 Message-Id: <20201203060023.9454-7-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201203060023.9454-1-christianshewitt@gmail.com> References: <20201203060023.9454-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201203_010044_036769_A85E9849 X-CRM114-Status: GOOD ( 12.78 ) 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 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [christianshewitt[at]gmail.com] 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 Acked-by: Jerome Brunet --- .../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 Thu Dec 3 06:00:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11947809 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 4A097697 for ; Thu, 3 Dec 2020 06:01:34 +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 1BD5620665 for ; Thu, 3 Dec 2020 06:01:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1BD5620665 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=s2lUnH/ssFQsYhtwgdGASO6VEyiRyywIf5/f5iY5O74=; b=V+7RO3oWUYZ/vDYUXjMdB1dvQx xncvTRQU8fg0RRnYYfTSX19lpSqjPvurQJwf2+cq/TXHH82V6pEZcX5+3Ck7WWqwn5OSU2oa6VFhN 0KIVCV8dtxIZp3E53f7kxXdtzY5SsE4EIS9MCdZFNXT/wvW+az9Xj6AOT8bXaMP3Nt+oXxcqWNg6+ whD41009hUmCsvaz1RIisbNY4ooDK/CRyCCizaN1tqBDFjwpOAEXIHxWXraSe8BXX2TFX+ASIe0ap yr8+Jys7uD49X8XCtKRmmlx5P6ZTOIhfMR9IpYxDK6Gb78dDmF2mkgs3F1h52e0GzIsBjMcRmaUIt Qw+8/jOA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkhg7-0000Fs-0G; Thu, 03 Dec 2020 06:01:19 +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 1kkhfY-0008Nk-Bq; Thu, 03 Dec 2020 06:00:45 +0000 Received: by mail-wm1-x344.google.com with SMTP id h21so2572294wmb.2; Wed, 02 Dec 2020 22:00: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=0Q2LsdTBYpLDoB7Cj1Qbdhjz0kWaNgxAFVnGw/sfz1U=; b=QtXO3tiAI6/rE9SWRU/ZhO0OVFw6FzMAkpmBXmsCns8KNURciKJ4bYtJsEsqUC3Cro Wd1LBED6m2sT9lJZrxnfElSD7CU7LbQqc7TPP67G8I0YoaYVR9XqX230+H4vKuCkOyfJ Mbjtf8+A61w845BLTaDvW7xuvLbQxcGu3effd8HSNUxw7IImVDN+CQcb7xAEKiVZ7rnO 6REB/gdTXZgN/OEwLM5bW/2wHzRFx7Qrcu98TPguIr+PkrNfEWKlHkHcwy+wH2EWrg5C Fc0+k5/TjK/Uyhlne6zKpm820Qk1B/Hl+mrtydx+DPNzV51C+RmJTkN6U0H/wAeJfR5d 5dRw== 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=0Q2LsdTBYpLDoB7Cj1Qbdhjz0kWaNgxAFVnGw/sfz1U=; b=e6O+GlfyZQ9P0r75yJv7brQSyf0HwT0JL13l/AoJINGdnodS1cgkUFKjvyi9mYQpsS m33P+SiANsug6I5aYlcUjfOOYiiL7SeBma+blrrsdlD0xrxf3YyELuzdgWE+Zd9t8txa UavuEBktmA1sJvzPKIPEZ2ZEjepTs2QN68c4OvpnGtYv+wD3UbUTQj3WM3HYNZy5MrIi Ld75sho/QXY8BhXZo0dywoQzogxZOvwSdbvudgEVZ/HEJQYu2t4IjCQo5RTA/5tn2zQG 4F6JGJooyrOU7VLWd0nw+qvO3c954K8Rm3y1dWtyM7EI7AWjG7B71xCYhtqNoIBOZg4k Oj1g== X-Gm-Message-State: AOAM530HahxPYxR7o0hq4gIlDAjniLoWEVHwZNCNwy8E3aaAMm5Q/r49 VVg42PmMMfnGZVDyGLXge6U= X-Google-Smtp-Source: ABdhPJwP/TLaHfs0bgnYof8vTgsePTEkN0CTCkbhP4/YlhSskA2ZUPaMbHH7CW/yL59HpuMxxw7zpQ== X-Received: by 2002:a7b:ca4c:: with SMTP id m12mr1367107wml.11.1606975243190; Wed, 02 Dec 2020 22:00:43 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id i11sm218439wro.85.2020.12.02.22.00.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 22:00:42 -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 v4 7/7] arm64: dts: meson: add audio playback to wetek-play2 Date: Thu, 3 Dec 2020 06:00:23 +0000 Message-Id: <20201203060023.9454-8-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201203060023.9454-1-christianshewitt@gmail.com> References: <20201203060023.9454-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201203_010044_523013_54BBBA9C X-CRM114-Status: GOOD ( 13.72 ) 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 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [christianshewitt[at]gmail.com] 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 Acked-by: Jerome Brunet --- .../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 {