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 {