Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+89 -21
+10 -9
arch/arm/boot/dts/tegra20-asus-tf101.dts
··· 520 520 micdet-delay = <100>; 521 521 522 522 gpio-cfg = < 523 - 0xffffffff /* don't touch */ 524 - 0xffffffff /* don't touch */ 523 + 0x00000600 /* DMIC_LR, output */ 524 + 0x00000680 /* DMIC_DAT, input */ 525 525 0x00000000 /* Speaker-enable GPIO, output, low */ 526 - 0x00000400 /* Mic bias current detect */ 526 + 0xffffffff /* don't touch */ 527 527 0xffffffff /* don't touch */ 528 528 >; 529 529 ··· 577 577 vdd-supply = <&vdd_1v8_sys>; 578 578 vddio-supply = <&vdd_1v8_sys>; 579 579 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"; 583 583 }; 584 584 }; 585 585 }; ··· 1184 1184 "Int Spk", "RON", 1185 1185 "Int Spk", "LOP", 1186 1186 "Int Spk", "LON", 1187 - "Mic Jack", "MICBIAS", 1188 - "IN1L", "Mic Jack"; 1187 + "IN2L", "Mic Jack", 1188 + "DMICDAT", "Int Mic"; 1189 1189 1190 1190 nvidia,i2s-controller = <&tegra_i2s1>; 1191 1191 nvidia,audio-codec = <&wm8903>; 1192 1192 1193 1193 nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>; 1194 1194 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; 1196 1197 1197 1198 clocks = <&tegra_car TEGRA20_CLK_PLL_A>, 1198 1199 <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
+17
arch/arm/boot/dts/tegra30-asus-tf201.dts
··· 624 624 /delete-node/ opp-800000000-1300; 625 625 /delete-node/ opp-900000000-1350; 626 626 }; 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 + }; 627 644 };
+2 -4
arch/arm/boot/dts/tegra30-asus-tf300t.dts
··· 128 128 micdet-delay = <100>; 129 129 130 130 gpio-cfg = < 131 - 0xffffffff /* don't touch */ 132 - 0xffffffff /* don't touch */ 131 + 0x00000600 /* DMIC_LR, output */ 132 + 0x00000680 /* DMIC_DAT, input */ 133 133 0x00000000 /* Speaker-enable GPIO, output, low */ 134 134 0xffffffff /* don't touch */ 135 135 0xffffffff /* don't touch */ ··· 1023 1023 "Int Spk", "RON", 1024 1024 "Int Spk", "LOP", 1025 1025 "Int Spk", "LON", 1026 - "IN1L", "Mic Jack", 1027 1026 "IN2L", "Mic Jack", 1028 1027 "DMICDAT", "Int Mic"; 1029 1028 1030 1029 nvidia,audio-codec = <&wm8903>; 1031 1030 nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>; 1032 - nvidia,headset; 1033 1031 }; 1034 1032 };
+17
arch/arm/boot/dts/tegra30-asus-tf300tg.dts
··· 1084 1084 /delete-node/ opp-800000000; 1085 1085 /delete-node/ opp-900000000; 1086 1086 }; 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 + }; 1087 1104 };
+17
arch/arm/boot/dts/tegra30-asus-tf700t.dts
··· 820 820 enable-active-high; 821 821 vin-supply = <&vdd_3v3_sys>; 822 822 }; 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 + }; 823 840 };
+5 -4
arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi
··· 558 558 nvidia,enable-input = <TEGRA_PIN_ENABLE>; 559 559 }; 560 560 561 - spi2_cs1_n_pw2 { 561 + hp_detect { 562 562 nvidia,pins = "spi2_cs1_n_pw2"; 563 563 nvidia,function = "spi2"; 564 564 nvidia,pull = <TEGRA_PIN_PULL_UP>; ··· 566 566 nvidia,enable-input = <TEGRA_PIN_ENABLE>; 567 567 }; 568 568 569 - spi2_sck_px2 { 569 + mic_detect { 570 570 nvidia,pins = "spi2_sck_px2"; 571 571 nvidia,function = "spi2"; 572 - nvidia,pull = <TEGRA_PIN_PULL_NONE>; 572 + nvidia,pull = <TEGRA_PIN_PULL_UP>; 573 573 nvidia,tristate = <TEGRA_PIN_DISABLE>; 574 574 nvidia,enable-input = <TEGRA_PIN_ENABLE>; 575 575 }; ··· 1674 1674 nvidia,i2s-controller = <&tegra_i2s1>; 1675 1675 1676 1676 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; 1678 1679 1679 1680 clocks = <&tegra_car TEGRA30_CLK_PLL_A>, 1680 1681 <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
+20
arch/arm/boot/dts/tegra30-peripherals-opp.dtsi
··· 210 210 opp-suspend; 211 211 }; 212 212 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 + 213 227 opp-333500000-1000 { 214 228 opp-microvolt = <1000000 1000000 1350000>; 215 229 opp-hz = /bits/ 64 <333500000>; ··· 436 422 opp-supported-hw = <0x000F>; 437 423 opp-peak-kBps = <1632000>; 438 424 opp-suspend; 425 + }; 426 + 427 + opp-266500000 { 428 + opp-hz = /bits/ 64 <266500000>; 429 + opp-supported-hw = <0x000F>; 430 + opp-peak-kBps = <2132000>; 439 431 }; 440 432 441 433 opp-333500000 {
+1 -4
arch/arm/boot/dts/tegra30.dtsi
··· 1283 1283 <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>, 1284 1284 <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>, 1285 1285 <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>; 1290 1287 }; 1291 1288 1292 1289 thermal-zones {