From patchwork Wed Jul 1 09:45:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 192126 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp280308ecs; Wed, 1 Jul 2020 02:46:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwkYxLoJ9lI5hpwT9ms/OSHcN8kBPRAc1be/4t+NSHfrZLFq/TZklTur/6TMVrxISym486r X-Received: by 2002:a17:906:fa15:: with SMTP id lo21mr23203853ejb.156.1593596778045; Wed, 01 Jul 2020 02:46:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593596778; cv=none; d=google.com; s=arc-20160816; b=HtmbL6b7VR+FN0qKGbpO0xNHR5oTGbBakPyzZjoguke2rEfivyLy5rM1oui1q3FyDy HsaJanxmFRf8fpVu6TkTm8iVozq/y/qQ8R1BrcBFPBf4swxWtJrv7iZ1KYaEoKPQHgb3 gmFrx+qc3Sn2YqT/Ll5Ylan1+5iG1amZGnY2HL6gy35hx0sCJlsEVqZoFMXg+y1h867h AZr844Y4L62abv3tRXCpHzEBVnorSXUlsDyORXLe/34yYbZSFEg0eHhNtttLfxofUHD9 3l8Wz4eQXVA3gzt1G5rQJufvwsDpVK9XMOmFYGUA7gZqpKwhCzpLct19frxHKwhT9TXH m6vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=G4XcfcAkqZ4hOUekNAJTnLH2TON/M34d5Vhe+YnBg/I=; b=cQhfv6CeTAbS4EzVzxxt7ewOuzQCbhJf+hG86yWkJRZqSkfmYpXG8ce4XEaYd7SAVw mnfjMtAd6i9YcctZ9Lc0/u+81/tH4lPA1NXp1WixGO3NDdNxZHLX0UzJ77tLNn6MLOOK D4nrQEJZs+5FrCr0NfgoSMZKpiH/TdO0nijT+7rz8CjBW9NYdGfondKZd+V4TcqS36P1 hauSDSkQCzFrBPuz9uuInXr4Sd/g07CNxiI3ZzbF1d1VsUIS/jZTjjzM/9KmK2l/RZbZ 2x2hXKJu3kFixYq9i9IKJDuaON/LxfRh66Rn+beICr9ZovS4kCU2zVTAnGBn73/dHBQ6 byBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=PId0Flju; 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 n10si3641397ejk.504.2020.07.01.02.46.17; Wed, 01 Jul 2020 02:46:18 -0700 (PDT) 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=PId0Flju; 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 S1729667AbgGAJqH (ORCPT + 6 others); Wed, 1 Jul 2020 05:46:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729637AbgGAJqF (ORCPT ); Wed, 1 Jul 2020 05:46:05 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8602C03E979 for ; Wed, 1 Jul 2020 02:46:04 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id l17so21720704wmj.0 for ; Wed, 01 Jul 2020 02:46:04 -0700 (PDT) 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=G4XcfcAkqZ4hOUekNAJTnLH2TON/M34d5Vhe+YnBg/I=; b=PId0Flju4Q2mnrmD+zyXcMyBEX/vsGY7PaI1Jqf3GwnZ45nmIjaJKl71CR0hmJIihG SJTMuR80xK7ueQ+ZhlIv3mFmX74kZIeYpjZcf6J5/WZZYnVJyNFxMRhvqGTF9Z4T9+m4 GNM3ScLuTEDLnSjWIo446YAVCYLBB3yxXeFip4mLplgBsl6cjjp2otK+1LZTPuMI4Bc5 Typvtipqs3kyWZ7ISzuVtRu3pFRi2wobeJgZjCfSrU9vzUvSqP/7JJ1N5eBBwsTpnTQI WduSPKG8IxfrKAp1EohfeeP42Y/ltaL+eG6heWoZGWo7zhaHyi/DXGRBrS/KK3QB54ay hzYQ== 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=G4XcfcAkqZ4hOUekNAJTnLH2TON/M34d5Vhe+YnBg/I=; b=XXXQvk9uPanLLWbseL8EVjjZlEKlDU77yu8J/s7Bh8Fkr+FWjWT3yi77fZDYFpVxdx 7LaVeKsduVgEhuFc+jcGPdWEaoGtqm7ufhWGDwPYtobjPRzXum7Ek/Hyv5Jt5N+76tqy RAkwxTD9sTx8U5JscfhFLhL52iMFBICVOJxviozp4fvUx++cfLOmVSfOr9UyqNQ9+PTL nXow1CxKHms/k0shIaxUH6kM/EgF4nRpVO4uDpKh0Julgck7orhANMwgauC7sv2VckaY XZaMAIkh/ltGFf7ahW7xtSYuVD4feSEPval+5Jm4MhB23hvfXAVeJyDontzEivmeZ2j6 iW7A== X-Gm-Message-State: AOAM531BaSPqmXv13cOeVEpgvDlXW5qYtcr9JO6zU6ROLngvK+MvciCB 3jbc882a/D6skpOe+UycLZqoeA== X-Received: by 2002:a1c:c387:: with SMTP id t129mr18585253wmf.27.1593596763411; Wed, 01 Jul 2020 02:46:03 -0700 (PDT) Received: from starbuck.baylibre.local (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id f13sm6270472wmb.33.2020.07.01.02.46.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 02:46:02 -0700 (PDT) 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 1/2] arm64: dts: meson: odroid-n2: enable audio loopback Date: Wed, 1 Jul 2020 11:45:55 +0200 Message-Id: <20200701094556.194498-2-jbrunet@baylibre.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200701094556.194498-1-jbrunet@baylibre.com> References: <20200701094556.194498-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add capture pcm interfaces and loopback routes to the odroid-n2 Signed-off-by: Jerome Brunet --- .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 65 +++++++++++++++++-- 1 file changed, 61 insertions(+), 4 deletions(-) -- 2.25.4 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts index 169ea283d4ee..d4421ad164bd 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts @@ -209,11 +209,28 @@ hdmi_connector_in: endpoint { sound { compatible = "amlogic,axg-sound-card"; model = "G12B-ODROID-N2"; - audio-aux-devs = <&tdmout_b>; + audio-aux-devs = <&tdmout_b>, <&tdmin_a>, <&tdmin_b>, + <&tdmin_c>, <&tdmin_lb>; audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1", "TDMOUT_B IN 1", "FRDDR_B OUT 1", "TDMOUT_B IN 2", "FRDDR_C OUT 1", - "TDM_B Playback", "TDMOUT_B OUT"; + "TDM_B Playback", "TDMOUT_B OUT", + "TDMIN_A IN 4", "TDM_B Loopback", + "TDMIN_B IN 4", "TDM_B Loopback", + "TDMIN_C IN 4", "TDM_B Loopback", + "TDMIN_LB IN 1", "TDM_B Loopback", + "TODDR_A IN 0", "TDMIN_A OUT", + "TODDR_B IN 0", "TDMIN_A OUT", + "TODDR_C IN 0", "TDMIN_A OUT", + "TODDR_A IN 1", "TDMIN_B OUT", + "TODDR_B IN 1", "TDMIN_B OUT", + "TODDR_C IN 1", "TDMIN_B OUT", + "TODDR_A IN 2", "TDMIN_C OUT", + "TODDR_B IN 2", "TDMIN_C OUT", + "TODDR_C IN 2", "TDMIN_C OUT", + "TODDR_A IN 6", "TDMIN_LB OUT", + "TODDR_B IN 6", "TDMIN_LB OUT", + "TODDR_C IN 6", "TDMIN_LB OUT"; assigned-clocks = <&clkc CLKID_MPLL2>, <&clkc CLKID_MPLL0>, @@ -236,8 +253,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_b>; dai-format = "i2s"; dai-tdm-slot-tx-mask-0 = <1 1>; @@ -252,7 +281,7 @@ codec { }; /* hdmi glue */ - dai-link-4 { + dai-link-7 { sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; codec { @@ -476,6 +505,22 @@ &tdmif_b { status = "okay"; }; +&tdmin_a { + status = "okay"; +}; + +&tdmin_b { + status = "okay"; +}; + +&tdmin_c { + status = "okay"; +}; + +&tdmin_lb { + status = "okay"; +}; + &tdmout_b { status = "okay"; }; @@ -484,6 +529,18 @@ &tohdmitx { status = "okay"; }; +&toddr_a { + status = "okay"; +}; + +&toddr_b { + status = "okay"; +}; + +&toddr_c { + status = "okay"; +}; + &uart_AO { status = "okay"; pinctrl-0 = <&uart_ao_a_pins>;