From patchwork Mon Nov 16 06:20:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11907403 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 790CC697 for ; Mon, 16 Nov 2020 06:21:28 +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 E72FA20657 for ; Mon, 16 Nov 2020 06:21:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LaoQ2za2"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HTG5fnT3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E72FA20657 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=f29Ak/YBGdXXrOlOM+JgrPxtDxdKoZDrmmcmJ+FzxsE=; b=LaoQ2za26GIsOsgLuPHCwTl0z6 rh1QIMaBlvpeXQCPQn4HqiUHhxcKJXJjj5ADye20n22gY128m2avRZlXGDitShOv4No9pInLjWTjw w+0IH6LvQuS3fYBbLQDvMlL2iBaZ5Ow5/wq+XS0S05N8EQJ3Y6sg+/LZtu6rZQPyL/Ak9C5+qZvxm 2awryB0mUWKf4NV+XGyicni7OnSBEpVOnAJwJmaWxyeLvIQepNV0eeJ/19exlIPjxPcjpLOSAOuJ1 vpepEgxXNmuVL4i1AkTdyYwG/8JKyTf/SRt/ChX2wsx9WHLgm81OuXKxwCEjMVrRLy0QFubk1f27a asrd4dpQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1keXsz-0001Ee-3Q; Mon, 16 Nov 2020 06:21:09 +0000 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1keXsW-00014e-IY; Mon, 16 Nov 2020 06:20:42 +0000 Received: by mail-wr1-x433.google.com with SMTP id d12so17340291wrr.13; Sun, 15 Nov 2020 22:20:40 -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=hYiWLdXKkzPeHdrQPfgrV2RjQ9E5+nTOH1ppXyWYIkY=; b=HTG5fnT3HJe751cxn7ehGB/SWGvCNm86fAMak0bPBh6vbmDlFLMgoNFp0USjV+3uUD CZxpIBv2h51wgul+lSCw9fxbjrRAcy4gn7EiBZQ9ZW4H1IsIvf8w5iaPkOOpgfMsXF9I QsfPTnCFNG0PL97HsI9VR99h+WzAOjjFIDJbBwDCk7AJibY4Ou54ImjN5adXo6r42DCG xqAjL7V/O7WZAy4hVDeaFLuu4QYsZHFLXxXGAqjPENRiiOwBSCPGM+ELI8KvoTQxURNV ULkJb/onDyi0VkcqsP+NyJxyXp0jtkhPctSerkON2EPBhk0bRViagYzz0NCwe5WEiBaQ 2/Yw== 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=hYiWLdXKkzPeHdrQPfgrV2RjQ9E5+nTOH1ppXyWYIkY=; b=ltnn3c3LvMqaSRbk224BvVSGjrz9dpl/EptM+9bR/DCX+xfClTwcprkYaQZEkAP+8M KUOVZpZFPqMyCLfKRZqU/pObAkpp7H4zmwD5cnznewrdNi+zhZoqGl6w29FaCTYvapmG JwMJ1SjIK8thsV3OL6NQPStk9DnZqEODUAH717859hm58fkPBCvt6i1Qo6x6dgTr++Yo X2kutWpbaOcPy6x/bc8Mry0EAubAzfyAeZ7N5YNwowFsJrVl6xBMk4LhfBVs7MAn2y0s KLa+U/dr+iubZAx7WVbkgvsXzCkAVMVGR1DkQ2HLtxUVDeirAo9y910m2lC7zzFMBSMi eKTA== X-Gm-Message-State: AOAM531ALbFPA/d5oBYE7sCt0+PwRHyngP3PMVxiwSAq2Jav7peAeORl hvOxQZJ2lkQFCSHrhcwx2NY= X-Google-Smtp-Source: ABdhPJxLfaHICNguiyOYcs7944lNnn8viM5jjfq3HveUvEWUl73g5UbldCOK1lDXxH11Va6cR/8dJg== X-Received: by 2002:a5d:448b:: with SMTP id j11mr17004655wrq.236.1605507639509; Sun, 15 Nov 2020 22:20:39 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id m3sm17065985wrv.6.2020.11.15.22.20.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2020 22:20:39 -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 v3 2/7] arm64: dts: meson: add audio playback to khadas-vim Date: Mon, 16 Nov 2020 06:20:26 +0000 Message-Id: <20201116062031.11233-3-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201116062031.11233-1-christianshewitt@gmail.com> References: <20201116062031.11233-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201116_012040_703488_744049E1 X-CRM114-Status: GOOD ( 14.51 ) 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:433 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 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 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 --- .../amlogic/meson-gxl-s905x-khadas-vim.dts | 43 ++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-) 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 8bcdffdf55d0..de5361f20cd6 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 @@ -5,9 +5,9 @@ /dts-v1/; -#include - #include "meson-gxl-s905x-p212.dtsi" +#include +#include / { compatible = "khadas,vim", "amlogic,s905x", "amlogic,meson-gxl"; @@ -63,6 +63,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 {