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

Merge tag 'v6.19-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes

In terms of bigger fixes, RK3576 GPU register range was overflowing into
the next peripheral, Nano Pi M5 sound was not working correctly, the
adc-keys voltage levels for 2 buttons on the Pinephone Pro were wrong
and a really wrong PCIe linkspeed was removed from helios64.

Apart from that there are a number of dt-cleanlieness fixes.

* tag 'v6.19-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
arm64: dts: rockchip: Drop unsupported properties
arm64: dts: rockchip: Fix gpio pinctrl node names
arm64: dts: rockchip: Fix pinctrl property typo on rk3326-odroid-go3
arm64: dts: rockchip: Drop "sitronix,st7789v" fallback compatible from rk3568-wolfvision
arm64: dts: rockchip: Fix wrong register range of rk3576 gpu
arm64: dts: rockchip: Configure MCLK for analog sound on NanoPi M5
arm64: dts: rockchip: Fix headphones widget name on NanoPi M5
arm64: dts: rockchip: remove redundant max-link-speed from nanopi-r4s
arm64: dts: rockchip: remove dangerous max-link-speed from helios64
arm64: dts: rockchip: fix unit-address for RK3588 NPU's core1 and core2's IOMMU
arm64: dts: rockchip: Fix wifi interrupts flag on Sakura Pi RK3308B
arm64: dts: rockchip: Fix voltage threshold for volume keys for Pinephone Pro

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 4ead53ba 1902e2ea

