From: Svyatoslav Ryhel <clamor95@gmail.com>
To: Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Svyatoslav Ryhel <clamor95@gmail.com>,
Maxim Schwalm <maxim.schwalm@gmail.com>,
Dmitry Osipenko <digetx@gmail.com>
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
alsa-devel@alsa-project.org, linux-tegra@vger.kernel.org,
linux-staging@lists.linux.dev
Subject: [PATCH v1 07/10] ARM: tegra: transformers: update bindings of sound graph
Date: Tue, 21 Feb 2023 20:32:08 +0200 [thread overview]
Message-ID: <20230221183211.21964-8-clamor95@gmail.com> (raw)
In-Reply-To: <20230221183211.21964-1-clamor95@gmail.com>
- fix headset detection in common device tree;
- diverge control and detect elements for mic;
- use GPIO mic detection on wm8903 devices;
Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
---
arch/arm/boot/dts/tegra20-asus-tf101.dts | 8 +++++---
arch/arm/boot/dts/tegra30-asus-tf201.dts | 17 +++++++++++++++++
arch/arm/boot/dts/tegra30-asus-tf300t.dts | 5 ++---
arch/arm/boot/dts/tegra30-asus-tf300tg.dts | 17 +++++++++++++++++
arch/arm/boot/dts/tegra30-asus-tf700t.dts | 17 +++++++++++++++++
.../dts/tegra30-asus-transformer-common.dtsi | 9 +++++----
arch/arm/boot/dts/tegra30-pegatron-chagall.dts | 2 +-
7 files changed, 64 insertions(+), 11 deletions(-)
diff --git a/arch/arm/boot/dts/tegra20-asus-tf101.dts b/arch/arm/boot/dts/tegra20-asus-tf101.dts
index c39ddb462ad0..8d0613567e82 100644
--- a/arch/arm/boot/dts/tegra20-asus-tf101.dts
+++ b/arch/arm/boot/dts/tegra20-asus-tf101.dts
@@ -1179,15 +1179,17 @@ sound {
"Int Spk", "RON",
"Int Spk", "LOP",
"Int Spk", "LON",
- "Mic Jack", "MICBIAS",
- "IN1L", "Mic Jack";
+ "IN1L", "Headset Mic",
+ "IN2L", "Headset Mic",
+ "DMICDAT", "Int Mic";
nvidia,i2s-controller = <&tegra_i2s1>;
nvidia,audio-codec = <&wm8903>;
nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
- nvidia,headset;
+ nvidia,mic-det-gpios = <&gpio TEGRA_GPIO(X, 1) GPIO_ACTIVE_HIGH>;
+ nvidia,coupled-mic-hp-det;
clocks = <&tegra_car TEGRA20_CLK_PLL_A>,
<&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
diff --git a/arch/arm/boot/dts/tegra30-asus-tf201.dts b/arch/arm/boot/dts/tegra30-asus-tf201.dts
index 315c6dc068c5..47865deeb88a 100644
--- a/arch/arm/boot/dts/tegra30-asus-tf201.dts
+++ b/arch/arm/boot/dts/tegra30-asus-tf201.dts
@@ -605,6 +605,23 @@ haptic-feedback {
enable-gpios = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_HIGH>;
vcc-supply = <&vdd_3v3_sys>;
};
+
+ sound {
+ compatible = "asus,tegra-audio-rt5631-tf201",
+ "nvidia,tegra-audio-rt5631";
+ nvidia,model = "Asus Transformer Prime TF201 RT5631";
+
+ nvidia,audio-routing =
+ "Headphone Jack", "HPOL",
+ "Headphone Jack", "HPOR",
+ "Int Spk", "SPOL",
+ "Int Spk", "SPOR",
+ "MIC1", "MIC Bias1",
+ "MIC Bias1", "Headset Mic",
+ "DMIC", "Int Mic";
+
+ nvidia,audio-codec = <&rt5631>;
+ };
};
&emc_icc_dvfs_opp_table {
diff --git a/arch/arm/boot/dts/tegra30-asus-tf300t.dts b/arch/arm/boot/dts/tegra30-asus-tf300t.dts
index f47434871a5c..78f78cca337a 100644
--- a/arch/arm/boot/dts/tegra30-asus-tf300t.dts
+++ b/arch/arm/boot/dts/tegra30-asus-tf300t.dts
@@ -1011,13 +1011,12 @@ sound {
"Int Spk", "RON",
"Int Spk", "LOP",
"Int Spk", "LON",
- "IN1L", "Mic Jack",
- "IN2L", "Mic Jack",
+ "IN1L", "Headset Mic",
+ "IN2L", "Headset Mic",
"DMICDAT", "Int Mic";
nvidia,audio-codec = <&wm8903>;
nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
- nvidia,headset;
};
};
diff --git a/arch/arm/boot/dts/tegra30-asus-tf300tg.dts b/arch/arm/boot/dts/tegra30-asus-tf300tg.dts
index 96345f821c3d..82c51e177a70 100644
--- a/arch/arm/boot/dts/tegra30-asus-tf300tg.dts
+++ b/arch/arm/boot/dts/tegra30-asus-tf300tg.dts
@@ -1072,6 +1072,23 @@ timing-667000000 {
display-panel {
compatible = "innolux,g101ice-l01";
};
+
+ sound {
+ compatible = "asus,tegra-audio-rt5631-tf300tg",
+ "nvidia,tegra-audio-rt5631";
+ nvidia,model = "Asus Transformer Pad TF300TG RT5631";
+
+ nvidia,audio-routing =
+ "Headphone Jack", "HPOL",
+ "Headphone Jack", "HPOR",
+ "Int Spk", "SPOL",
+ "Int Spk", "SPOR",
+ "MIC1", "MIC Bias1",
+ "MIC Bias1", "Headset Mic",
+ "DMIC", "Int Mic";
+
+ nvidia,audio-codec = <&rt5631>;
+ };
};
&emc_icc_dvfs_opp_table {
diff --git a/arch/arm/boot/dts/tegra30-asus-tf700t.dts b/arch/arm/boot/dts/tegra30-asus-tf700t.dts
index 1a331dec3cfe..766225ebdeab 100644
--- a/arch/arm/boot/dts/tegra30-asus-tf700t.dts
+++ b/arch/arm/boot/dts/tegra30-asus-tf700t.dts
@@ -812,6 +812,23 @@ vdd_1v2_mipi: regulator-mipi {
enable-active-high;
vin-supply = <&vdd_3v3_sys>;
};
+
+ sound {
+ compatible = "asus,tegra-audio-rt5631-tf700t",
+ "nvidia,tegra-audio-rt5631";
+ nvidia,model = "Asus Transformer Infinity TF700T RT5631";
+
+ nvidia,audio-routing =
+ "Headphone Jack", "HPOL",
+ "Headphone Jack", "HPOR",
+ "Int Spk", "SPOL",
+ "Int Spk", "SPOR",
+ "MIC1", "MIC Bias1",
+ "MIC Bias1", "Headset Mic",
+ "DMIC", "Int Mic";
+
+ nvidia,audio-codec = <&rt5631>;
+ };
};
&emc_icc_dvfs_opp_table {
diff --git a/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi b/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi
index 08ea9cb32d0e..42dae0f4759e 100644
--- a/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi
+++ b/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi
@@ -550,7 +550,7 @@ spi1_mosi_px4 {
nvidia,enable-input = <TEGRA_PIN_ENABLE>;
};
- spi2_cs1_n_pw2 {
+ hp_detect {
nvidia,pins = "spi2_cs1_n_pw2";
nvidia,function = "spi2";
nvidia,pull = <TEGRA_PIN_PULL_UP>;
@@ -558,10 +558,10 @@ spi2_cs1_n_pw2 {
nvidia,enable-input = <TEGRA_PIN_ENABLE>;
};
- spi2_sck_px2 {
+ mic_detect {
nvidia,pins = "spi2_sck_px2";
nvidia,function = "spi2";
- nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+ nvidia,pull = <TEGRA_PIN_PULL_UP>;
nvidia,tristate = <TEGRA_PIN_DISABLE>;
nvidia,enable-input = <TEGRA_PIN_ENABLE>;
};
@@ -1674,7 +1674,8 @@ sound {
nvidia,i2s-controller = <&tegra_i2s1>;
nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
- nvidia,hp-mute-gpios = <&gpio TEGRA_GPIO(X, 2) GPIO_ACTIVE_LOW>;
+ nvidia,mic-det-gpios = <&gpio TEGRA_GPIO(X, 2) GPIO_ACTIVE_LOW>;
+ nvidia,coupled-mic-hp-det;
clocks = <&tegra_car TEGRA30_CLK_PLL_A>,
<&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
diff --git a/arch/arm/boot/dts/tegra30-pegatron-chagall.dts b/arch/arm/boot/dts/tegra30-pegatron-chagall.dts
index d9408a90653a..6e24b095713b 100644
--- a/arch/arm/boot/dts/tegra30-pegatron-chagall.dts
+++ b/arch/arm/boot/dts/tegra30-pegatron-chagall.dts
@@ -2731,7 +2731,7 @@ sound {
"Int Spk", "RON",
"Int Spk", "LOP",
"Int Spk", "LON",
- "IN1R", "Mic Jack",
+ "IN1R", "Headset Mic",
"DMICDAT", "Int Mic";
nvidia,i2s-controller = <&tegra_i2s1>;
--
2.37.2
next prev parent reply other threads:[~2023-02-21 18:32 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-21 18:32 [PATCH v1 00/10] Fix sound on ASUS Transformers Svyatoslav Ryhel
2023-02-21 18:32 ` [PATCH v1 01/10] dt-bindings: sound: nvidia,tegra-audio-common: add new property Svyatoslav Ryhel
2023-02-26 19:35 ` Rob Herring
2023-02-21 18:32 ` [PATCH v1 02/10] sound: soc: jack: allow multiple interrupt per gpio Svyatoslav Ryhel
2023-02-21 22:08 ` Mark Brown
2023-02-22 7:53 ` Svyatoslav Ryhel
2023-02-22 12:16 ` Mark Brown
2023-02-21 18:32 ` [PATCH v1 03/10] dt-bindings: sound: nvidia,tegra-audio: add RT5631 CODEC Svyatoslav Ryhel
2023-02-26 19:37 ` Rob Herring
2023-02-28 8:15 ` Krzysztof Kozlowski
2023-02-21 18:32 ` [PATCH v1 04/10] ASoC: tegra: Support RT5631 by machine driver Svyatoslav Ryhel
2023-02-21 19:32 ` Dan Carpenter
2023-02-22 7:55 ` Svyatoslav Ryhel
2023-02-22 13:28 ` Dan Carpenter
2023-02-22 14:57 ` Mark Brown
2023-02-21 22:23 ` Mark Brown
2023-02-22 8:00 ` Svyatoslav Ryhel
2023-02-22 12:17 ` Mark Brown
2023-02-21 18:32 ` [PATCH v1 05/10] dt-bindings: sound: nvidia,tegra-audio: add MAX9808x CODEC Svyatoslav Ryhel
2023-02-26 19:38 ` Rob Herring
2023-02-21 18:32 ` [PATCH v1 06/10] ASoC: tegra: Support MAX9808x by machine driver Svyatoslav Ryhel
2023-02-21 18:32 ` Svyatoslav Ryhel [this message]
2023-02-21 22:26 ` [PATCH v1 07/10] ARM: tegra: transformers: update bindings of sound graph Mark Brown
2023-02-22 8:02 ` Svyatoslav Ryhel
2023-02-22 12:19 ` Mark Brown
2023-02-21 18:32 ` [PATCH v1 08/10] dt-bindings: dsp: add Fortemedia FM34 DSP Svyatoslav Ryhel
2023-02-26 19:42 ` Rob Herring
2023-02-21 18:32 ` [PATCH v1 09/10] staging: dsp: add support for Fortemedia FM34NE DSP Svyatoslav Ryhel
2023-02-21 19:27 ` Greg Kroah-Hartman
2023-02-22 8:19 ` Svyatoslav Ryhel
2023-02-22 9:21 ` Greg Kroah-Hartman
2023-02-22 9:39 ` Святослав Ригель
2023-02-22 11:15 ` Greg Kroah-Hartman
2023-02-22 12:19 ` Mark Brown
2023-02-21 19:39 ` Dan Carpenter
2023-02-22 8:06 ` Svyatoslav Ryhel
2023-02-22 13:31 ` Dan Carpenter
2023-02-21 22:41 ` Mark Brown
2023-02-22 8:14 ` Svyatoslav Ryhel
2023-02-22 12:36 ` Mark Brown
2023-02-21 18:32 ` [PATCH v1 10/10] ARM: tegra: transformers: bind FM34NE DSP on supported devices Svyatoslav Ryhel
2023-03-06 13:31 ` (subset) [PATCH v1 00/10] Fix sound on ASUS Transformers Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230221183211.21964-8-clamor95@gmail.com \
--to=clamor95@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=digetx@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jonathanh@nvidia.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=linux-tegra@vger.kernel.org \
--cc=maxim.schwalm@gmail.com \
--cc=perex@perex.cz \
--cc=robh+dt@kernel.org \
--cc=thierry.reding@gmail.com \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®