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

Merge tag 'v6.16-rockchip-dts32-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt

Graphics support for the old rk3066-marsboard (hdmi + Mali400 gpu),
rk3036 improvements (mmc asliases, hdmi refclk), dropping of
redundant clock-latency props.

* tag 'v6.16-rockchip-dts32-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: rockchip: enable Mali gpu on rk3066 marsboard
ARM: dts: rockchip: enable hdmi on rk3066 marsboard
Revert "ARM: dts: rockchip: drop grf reference from rk3036 hdmi"
ARM: dts: rockchip: Add ref clk for hdmi
ARM: dts: rockchip: Drop redundant CPU "clock-latency"
ARM: dts: rockchip: Add aliases for rk3036-kylin MMC devices

Link: https://lore.kernel.org/r/22686731.EfDdHjke4D@diego
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+54 -10
+6
arch/arm/boot/dts/rockchip/rk3036-kylin.dts
··· 8 8 model = "Rockchip RK3036 KylinBoard"; 9 9 compatible = "rockchip,rk3036-kylin", "rockchip,rk3036"; 10 10 11 + aliases { 12 + mmc0 = &emmc; 13 + mmc1 = &sdmmc; 14 + mmc2 = &sdio; 15 + }; 16 + 11 17 chosen { 12 18 stdout-path = "serial2:115200n8"; 13 19 };
+3 -2
arch/arm/boot/dts/rockchip/rk3036.dtsi
··· 398 398 compatible = "rockchip,rk3036-inno-hdmi"; 399 399 reg = <0x20034000 0x4000>; 400 400 interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; 401 - clocks = <&cru PCLK_HDMI>; 402 - clock-names = "pclk"; 401 + clocks = <&cru PCLK_HDMI>, <&cru SCLK_LCDC>; 402 + clock-names = "pclk", "ref"; 403 + rockchip,grf = <&grf>; 403 404 pinctrl-names = "default"; 404 405 pinctrl-0 = <&hdmi_ctl>; 405 406 #sound-dai-cells = <0>;
+37
arch/arm/boot/dts/rockchip/rk3066a-marsboard.dts
··· 19 19 reg = <0x60000000 0x40000000>; 20 20 }; 21 21 22 + hdmi_con { 23 + compatible = "hdmi-connector"; 24 + type = "a"; 25 + 26 + port { 27 + hdmi_con_in: endpoint { 28 + remote-endpoint = <&hdmi_out_con>; 29 + }; 30 + }; 31 + }; 32 + 22 33 vdd_log: regulator-vdd-log { 23 34 compatible = "pwm-regulator"; 24 35 pwms = <&pwm3 0 1000>; ··· 67 56 68 57 &cpu1 { 69 58 cpu-supply = <&vdd_arm>; 59 + }; 60 + 61 + &gpu { 62 + status = "okay"; 63 + }; 64 + 65 + &hdmi { 66 + status = "okay"; 67 + }; 68 + 69 + &hdmi_in_vop1 { 70 + status = "disabled"; 71 + }; 72 + 73 + &hdmi_out { 74 + hdmi_out_con: endpoint { 75 + remote-endpoint = <&hdmi_con_in>; 76 + }; 77 + }; 78 + 79 + &hdmi_sound { 80 + status = "okay"; 70 81 }; 71 82 72 83 &i2c1 { ··· 246 213 }; 247 214 248 215 &usb_otg { 216 + status = "okay"; 217 + }; 218 + 219 + &vop0 { 249 220 status = "okay"; 250 221 }; 251 222
+7 -1
arch/arm/boot/dts/rockchip/rk3128.dtsi
··· 48 48 device_type = "cpu"; 49 49 compatible = "arm,cortex-a7"; 50 50 reg = <0xf00>; 51 - clock-latency = <40000>; 52 51 clocks = <&cru ARMCLK>; 53 52 resets = <&cru SRST_CORE0>; 54 53 operating-points-v2 = <&cpu_opp_table>; ··· 86 87 opp-216000000 { 87 88 opp-hz = /bits/ 64 <216000000>; 88 89 opp-microvolt = <950000 950000 1325000>; 90 + clock-latency-ns = <40000>; 89 91 }; 90 92 opp-408000000 { 91 93 opp-hz = /bits/ 64 <408000000>; 92 94 opp-microvolt = <950000 950000 1325000>; 95 + clock-latency-ns = <40000>; 93 96 }; 94 97 opp-600000000 { 95 98 opp-hz = /bits/ 64 <600000000>; 96 99 opp-microvolt = <950000 950000 1325000>; 100 + clock-latency-ns = <40000>; 97 101 }; 98 102 opp-696000000 { 99 103 opp-hz = /bits/ 64 <696000000>; 100 104 opp-microvolt = <975000 975000 1325000>; 105 + clock-latency-ns = <40000>; 101 106 }; 102 107 opp-816000000 { 103 108 opp-hz = /bits/ 64 <816000000>; 104 109 opp-microvolt = <1075000 1075000 1325000>; 105 110 opp-suspend; 111 + clock-latency-ns = <40000>; 106 112 }; 107 113 opp-1008000000 { 108 114 opp-hz = /bits/ 64 <1008000000>; 109 115 opp-microvolt = <1200000 1200000 1325000>; 116 + clock-latency-ns = <40000>; 110 117 }; 111 118 opp-1200000000 { 112 119 opp-hz = /bits/ 64 <1200000000>; 113 120 opp-microvolt = <1325000 1325000 1325000>; 121 + clock-latency-ns = <40000>; 114 122 }; 115 123 }; 116 124
-1
arch/arm/boot/dts/rockchip/rk3188.dtsi
··· 23 23 compatible = "arm,cortex-a9"; 24 24 next-level-cache = <&L2>; 25 25 reg = <0x0>; 26 - clock-latency = <40000>; 27 26 clocks = <&cru ARMCLK>; 28 27 operating-points-v2 = <&cpu0_opp_table>; 29 28 resets = <&cru SRST_CORE0>;
-1
arch/arm/boot/dts/rockchip/rk322x.dtsi
··· 36 36 resets = <&cru SRST_CORE0>; 37 37 operating-points-v2 = <&cpu0_opp_table>; 38 38 #cooling-cells = <2>; /* min followed by max */ 39 - clock-latency = <40000>; 40 39 clocks = <&cru ARMCLK>; 41 40 enable-method = "psci"; 42 41 };
+1 -4
arch/arm/boot/dts/rockchip/rk3288.dtsi
··· 70 70 resets = <&cru SRST_CORE0>; 71 71 operating-points-v2 = <&cpu_opp_table>; 72 72 #cooling-cells = <2>; /* min followed by max */ 73 - clock-latency = <40000>; 74 73 clocks = <&cru ARMCLK>; 75 74 dynamic-power-coefficient = <370>; 76 75 }; ··· 80 81 resets = <&cru SRST_CORE1>; 81 82 operating-points-v2 = <&cpu_opp_table>; 82 83 #cooling-cells = <2>; /* min followed by max */ 83 - clock-latency = <40000>; 84 84 clocks = <&cru ARMCLK>; 85 85 dynamic-power-coefficient = <370>; 86 86 }; ··· 90 92 resets = <&cru SRST_CORE2>; 91 93 operating-points-v2 = <&cpu_opp_table>; 92 94 #cooling-cells = <2>; /* min followed by max */ 93 - clock-latency = <40000>; 94 95 clocks = <&cru ARMCLK>; 95 96 dynamic-power-coefficient = <370>; 96 97 }; ··· 100 103 resets = <&cru SRST_CORE3>; 101 104 operating-points-v2 = <&cpu_opp_table>; 102 105 #cooling-cells = <2>; /* min followed by max */ 103 - clock-latency = <40000>; 104 106 clocks = <&cru ARMCLK>; 105 107 dynamic-power-coefficient = <370>; 106 108 }; ··· 112 116 opp-126000000 { 113 117 opp-hz = /bits/ 64 <126000000>; 114 118 opp-microvolt = <900000>; 119 + clock-latency-ns = <40000>; 115 120 }; 116 121 opp-216000000 { 117 122 opp-hz = /bits/ 64 <216000000>;
-1
arch/arm/boot/dts/rockchip/rv1108.dtsi
··· 32 32 device_type = "cpu"; 33 33 compatible = "arm,cortex-a7"; 34 34 reg = <0xf00>; 35 - clock-latency = <40000>; 36 35 clocks = <&cru ARMCLK>; 37 36 #cooling-cells = <2>; /* min followed by max */ 38 37 dynamic-power-coefficient = <75>;