+20 -20
+1 -1
arch/arm64/boot/dts/rockchip/rk3308-sakurapi-rk3308b.dts
··· 199 199 compatible = "brcm,bcm43455-fmac", "brcm,bcm4329-fmac"; 200 200 reg = <1>; 201 201 interrupt-parent = <&gpio0>; 202 - interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>; 202 + interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>; 203 203 interrupt-names = "host-wake"; 204 204 pinctrl-names = "default"; 205 205 pinctrl-0 = <&wifi_host_wake>;
+2 -1
arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts
··· 14 14 15 15 joystick_mux_controller: mux-controller { 16 16 compatible = "gpio-mux"; 17 - pinctrl = <&mux_en_pins>; 17 + pinctrl-0 = <&mux_en_pins>; 18 + pinctrl-names = "default"; 18 19 #mux-control-cells = <0>; 19 20 20 21 mux-gpios = <&gpio3 RK_PB3 GPIO_ACTIVE_LOW>,
-2
arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
··· 424 424 425 425 &pcie0 { 426 426 ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; 427 - max-link-speed = <2>; 428 427 num-lanes = <2>; 429 - pinctrl-names = "default"; 430 428 status = "okay"; 431 429 432 430 vpcie12v-supply = <&vcc12v_dcin>;
-1
arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
··· 71 71 }; 72 72 73 73 &pcie0 { 74 - max-link-speed = <1>; 75 74 num-lanes = <1>; 76 75 vpcie3v3-supply = <&vcc3v3_sys>; 77 76 };
-1
arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
··· 969 969 }; 970 970 971 971 &spi1 { 972 - max-freq = <10000000>; 973 972 status = "okay"; 974 973 975 974 spiflash: flash@0 {
+2 -2
arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
··· 40 40 button-up { 41 41 label = "Volume Up"; 42 42 linux,code = <KEY_VOLUMEUP>; 43 - press-threshold-microvolt = <100000>; 43 + press-threshold-microvolt = <2000>; 44 44 }; 45 45 46 46 button-down { 47 47 label = "Volume Down"; 48 48 linux,code = <KEY_VOLUMEDOWN>; 49 - press-threshold-microvolt = <600000>; 49 + press-threshold-microvolt = <300000>; 50 50 }; 51 51 }; 52 52
+1 -1
arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
··· 483 483 pinctrl-names = "default"; 484 484 pinctrl-0 = <&q7_thermal_pin &bios_disable_override_hog_pin>; 485 485 486 - gpios { 486 + gpio-pins { 487 487 bios_disable_override_hog_pin: bios-disable-override-hog-pin { 488 488 rockchip,pins = 489 489 <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>;
+2 -2
arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
··· 529 529 rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; 530 530 }; 531 531 532 - vsel1_gpio: vsel1-gpio { 532 + vsel1_gpio: vsel1-gpio-pin { 533 533 rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>; 534 534 }; 535 535 536 - vsel2_gpio: vsel2-gpio { 536 + vsel2_gpio: vsel2-gpio-pin { 537 537 rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>; 538 538 }; 539 539 };
+1 -2
arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-display-vz.dtso
··· 11 11 #include "rk3568-wolfvision-pf5-display.dtsi" 12 12 13 13 &st7789 { 14 - compatible = "jasonic,jt240mhqs-hwt-ek-e3", 15 - "sitronix,st7789v"; 14 + compatible = "jasonic,jt240mhqs-hwt-ek-e3"; 16 15 rotation = <270>; 17 16 };
+8 -4
arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts
··· 201 201 pinctrl-names = "default"; 202 202 pinctrl-0 = <&hp_det_l>; 203 203 204 + simple-audio-card,bitclock-master = <&masterdai>; 204 205 simple-audio-card,format = "i2s"; 205 206 simple-audio-card,hp-det-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_LOW>; 206 207 simple-audio-card,mclk-fs = <256>; ··· 212 211 "Headphones", "HPOR", 213 212 "IN1P", "Microphone Jack"; 214 213 simple-audio-card,widgets = 215 - "Headphone", "Headphone Jack", 214 + "Headphone", "Headphones", 216 215 "Microphone", "Microphone Jack"; 217 216 218 217 simple-audio-card,codec { 219 218 sound-dai = <&rt5616>; 220 219 }; 221 220 222 - simple-audio-card,cpu { 221 + masterdai: simple-audio-card,cpu { 223 222 sound-dai = <&sai2>; 223 + system-clock-frequency = <12288000>; 224 224 }; 225 225 }; 226 226 }; ··· 729 727 rt5616: audio-codec@1b { 730 728 compatible = "realtek,rt5616"; 731 729 reg = <0x1b>; 732 - assigned-clocks = <&cru CLK_SAI2_MCLKOUT>; 730 + assigned-clocks = <&cru CLK_SAI2_MCLKOUT_TO_IO>; 733 731 assigned-clock-rates = <12288000>; 734 - clocks = <&cru CLK_SAI2_MCLKOUT>; 732 + clocks = <&cru CLK_SAI2_MCLKOUT_TO_IO>; 735 733 clock-names = "mclk"; 734 + pinctrl-0 = <&sai2m0_mclk>; 735 + pinctrl-names = "default"; 736 736 #sound-dai-cells = <0>; 737 737 }; 738 738 };
+1 -1
arch/arm64/boot/dts/rockchip/rk3576.dtsi
··· 1261 1261 1262 1262 gpu: gpu@27800000 { 1263 1263 compatible = "rockchip,rk3576-mali", "arm,mali-bifrost"; 1264 - reg = <0x0 0x27800000 0x0 0x200000>; 1264 + reg = <0x0 0x27800000 0x0 0x20000>; 1265 1265 assigned-clocks = <&scmi_clk SCMI_CLK_GPU>; 1266 1266 assigned-clock-rates = <198000000>; 1267 1267 clocks = <&cru CLK_GPU>;
+2 -2
arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
··· 1200 1200 status = "disabled"; 1201 1201 }; 1202 1202 1203 - rknn_mmu_1: iommu@fdac9000 { 1203 + rknn_mmu_1: iommu@fdaca000 { 1204 1204 compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu"; 1205 1205 reg = <0x0 0xfdaca000 0x0 0x100>; 1206 1206 interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH 0>; ··· 1230 1230 status = "disabled"; 1231 1231 }; 1232 1232 1233 - rknn_mmu_2: iommu@fdad9000 { 1233 + rknn_mmu_2: iommu@fdada000 { 1234 1234 compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu"; 1235 1235 reg = <0x0 0xfdada000 0x0 0x100>; 1236 1236 interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH 0>;