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

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

Fixes to adapt to correct binding behaviour and fixes for devices on some boards

Most notably may be the adaption of lower thermal limits for the pinephone
pro, where the original hiher ones could result in (possibly permanent)
display issues.

* tag 'v6.2-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
arm64: dts: rockchip: align rk3399 DMC OPP table with bindings
arm64: dts: rockchip: set sdmmc0 speed to sd-uhs-sdr50 on rock-3a
arm64: dts: rockchip: fix probe of analog sound card on rock-3a
arm64: dts: rockchip: add missing #interrupt-cells to rk356x pcie2x1
arm64: dts: rockchip: fix input enable pinconf on rk3399
ARM: dts: rockchip: add power-domains property to dp node on rk3288
arm64: dts: rockchip: add io domain setting to rk3566-box-demo
arm64: dts: rockchip: remove unsupported property from sdmmc2 for rock-3a
arm64: dts: rockchip: drop unused LED mode property from rk3328-roc-cc
arm64: dts: rockchip: reduce thermal limits on rk3399-pinephone-pro
arm64: dts: rockchip: use correct reset names for rk3399 crypto nodes

Link: https://lore.kernel.org/r/3514663.mvXUDI8C0e@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+26 -9
+1
arch/arm/boot/dts/rk3288.dtsi
··· 1181 1181 clock-names = "dp", "pclk"; 1182 1182 phys = <&edp_phy>; 1183 1183 phy-names = "dp"; 1184 + power-domains = <&power RK3288_PD_VIO>; 1184 1185 resets = <&cru SRST_EDP>; 1185 1186 reset-names = "dp"; 1186 1187 rockchip,grf = <&grf>;
-2
arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
··· 96 96 linux,default-trigger = "heartbeat"; 97 97 gpios = <&rk805 1 GPIO_ACTIVE_LOW>; 98 98 default-state = "on"; 99 - mode = <0x23>; 100 99 }; 101 100 102 101 user_led: led-1 { ··· 103 104 linux,default-trigger = "mmc1"; 104 105 gpios = <&rk805 0 GPIO_ACTIVE_LOW>; 105 106 default-state = "off"; 106 - mode = <0x05>; 107 107 }; 108 108 }; 109 109 };
+1 -1
arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi
··· 111 111 }; 112 112 }; 113 113 114 - dmc_opp_table: dmc_opp_table { 114 + dmc_opp_table: opp-table-3 { 115 115 compatible = "operating-points-v2"; 116 116 117 117 opp00 {
+7
arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
··· 104 104 }; 105 105 }; 106 106 107 + &cpu_alert0 { 108 + temperature = <65000>; 109 + }; 110 + &cpu_alert1 { 111 + temperature = <68000>; 112 + }; 113 + 107 114 &cpu_l0 { 108 115 cpu-supply = <&vdd_cpu_l>; 109 116 };
+2 -4
arch/arm64/boot/dts/rockchip/rk3399.dtsi
··· 589 589 clocks = <&cru HCLK_M_CRYPTO0>, <&cru HCLK_S_CRYPTO0>, <&cru SCLK_CRYPTO0>; 590 590 clock-names = "hclk_master", "hclk_slave", "sclk"; 591 591 resets = <&cru SRST_CRYPTO0>, <&cru SRST_CRYPTO0_S>, <&cru SRST_CRYPTO0_M>; 592 - reset-names = "master", "lave", "crypto"; 592 + reset-names = "master", "slave", "crypto-rst"; 593 593 }; 594 594 595 595 crypto1: crypto@ff8b8000 { ··· 599 599 clocks = <&cru HCLK_M_CRYPTO1>, <&cru HCLK_S_CRYPTO1>, <&cru SCLK_CRYPTO1>; 600 600 clock-names = "hclk_master", "hclk_slave", "sclk"; 601 601 resets = <&cru SRST_CRYPTO1>, <&cru SRST_CRYPTO1_S>, <&cru SRST_CRYPTO1_M>; 602 - reset-names = "master", "slave", "crypto"; 602 + reset-names = "master", "slave", "crypto-rst"; 603 603 }; 604 604 605 605 i2c1: i2c@ff110000 { ··· 2241 2241 pcfg_input_pull_up: pcfg-input-pull-up { 2242 2242 input-enable; 2243 2243 bias-pull-up; 2244 - drive-strength = <2>; 2245 2244 }; 2246 2245 2247 2246 pcfg_input_pull_down: pcfg-input-pull-down { 2248 2247 input-enable; 2249 2248 bias-pull-down; 2250 - drive-strength = <2>; 2251 2249 }; 2252 2250 2253 2251 clock {
+11
arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
··· 353 353 }; 354 354 }; 355 355 356 + &pmu_io_domains { 357 + pmuio2-supply = <&vcc_3v3>; 358 + vccio1-supply = <&vcc_3v3>; 359 + vccio3-supply = <&vcc_3v3>; 360 + vccio4-supply = <&vcca_1v8>; 361 + vccio5-supply = <&vcc_3v3>; 362 + vccio6-supply = <&vcca_1v8>; 363 + vccio7-supply = <&vcc_3v3>; 364 + status = "okay"; 365 + }; 366 + 356 367 &pwm0 { 357 368 status = "okay"; 358 369 };
+3 -2
arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
··· 571 571 }; 572 572 573 573 &i2s1_8ch { 574 + pinctrl-names = "default"; 575 + pinctrl-0 = <&i2s1m0_sclktx &i2s1m0_lrcktx &i2s1m0_sdi0 &i2s1m0_sdo0>; 574 576 rockchip,trcm-sync-tx-only; 575 577 status = "okay"; 576 578 }; ··· 732 730 disable-wp; 733 731 pinctrl-names = "default"; 734 732 pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>; 735 - sd-uhs-sdr104; 733 + sd-uhs-sdr50; 736 734 vmmc-supply = <&vcc3v3_sd>; 737 735 vqmmc-supply = <&vccio_sd>; 738 736 status = "okay"; 739 737 }; 740 738 741 739 &sdmmc2 { 742 - supports-sdio; 743 740 bus-width = <4>; 744 741 disable-wp; 745 742 cap-sd-highspeed;
+1
arch/arm64/boot/dts/rockchip/rk356x.dtsi
··· 966 966 clock-names = "aclk_mst", "aclk_slv", 967 967 "aclk_dbi", "pclk", "aux"; 968 968 device_type = "pci"; 969 + #interrupt-cells = <1>; 969 970 interrupt-map-mask = <0 0 0 7>; 970 971 interrupt-map = <0 0 0 1 &pcie_intc 0>, 971 972 <0 0 0 2 &pcie_intc 1>,