From patchwork Sat Jul 18 06:57:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11671749 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 BDBAD618 for ; Sat, 18 Jul 2020 07:00:50 +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 969D720724 for ; Sat, 18 Jul 2020 07:00:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="XoEhuAd2"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="neHTgbqf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 969D720724 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=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=83IPnP4RZ36q8Wn9p9eoW3AP+1NkoaYnVihPFXaizro=; b=XoEhuAd2gVHJNGPMo8mUneJwOb Pb+M2m0N/1tXTc9G4MZFlWXgTenvLpt8OIwSLEB5aTLqRqI1+MnKGXDgbLuPkJbNktBqwP0CQdu4F 68feuPb4cXJD8T+f5zEoNwcKBcP0gMLI5PnnJg7J4Vkdoa5/i7zBZvU5UsAm5vsqhB/CEfS/wzl0z h/DKy/q9f3t+52XI+Ou+Lxnr/nw1QJCMoxWVUxGdwGGtwbGei11xtBDRRsGC7aNjWf9UBlCMdNHBI rfaKd/8pArmGAnNHR0TGC55ehW3ttlTmGsIDpNfuHyC87HccvQcV/zBOL6CyHMI44cRo0AXLZGWwx 33aVHCcQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwgoK-0001iU-HE; Sat, 18 Jul 2020 06:59:05 +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 1jwgnI-0001Gj-Js; Sat, 18 Jul 2020 06:58:01 +0000 Received: by mail-wr1-x441.google.com with SMTP id z13so13242572wrw.5; Fri, 17 Jul 2020 23:58:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3IIVS7MhfURH0UVnp76zcUfKlv8hfdezuu29h1qTO9Q=; b=neHTgbqfGpClsL0gQHB67RRXau6lnk7fbLn9xgBy3PbSToJl1m5N4Z3HP05r7yFwiv +FPXZgtCdnDtY/9lx51m4vVBJXvPhBj9W/BUsnDRCHVm1a3dTNtVViXysW2aL/uHorYp 6mJSJyfgpxfwbkRUVvnUPAzQDzrflpv73pXKg9R5Vtuiv6g42DRzxw5e0X1HmesTM+4O J988NtRNnW+ea1shLNC9e0xMmIR2aTPnNKT5pfZh8vKZ4cRVK0Yp0PNs1nL/ZcyIzbru aAiIwppV2XgbKPm71NusWFxxSPUFSYM5XBt/iEYcS2JHd5/AICUVeQVMGsn8LVFhhyAp 9t7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3IIVS7MhfURH0UVnp76zcUfKlv8hfdezuu29h1qTO9Q=; b=Jf8GHbluQ1zgsMz+xsB68Fld+k1KHaQrxmJzHBDy5dbAR9rJSqgwIkU+osvJLQ3MPn y5+hnRNh3Nrki/PVBXXPeT6FzdUyxYPPsrh0mip7j1wgQWUU65rjsin41Tf2+0A4SIDq zBpkXhqUEOz91rwPw+z0SreqZ5u8Zjd7b6Qm25zmXtcyonRNILJTmUxG7baqXgjbjfKC rW3PhmcL3kjullkknFj+LRAdOnIi1s1Nubs/qCkEPK76vFTuZ/MPkXXx/FjybwbQzxOY wu0MHsFJevbCA0WFJ+6PfJWHgjGJbqvSBCV1DmwL2L2upnfmJg/Xv2ttJoipFqiXLSzT UnPg== X-Gm-Message-State: AOAM531U5Zqweg8mAQ35ETmqHcPY4uRvSRfrCk4WV2w1vp4dW6wHcnv5 b8vbwr8wO0QD4/k4kZBpTBs= X-Google-Smtp-Source: ABdhPJxENi3dgreYnZ/rBF9Fp1/H2p/cBJM+q9VtdrscIG6c3xfl5obsf4gBCK3S/TGY2xHmPM4rsA== X-Received: by 2002:a5d:6284:: with SMTP id k4mr643263wru.372.1595055479486; Fri, 17 Jul 2020 23:57:59 -0700 (PDT) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id x5sm18749191wmg.2.2020.07.17.23.57.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 23:57:59 -0700 (PDT) From: Christian Hewitt To: Rob Herring , Mark Rutland , Kevin Hilman , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/12] arm64: dts: meson: add audio playback to p200 Date: Sat, 18 Jul 2020 06:57:34 +0000 Message-Id: <20200718065739.7802-8-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_025800_739447_9A2A4449 X-CRM114-Status: GOOD ( 11.38 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:441 listed in] [list.dnswl.org] 0.0 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-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christian Hewitt MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Add initial support limited to HDMI i2s and SPDIF (LPCM). Signed-off-by: Christian Hewitt --- .../boot/dts/amlogic/meson-gxbb-p200.dts | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts index 3c93d1898b40..a16dac72600d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts @@ -9,11 +9,19 @@ #include "meson-gxbb-p20x.dtsi" #include +#include / { compatible = "amlogic,p200", "amlogic,meson-gxbb"; model = "Amlogic Meson GXBB P200 Development Board"; + spdif_dit: audio-codec-0 { + #sound-dai-cells = <0>; + compatible = "linux,spdif-dit"; + status = "okay"; + sound-name-prefix = "DIT"; + }; + avdd18_usb_adc: regulator-avdd18_usb_adc { compatible = "regulator-fixed"; regulator-name = "AVDD18_USB_ADC"; @@ -57,6 +65,59 @@ press-threshold-microvolt = <0>; /* 0% */ }; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXBB-P200"; + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; + + dai-link-0 { + sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; + }; + + dai-link-1 { + sound-dai = <&aiu AIU_CPU CPU_SPDIF_FIFO>; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-3 { + sound-dai = <&aiu AIU_CPU CPU_SPDIF_ENCODER>; + + codec-0 { + sound-dai = <&spdif_dit>; + }; + }; + + dai-link-4 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; + pinctrl-0 = <&spdif_out_y_pins>; + pinctrl-names = "default"; }; ðmac {