Skip to content

Commit 31e985a

Browse files
arndbarndb
committed
Merge tag 'tegra-for-6.4-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/dt
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>
2 parents 065b3ec + 13a53eb commit 31e985a

8 files changed

Lines changed: 89 additions & 21 deletions

‎arch/arm/boot/dts/tegra20-asus-tf101.dts‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -520,10 +520,10 @@
520520
micdet-delay = <100>;
521521

522522
gpio-cfg = <
523-
0xffffffff /* don't touch */
524-
0xffffffff /* don't touch */
523+
0x00000600 /* DMIC_LR, output */
524+
0x00000680 /* DMIC_DAT, input */
525525
0x00000000 /* Speaker-enable GPIO, output, low */
526-
0x00000400 /* Mic bias current detect */
526+
0xffffffff /* don't touch */
527527
0xffffffff /* don't touch */
528528
>;
529529

@@ -577,9 +577,9 @@
577577
vdd-supply = <&vdd_1v8_sys>;
578578
vddio-supply = <&vdd_1v8_sys>;
579579

580-
mount-matrix = "1", "0", "0",
581-
"0", "1", "0",
582-
"0", "0", "1";
580+
mount-matrix = "-1", "0", "0",
581+
"0", "-1", "0",
582+
"0", "0", "-1";
583583
};
584584
};
585585
};
@@ -1184,15 +1184,16 @@
11841184
"Int Spk", "RON",
11851185
"Int Spk", "LOP",
11861186
"Int Spk", "LON",
1187-
"Mic Jack", "MICBIAS",
1188-
"IN1L", "Mic Jack";
1187+
"IN2L", "Mic Jack",
1188+
"DMICDAT", "Int Mic";
11891189

11901190
nvidia,i2s-controller = <&tegra_i2s1>;
11911191
nvidia,audio-codec = <&wm8903>;
11921192

11931193
nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
11941194
nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
1195-
nvidia,headset;
1195+
nvidia,mic-det-gpios = <&gpio TEGRA_GPIO(X, 1) GPIO_ACTIVE_LOW>;
1196+
nvidia,coupled-mic-hp-det;
11961197

11971198
clocks = <&tegra_car TEGRA20_CLK_PLL_A>,
11981199
<&tegra_car TEGRA20_CLK_PLL_A_OUT0>,

‎arch/arm/boot/dts/tegra30-asus-tf201.dts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,4 +624,21 @@
624624
/delete-node/ opp-800000000-1300;
625625
/delete-node/ opp-900000000-1350;
626626
};
627+
628+
sound {
629+
compatible = "asus,tegra-audio-rt5631-tf201",
630+
"nvidia,tegra-audio-rt5631";
631+
nvidia,model = "Asus Transformer Prime TF201 RT5631";
632+
633+
nvidia,audio-routing =
634+
"Headphone Jack", "HPOL",
635+
"Headphone Jack", "HPOR",
636+
"Int Spk", "SPOL",
637+
"Int Spk", "SPOR",
638+
"MIC1", "MIC Bias1",
639+
"MIC Bias1", "Mic Jack",
640+
"DMIC", "Int Mic";
641+
642+
nvidia,audio-codec = <&rt5631>;
643+
};
627644
};

‎arch/arm/boot/dts/tegra30-asus-tf300t.dts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@
128128
micdet-delay = <100>;
129129

130130
gpio-cfg = <
131-
0xffffffff /* don't touch */
132-
0xffffffff /* don't touch */
131+
0x00000600 /* DMIC_LR, output */
132+
0x00000680 /* DMIC_DAT, input */
133133
0x00000000 /* Speaker-enable GPIO, output, low */
134134
0xffffffff /* don't touch */
135135
0xffffffff /* don't touch */
@@ -1023,12 +1023,10 @@
10231023
"Int Spk", "RON",
10241024
"Int Spk", "LOP",
10251025
"Int Spk", "LON",
1026-
"IN1L", "Mic Jack",
10271026
"IN2L", "Mic Jack",
10281027
"DMICDAT", "Int Mic";
10291028

10301029
nvidia,audio-codec = <&wm8903>;
10311030
nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
1032-
nvidia,headset;
10331031
};
10341032
};

‎arch/arm/boot/dts/tegra30-asus-tf300tg.dts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,4 +1084,21 @@
10841084
/delete-node/ opp-800000000;
10851085
/delete-node/ opp-900000000;
10861086
};
1087+
1088+
sound {
1089+
compatible = "asus,tegra-audio-rt5631-tf300tg",
1090+
"nvidia,tegra-audio-rt5631";
1091+
nvidia,model = "Asus Transformer Pad TF300TG RT5631";
1092+
1093+
nvidia,audio-routing =
1094+
"Headphone Jack", "HPOL",
1095+
"Headphone Jack", "HPOR",
1096+
"Int Spk", "SPOL",
1097+
"Int Spk", "SPOR",
1098+
"MIC1", "MIC Bias1",
1099+
"MIC Bias1", "Mic Jack",
1100+
"DMIC", "Int Mic";
1101+
1102+
nvidia,audio-codec = <&rt5631>;
1103+
};
10871104
};

