From patchwork Mon Dec 7 09:53:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 339165 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp2665399jai; Mon, 7 Dec 2020 01:56:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJzg0ADlAdksLWoJuA0o8UNedX3HnS0z2wFr8e5W92HISaj7nBIa/WwKg8b/KqWWthOQ9i4P X-Received: by 2002:a50:d685:: with SMTP id r5mr15772930edi.248.1607334960815; Mon, 07 Dec 2020 01:56:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607334960; cv=none; d=google.com; s=arc-20160816; b=E4E6FTpFrqPaXkm4ci8UBvD3QkKgDHcifpKsmL38M3VAn2xqjoUv/hzJXFIVUmJQ64 PZhn/V5EyyIq+QO7VTs8rkAq2LImkL+kwxFKV2nFCTzkJRN12n0TLnQ9nK3Y/rTwOr2Z 0b3iLgMGdLEIK0AS3NO+xMqAuyBd+5mhBuHYruZ9QdjEX0DA7QZi5vtRzcDMpuf/x27p VsuJalf43tjsqmUoR6GFihg9dMjuDT8noknrbEfOO5yyakhIuhExcNk+mW8AjV1nzr8X 0smREAYe5xMECENl7uLTbEtUEAoz6CMvveLMDusBWjUtqUr0TZW1vl60AZYrCi/OKivY l8OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+T69uWds35TQLG/jLTGEQSVL+H6ceRPvadepLDcX3dc=; b=okp7CI/mVenaGnesRYywq35aI0Xq/sHItazpx1IKYauzDRaRMJIMhmegB9LVZNWaJG swz8Gl0zWKG6Uknihh2fK9peGEH9GnuYTI1zqQmyxWkJFVyvrN7zaolPMVJspK3T5COg eDvL9tZYMbKS3TqvGirC3HMzQ+rkFGrfYjzH8r4NZmIrH19vk/xpooMGTkODAvLigtBS q7EEiVHqqpC+XXWbPLqppfuE3GD4hv65ik5ARpZyR4L4Llj1uqEV+L2shOudEZiGTDGU 9ix0+rfmn8R8zHy6A/YtaJbn2ENs1e40O/AiqGQWqx13hI5hRjfbCCPK1fzh2+hlM8L8 aaHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=2TL8+pWX; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s28si7612635edc.569.2020.12.07.01.56.00; Mon, 07 Dec 2020 01:56:00 -0800 (PST) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=2TL8+pWX; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726755AbgLGJys (ORCPT + 6 others); Mon, 7 Dec 2020 04:54:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726637AbgLGJys (ORCPT ); Mon, 7 Dec 2020 04:54:48 -0500 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22EC7C061A4F for ; Mon, 7 Dec 2020 01:54:02 -0800 (PST) Received: by mail-wr1-x443.google.com with SMTP id c1so155428wrq.6 for ; Mon, 07 Dec 2020 01:54:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+T69uWds35TQLG/jLTGEQSVL+H6ceRPvadepLDcX3dc=; b=2TL8+pWXVEUg1MlfV8WS+SppmrUsLz5DcTpIod+2sSBnsmaqSPH6DoQYpKypocIQeg frvq52OvsBQwjoqlWw+4UzZAYQMNYkVM2xkUTK1BBmouoscTddjAE/VxQV+ih9iIFHJo KGVNsRs2GakXwlhCWVWA9T7PaSw5wRxkpvUQFLusMJ5I5DZGf9g/8ntUsPNr5kaV52b/ YSja3k+Cnxp/ol89eOWSwS6zSDLOV+g9Y+cPABNH164994EN36hPLKues5Ofb701ZGNs OOGG0uCy0hcWJeydOB1FqJB3vol0Pq4SoowKEDEk7RoRHoMmM9SDHbPF+p0jIOBl30bp 0r5w== 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:mime-version:content-transfer-encoding; bh=+T69uWds35TQLG/jLTGEQSVL+H6ceRPvadepLDcX3dc=; b=kj+pK1ZZ8VdLW526UjrFxmI2QNRIsiutsQg/svZlKv0u4tEWwdULP77pmBEhfBosaP ZuwN7TlFZKgrmzahOEMgvBUtfxGMtlpGCCK/4k/I5UQjMvAVDbVhYMvVVWSZ+F/9uLiU pBGpiEuawliqAJUAS5LFBV6tlD5Hwqk0A5zIsdNAE4p3orY50wWyTSbLIewK3uCIfPTX xSiDuHxDcbFa+GAwKfbL4NdWEigGfsQ6Vp3G50wVi6PGe7jsgg7nRzzJaAHYRMMDO11v bZZlwS+tHD7qGCpHSIAzPkN6FMShrhahVJ62l7Mwg+Wr/3qQkfPyYyA/ju8d+0NUL99+ /LoA== X-Gm-Message-State: AOAM530yjyhkUbmItfCZNo3UdCe0dX2eAbRXpW9LJDIn2ZIeL/JLIIyD WV4jAa7UONAnn6r/XjNgP5T5Xw== X-Received: by 2002:a5d:65c8:: with SMTP id e8mr19661606wrw.338.1607334840868; Mon, 07 Dec 2020 01:54:00 -0800 (PST) Received: from starbuck.lan (82-65-169-74.subs.proxad.net. [82.65.169.74]) by smtp.googlemail.com with ESMTPSA id t188sm13558066wmf.9.2020.12.07.01.54.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 01:54:00 -0800 (PST) From: Jerome Brunet To: Kevin Hilman Cc: Jerome Brunet , linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] arm64: dts: meson: vim3: enable hdmi audio loopback Date: Mon, 7 Dec 2020 10:53:46 +0100 Message-Id: <20201207095346.26297-3-jbrunet@baylibre.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201207095346.26297-1-jbrunet@baylibre.com> References: <20201207095346.26297-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Enable audio capture frontends and a tdm decoder. This makes it possible to loopback the audio played on the hdmi codec, which is the only output interface at the moment. Of course, one TODDR device would be enough to do that but since the 3 FRDDRs are enabled on the playback side, let's do the same on the capture side. Signed-off-by: Jerome Brunet --- .../boot/dts/amlogic/meson-khadas-vim3.dtsi | 41 +++++++++++++++++-- 1 file changed, 37 insertions(+), 4 deletions(-) -- 2.28.0 diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi index 12465c4becc7..4cf2c193d168 100644 --- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi @@ -166,11 +166,16 @@ hdmi_connector_in: endpoint { sound { compatible = "amlogic,axg-sound-card"; model = "G12B-KHADAS-VIM3"; - audio-aux-devs = <&tdmout_a>; + audio-aux-devs = <&tdmin_a>, <&tdmout_a>; audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0", "TDMOUT_A IN 1", "FRDDR_B OUT 0", "TDMOUT_A IN 2", "FRDDR_C OUT 0", - "TDM_A Playback", "TDMOUT_A OUT"; + "TDM_A Playback", "TDMOUT_A OUT", + "TDMIN_A IN 1", "TDM_A Capture", + "TDMIN_A IN 3", "TDM_A Loopback", + "TODDR_A IN 0", "TDMIN_A OUT", + "TODDR_B IN 0", "TDMIN_A OUT", + "TODDR_C IN 0", "TDMIN_A OUT"; assigned-clocks = <&clkc CLKID_MPLL2>, <&clkc CLKID_MPLL0>, @@ -193,8 +198,20 @@ dai-link-2 { sound-dai = <&frddr_c>; }; - /* 8ch hdmi interface */ dai-link-3 { + sound-dai = <&toddr_a>; + }; + + dai-link-4 { + sound-dai = <&toddr_b>; + }; + + dai-link-5 { + sound-dai = <&toddr_c>; + }; + + /* 8ch hdmi interface */ + dai-link-6 { sound-dai = <&tdmif_a>; dai-format = "i2s"; dai-tdm-slot-tx-mask-0 = <1 1>; @@ -209,7 +226,7 @@ codec { }; /* hdmi glue */ - dai-link-4 { + dai-link-7 { sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; codec { @@ -449,10 +466,26 @@ &tdmif_a { status = "okay"; }; +&tdmin_a { + status = "okay"; +}; + &tdmout_a { status = "okay"; }; +&toddr_a { + status = "okay"; +}; + +&toddr_b { + status = "okay"; +}; + +&toddr_c { + status = "okay"; +}; + &tohdmitx { status = "okay"; };