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 {