mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-08 14:02:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'tegra-for-6.4-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/dt

Browse Source 
ARM: tegra: Device tree changes for v6.4-rc1

There are several fixes and cleanups here for some of the older Tegra
consumer devices.

* tag 'tegra-for-6.4-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra30: Use cpu* labels
  ARM: tegra30: peripherals: Add 266.5MHz nodes
  ARM: tegra: asus-tf101: Fix accelerometer mount matrix
  ARM: tegra: transformers: Bind RT5631 sound nodes
  ARM: tegra: transformers: Update WM8903 sound nodes

Link: https://lore.kernel.org/r/20230406124804.970394-5-thierry.reding@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2023-04-14 15:21:05 +02:00
parent 065b3ec77f 13a53ebc22
commit 31e985a2c4
8 changed files with 89 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
arch/arm/boot/dts/tegra20-asus-tf101.dts
View File

@@ -520,10 +520,10 @@ wm8903: audio-codec@1a {
micdet-delay = <100>;
gpio-cfg = <
0xffffffff /* don't touch */
0xffffffff /* don't touch */
0x00000600 /* DMIC_LR, output */
0x00000680 /* DMIC_DAT, input */
0x00000000 /* Speaker-enable GPIO, output, low */
0x00000400 /* Mic bias current detect */
0xffffffff /* don't touch */
0xffffffff /* don't touch */
>;
@@ -577,9 +577,9 @@ accelerometer@f {
vdd-supply = <&vdd_1v8_sys>;
vddio-supply = <&vdd_1v8_sys>;
mount-matrix = "1", "0", "0",
"0", "1", "0",
"0", "0", "1";
mount-matrix = "-1", "0", "0",
"0", "-1", "0",
"0", "0", "-1";
};
};
};
@@ -1184,15 +1184,16 @@ sound {
"Int Spk", "RON",
"Int Spk", "LOP",
"Int Spk", "LON",
"Mic Jack", "MICBIAS",
"IN1L", "Mic Jack";
"IN2L", "Mic Jack",
"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_LOW>;
nvidia,coupled-mic-hp-det;
clocks = <&tegra_car TEGRA20_CLK_PLL_A>,
<&tegra_car TEGRA20_CLK_PLL_A_OUT0>,

17
arch/arm/boot/dts/tegra30-asus-tf201.dts
View File

@@ -624,4 +624,21 @@ opp-table-emc {
/delete-node/ opp-800000000-1300;
/delete-node/ opp-900000000-1350;
};
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", "Mic Jack",
"DMIC", "Int Mic";
nvidia,audio-codec = <&rt5631>;
};
};

6
arch/arm/boot/dts/tegra30-asus-tf300t.dts
View File

@@ -128,8 +128,8 @@ wm8903: audio-codec@1a {
micdet-delay = <100>;
gpio-cfg = <
0xffffffff /* don't touch */
0xffffffff /* don't touch */
0x00000600 /* DMIC_LR, output */
0x00000680 /* DMIC_DAT, input */
0x00000000 /* Speaker-enable GPIO, output, low */
0xffffffff /* don't touch */
0xffffffff /* don't touch */
@@ -1023,12 +1023,10 @@ sound {
"Int Spk", "RON",
"Int Spk", "LOP",
"Int Spk", "LON",
"IN1L", "Mic Jack",
"IN2L", "Mic Jack",
"DMICDAT", "Int Mic";
nvidia,audio-codec = <&wm8903>;
nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
nvidia,headset;
};
};

17
arch/arm/boot/dts/tegra30-asus-tf300tg.dts
View File

@@ -1084,4 +1084,21 @@ opp-table-actmon {
/delete-node/ opp-800000000;
/delete-node/ opp-900000000;
};
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", "Mic Jack",
"DMIC", "Int Mic";
nvidia,audio-codec = <&rt5631>;
};
};

17
arch/arm/boot/dts/tegra30-asus-tf700t.dts
View File

@@ -820,4 +820,21 @@ 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", "Mic Jack",
"DMIC", "Int Mic";
nvidia,audio-codec = <&rt5631>;
};
};

9
arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi
View File

@@ -558,7 +558,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>;
@@ -566,10 +566,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>,

20
arch/arm/boot/dts/tegra30-peripherals-opp.dtsi
View File

@@ -210,6 +210,20 @@ opp-204000000-1250 {
opp-suspend;
};
opp-266500000-1000 {
opp-microvolt = <1000000 1000000 1350000>;
opp-hz = /bits/ 64 <266500000>;
opp-supported-hw = <0x0007>;
required-opps = <&core_opp_1000>;
};
opp-266500000-1250 {
opp-microvolt = <1250000 1250000 1350000>;
opp-hz = /bits/ 64 <266500000>;
opp-supported-hw = <0x0008>;
required-opps = <&core_opp_1250>;
};
opp-333500000-1000 {
opp-microvolt = <1000000 1000000 1350000>;
opp-hz = /bits/ 64 <333500000>;
@@ -424,6 +438,12 @@ opp-204000000 {
opp-suspend;
};
opp-266500000 {
opp-hz = /bits/ 64 <266500000>;
opp-supported-hw = <0x000F>;
opp-peak-kBps = <2132000>;
};
opp-333500000 {
opp-hz = /bits/ 64 <333500000>;
opp-supported-hw = <0x000F>;

5
arch/arm/boot/dts/tegra30.dtsi
View File

@@ -1283,10 +1283,7 @@ pmu {
<GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
interrupt-affinity = <&{/cpus/cpu@0}>,
<&{/cpus/cpu@1}>,
<&{/cpus/cpu@2}>,
<&{/cpus/cpu@3}>;
interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
};
thermal-zones {