From patchwork Sat Jul 18 06:57:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11671733 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 B8080618 for ; Sat, 18 Jul 2020 06:59:42 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4BB3D20724 for ; Sat, 18 Jul 2020 06:59:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="GppDAxgs"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NpG1hof2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4BB3D20724 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=XF/x14eEHa5vI1WUliBgKFZKFgvB3cOrh4bzOlH7im8=; b=GppDAxgsqFBCApvcDCsjeMqV2x gVs9+Upyj4g2ISCDio1K35ktGC6A4cClOr8PbJ1dRPAqpVPmGnk8SPIjAz9oqPLpp6J61xAdM+DYP wi9yzbCQ3naGURu5elpqjcMNFkzDrOM2PSwFaU5l0zOrRObPH3H/pqVtilZyZvsvrBSxP+BHprl1k +suUazWdzgh7Bvb0cSWP9fwH9xQ3lDGmpN/+GDS7nrRaPK6nmNkQqMcf9R0+VQuNE3xFhcWOmdmYX ypMh08PUi+olxRgBI9WKezpjwHTRUOS24qDyPk85QvYCInRkRMi0ZmpWkl8tQcQjz1appZCaQ/Qmi ID/B3Vkg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwgoj-0001zK-Ka; Sat, 18 Jul 2020 06:59:29 +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 1jwgnN-0001J0-8p; Sat, 18 Jul 2020 06:58:06 +0000 Received: by mail-wr1-x443.google.com with SMTP id z13so13242656wrw.5; Fri, 17 Jul 2020 23:58:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1ErSCHcHzIsW6dIDBmuhPbxBHo15N9XHrkYPsBItQXg=; b=NpG1hof2UuA8uOhIZVzRSzgmpKseK3rVcoP/nS6cW9E4Uvr3YzrvkNChzT88/F2/0O 3hmuaJJGaQJ6qrop0qxOzYDQHwnb0Xof/TFogslwZzkdOVn2pmXBow8gw1gem49LckHK 1bDvB92jF8nEMr2/DXjWm15V5idJx554gFcbWLqv9g6h4F+G3x3jm+qjxs4JQZhWS5dW QItDxeg34g1tdhtpEQn/79sxiDY3WZrSgAoqqDAAQ83QD6WyD17O6Pc/4GGOGLKrg1n2 OvSjA/NXVf9O88oEWO6wT2/HeoRlmVgJaG/Var3r29EYmAXlGu+Ix8+Kz5sCeIOaQdMK bOJg== 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=1ErSCHcHzIsW6dIDBmuhPbxBHo15N9XHrkYPsBItQXg=; b=D/d4OlZt7b271tzykSISi0IGgSW8jFP87Ep3sODVu32Jb3nKCeYRLmt/AqSAo75akF 5eBfqH+oKgtaC9fUTijiMbudfNBFP8174B7n8J1J+lubyZmwMPZcRY9NmRIM0l2bT7pP OQAFquBvvGEO/j4SQFzERGvPP8n/nkmwMbVTC1Y9kCB1T5P/EKelbkiqckkSOmRIBZIC oRg8Gdod+VyfBkek1KPffpE2hAyM+0A7UM1S3y6ZRHSSVKpWEJDrB+G+xiRzgbStygoC M4omcLUw1zuLJhMPMx4DeZhxqenmcezwGvSJ1nKH5pgiysuR4rZVkbN08oCy4Nbrt93e kQXw== X-Gm-Message-State: AOAM532QePSb8pECx+hEEidkNEuV+J8ZVe7Sg9241h34912Otxng+FbG 2aQzxqVobJrTRHKkBdrQ9qE= X-Google-Smtp-Source: ABdhPJwiBHU86HzVfaoGD0RkxLOOV9NbiNE/ASSoYy6mAhnB4uUbH9sHF3oqDPumKSV/KsiuT9Yy1Q== X-Received: by 2002:adf:e850:: with SMTP id d16mr13997770wrn.426.1595055483838; Fri, 17 Jul 2020 23:58:03 -0700 (PDT) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id x5sm18749191wmg.2.2020.07.17.23.58.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 23:58:03 -0700 (PDT) From: Christian Hewitt To: Rob Herring , Mark Rutland , Kevin Hilman , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/12] arm64: dts: meson: add audio playback to rbox-pro Date: Sat, 18 Jul 2020 06:57:36 +0000 Message-Id: <20200718065739.7802-10-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200718065739.7802-1-christianshewitt@gmail.com> References: <20200718065739.7802-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200718_025805_398764_FE77BD6D X-CRM114-Status: GOOD ( 10.63 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:443 listed in] [list.dnswl.org] 0.0 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.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christian Hewitt MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org Add initial support limited to HDMI i2s and SPDIF (LPCM). Signed-off-by: Christian Hewitt --- .../boot/dts/amlogic/meson-gxm-rbox-pro.dts | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts index c89c9f846fb1..7b23b3da27ff 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts @@ -14,6 +14,7 @@ /dts-v1/; #include "meson-gxm.dtsi" +#include / { compatible = "kingnovel,r-box-pro", "amlogic,s912", "amlogic,meson-gxm"; @@ -33,6 +34,13 @@ reg = <0x0 0x0 0x0 0x80000000>; /* 2 GiB or 3 GiB */ }; + spdif_dit: audio-codec-0 { + #sound-dai-cells = <0>; + compatible = "linux,spdif-dit"; + status = "okay"; + sound-name-prefix = "DIT"; + }; + leds { compatible = "gpio-leds"; @@ -51,6 +59,25 @@ }; }; + vddio_ao18: regulator-vddio_ao18 { + compatible = "regulator-fixed"; + regulator-name = "VDDIO_AO18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + hdmi_5v: regulator-hdmi-5v { + compatible = "regulator-fixed"; + + regulator-name = "HDMI_5V"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + + gpio = <&gpio GPIOH_3 GPIO_ACTIVE_HIGH>; + enable-active-high; + regulator-always-on; + }; + vddio_boot: regulator-vddio-boot { compatible = "regulator-fixed"; regulator-name = "VDDIO_BOOT"; @@ -90,6 +117,59 @@ clocks = <&wifi32k>; clock-names = "ext_clock"; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXM-RBOX-PRO"; + 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_h_pins>; + pinctrl-names = "default"; }; ðmac {