‎arch/arm/boot/dts/tegra30-asus-tf700t.dts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -820,4 +820,21 @@
820820
enable-active-high;
821821
vin-supply = <&vdd_3v3_sys>;
822822
};
823+
824+
sound {
825+
compatible = "asus,tegra-audio-rt5631-tf700t",
826+
"nvidia,tegra-audio-rt5631";
827+
nvidia,model = "Asus Transformer Infinity TF700T RT5631";
828+
829+
nvidia,audio-routing =
830+
"Headphone Jack", "HPOL",
831+
"Headphone Jack", "HPOR",
832+
"Int Spk", "SPOL",
833+
"Int Spk", "SPOR",
834+
"MIC1", "MIC Bias1",
835+
"MIC Bias1", "Mic Jack",
836+
"DMIC", "Int Mic";
837+
838+
nvidia,audio-codec = <&rt5631>;
839+
};
823840
};

‎arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -558,18 +558,18 @@
558558
nvidia,enable-input = <TEGRA_PIN_ENABLE>;
559559
};
560560

561-
spi2_cs1_n_pw2 {
561+
hp_detect {
562562
nvidia,pins = "spi2_cs1_n_pw2";
563563
nvidia,function = "spi2";
564564
nvidia,pull = <TEGRA_PIN_PULL_UP>;
565565
nvidia,tristate = <TEGRA_PIN_DISABLE>;
566566
nvidia,enable-input = <TEGRA_PIN_ENABLE>;
567567
};
568568

569-
spi2_sck_px2 {
569+
mic_detect {
570570
nvidia,pins = "spi2_sck_px2";
571571
nvidia,function = "spi2";
572-
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
572+
nvidia,pull = <TEGRA_PIN_PULL_UP>;
573573
nvidia,tristate = <TEGRA_PIN_DISABLE>;
574574
nvidia,enable-input = <TEGRA_PIN_ENABLE>;
575575
};
@@ -1674,7 +1674,8 @@
16741674
nvidia,i2s-controller = <&tegra_i2s1>;
16751675

16761676
nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
1677-
nvidia,hp-mute-gpios = <&gpio TEGRA_GPIO(X, 2) GPIO_ACTIVE_LOW>;
1677+
nvidia,mic-det-gpios = <&gpio TEGRA_GPIO(X, 2) GPIO_ACTIVE_LOW>;
1678+
nvidia,coupled-mic-hp-det;
16781679

16791680
clocks = <&tegra_car TEGRA30_CLK_PLL_A>,
16801681
<&tegra_car TEGRA30_CLK_PLL_A_OUT0>,

‎arch/arm/boot/dts/tegra30-peripherals-opp.dtsi‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,20 @@
210210
opp-suspend;
211211
};
212212

213+
opp-266500000-1000 {
214+
opp-microvolt = <1000000 1000000 1350000>;
215+
opp-hz = /bits/ 64 <266500000>;
216+
opp-supported-hw = <0x0007>;
217+
required-opps = <&core_opp_1000>;
218+
};
219+
220+
opp-266500000-1250 {
221+
opp-microvolt = <1250000 1250000 1350000>;
222+
opp-hz = /bits/ 64 <266500000>;
223+
opp-supported-hw = <0x0008>;
224+
required-opps = <&core_opp_1250>;
225+
};
226+
213227
opp-333500000-1000 {
214228
opp-microvolt = <1000000 1000000 1350000>;
215229
opp-hz = /bits/ 64 <333500000>;
@@ -424,6 +438,12 @@
424438
opp-suspend;
425439
};
426440

441+
opp-266500000 {
442+
opp-hz = /bits/ 64 <266500000>;
443+
opp-supported-hw = <0x000F>;
444+
opp-peak-kBps = <2132000>;
445+
};
446+
427447
opp-333500000 {
428448
opp-hz = /bits/ 64 <333500000>;
429449
opp-supported-hw = <0x000F>;

‎arch/arm/boot/dts/tegra30.dtsi‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,10 +1283,7 @@
12831283
<GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,
12841284
<GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>,
12851285
<GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
1286-
interrupt-affinity = <&{/cpus/cpu@0}>,
1287-
<&{/cpus/cpu@1}>,
1288-
<&{/cpus/cpu@2}>,
1289-
<&{/cpus/cpu@3}>;
1286+
interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
12901287
};
12911288

12921289
thermal-zones {

0 commit comments

Comments
 (0)