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

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

kernel os linux

A number of cleanups for older socs.

* tag 'v6.19-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: rockchip: move edp assigned-clocks to edp node on rk3288
ARM: dts: rockchip: Add spi_flash label to rk3288-veyron
ARM: dts: rockchip: Remove mshc aliases from RK3288
ARM: dts: rockchip: Adapt tps65910 nodes on RK3066 boards

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

Arnd Bergmann 4 months ago d7eebe10 c1ce3348

+62 -52

5 changed files

expand all

arch

arm

boot

dts

rockchip

rk3066a-bqcurie2.dts

rk3066a-marsboard.dts

rk3066a-rayeager.dts

rk3288-veyron.dtsi

rk3288.dtsi

+19 -15

arch/arm/boot/dts/rockchip/rk3066a-bqcurie2.dts

··· 80 80 clock-frequency = <400000>; 81 81 82 82 tps: tps@2d { 83 + compatible = "ti,tps65910"; 83 84 reg = <0x2d>; 85 + 86 + gpio-controller; 87 + #gpio-cells = <2>; 84 88 85 89 interrupt-parent = <&gpio6>; 86 90 interrupts = <RK_PA6 IRQ_TYPE_LEVEL_LOW>; 91 + 92 + interrupt-controller; 93 + #interrupt-cells = <2>; 87 94 88 95 vcc5-supply = <&vcc_io>; 89 96 vcc6-supply = <&vcc_io>; 90 97 91 98 regulators { 92 - vcc_rtc: regulator@0 { 99 + vcc_rtc: vrtc { 93 100 regulator-name = "vcc_rtc"; 94 101 regulator-always-on; 95 102 }; 96 103 97 - vcc_io: regulator@1 { 104 + vcc_io: vio { 98 105 regulator-name = "vcc_io"; 99 106 regulator-always-on; 100 107 }; 101 108 102 - vdd_arm: regulator@2 { 109 + vdd_arm: vdd1 { 103 110 regulator-name = "vdd_arm"; 104 111 regulator-min-microvolt = <600000>; 105 112 regulator-max-microvolt = <1500000>; ··· 114 107 regulator-always-on; 115 108 }; 116 109 117 - vcc_ddr: regulator@3 { 110 + vcc_ddr: vdd2 { 118 111 regulator-name = "vcc_ddr"; 119 112 regulator-min-microvolt = <600000>; 120 113 regulator-max-microvolt = <1500000>; ··· 122 115 regulator-always-on; 123 116 }; 124 117 125 - vcc18_cif: regulator@5 { 118 + vcc18_cif: vdig1 { 126 119 regulator-name = "vcc18_cif"; 127 120 regulator-always-on; 128 121 }; 129 122 130 - vdd_11: regulator@6 { 123 + vdd_11: vdig2 { 131 124 regulator-name = "vdd_11"; 132 125 regulator-always-on; 133 126 }; 134 127 135 - vcc_25: regulator@7 { 128 + vcc_25: vpll { 136 129 regulator-name = "vcc_25"; 137 130 regulator-always-on; 138 131 }; 139 132 140 - vcc_18: regulator@8 { 133 + vcc_18: vdac { 141 134 regulator-name = "vcc_18"; 142 135 regulator-always-on; 143 136 }; 144 137 145 - vcc25_hdmi: regulator@9 { 138 + vcc25_hdmi: vaux1 { 146 139 regulator-name = "vcc25_hdmi"; 147 140 regulator-always-on; 148 141 }; 149 142 150 - vcca_33: regulator@10 { 143 + vcca_33: vaux2 { 151 144 regulator-name = "vcca_33"; 152 145 regulator-always-on; 153 146 }; 154 147 155 - vcc_tp: regulator@11 { 148 + vcc_tp: vaux33 { 156 149 regulator-name = "vcc_tp"; 157 150 regulator-always-on; 158 151 }; 159 152 160 - vcc28_cif: regulator@12 { 153 + vcc28_cif: vmmc { 161 154 regulator-name = "vcc28_cif"; 162 155 regulator-always-on; 163 156 }; 164 157 }; 165 158 }; 166 159 }; 167 - 168 - /* must be included after &tps gets defined */ 169 - #include "../tps65910.dtsi" 170 160 171 161 &mmc0 { /* sdmmc */ 172 162 status = "okay";

+19 -15

arch/arm/boot/dts/rockchip/rk3066a-marsboard.dts

··· 96 96 clock-frequency = <400000>; 97 97 98 98 tps: tps@2d { 99 + compatible = "ti,tps65910"; 99 100 reg = <0x2d>; 101 + 102 + gpio-controller; 103 + #gpio-cells = <2>; 100 104 101 105 interrupt-parent = <&gpio6>; 102 106 interrupts = <RK_PA4 IRQ_TYPE_LEVEL_LOW>; 107 + 108 + interrupt-controller; 109 + #interrupt-cells = <2>; 103 110 104 111 vcc1-supply = <&vsys>; 105 112 vcc2-supply = <&vsys>; ··· 118 111 vccio-supply = <&vsys>; 119 112 120 113 regulators { 121 - vcc_rtc: regulator@0 { 114 + vcc_rtc: vrtc { 122 115 regulator-name = "vcc_rtc"; 123 116 regulator-always-on; 124 117 }; 125 118 126 - vcc_io: regulator@1 { 119 + vcc_io: vio { 127 120 regulator-name = "vcc_io"; 128 121 regulator-always-on; 129 122 }; 130 123 131 - vdd_arm: regulator@2 { 124 + vdd_arm: vdd1 { 132 125 regulator-name = "vdd_arm"; 133 126 regulator-min-microvolt = <600000>; 134 127 regulator-max-microvolt = <1500000>; ··· 136 129 regulator-always-on; 137 130 }; 138 131 139 - vcc_ddr: regulator@3 { 132 + vcc_ddr: vdd2 { 140 133 regulator-name = "vcc_ddr"; 141 134 regulator-min-microvolt = <600000>; 142 135 regulator-max-microvolt = <1500000>; ··· 144 137 regulator-always-on; 145 138 }; 146 139 147 - vcc18_cif: regulator@5 { 140 + vcc18_cif: vdig1 { 148 141 regulator-name = "vcc18_cif"; 149 142 regulator-always-on; 150 143 }; 151 144 152 - vdd_11: regulator@6 { 145 + vdd_11: vdig2 { 153 146 regulator-name = "vdd_11"; 154 147 regulator-always-on; 155 148 }; 156 149 157 - vcc_25: regulator@7 { 150 + vcc_25: vpll { 158 151 regulator-name = "vcc_25"; 159 152 regulator-always-on; 160 153 }; 161 154 162 - vcc_18: regulator@8 { 155 + vcc_18: vdac { 163 156 regulator-name = "vcc_18"; 164 157 regulator-always-on; 165 158 }; 166 159 167 - vcc25_hdmi: regulator@9 { 160 + vcc25_hdmi: vaux1 { 168 161 regulator-name = "vcc25_hdmi"; 169 162 regulator-always-on; 170 163 }; 171 164 172 - vcca_33: regulator@10 { 165 + vcca_33: vaux2 { 173 166 regulator-name = "vcca_33"; 174 167 regulator-always-on; 175 168 }; 176 169 177 - vcc_rmii: regulator@11 { 170 + vcc_rmii: vaux33 { 178 171 regulator-name = "vcc_rmii"; 179 172 }; 180 173 181 - vcc28_cif: regulator@12 { 174 + vcc28_cif: vmmc { 182 175 regulator-name = "vcc28_cif"; 183 176 regulator-always-on; 184 177 }; 185 178 }; 186 179 }; 187 180 }; 188 - 189 - /* must be included after &tps gets defined */ 190 - #include "../tps65910.dtsi" 191 181 192 182 &emac { 193 183 phy = <&phy0>;

+21 -14

arch/arm/boot/dts/rockchip/rk3066a-rayeager.dts

··· 198 198 status = "okay"; 199 199 200 200 tps: tps@2d { 201 + compatible = "ti,tps65910"; 201 202 reg = <0x2d>; 203 + 204 + gpio-controller; 205 + #gpio-cells = <2>; 206 + 202 207 interrupt-parent = <&gpio6>; 203 208 interrupts = <RK_PA4 IRQ_TYPE_EDGE_RISING>; 209 + 210 + interrupt-controller; 211 + #interrupt-cells = <2>; 212 + 204 213 pinctrl-names = "default"; 205 214 pinctrl-0 = <&pmic_int>, <&pwr_hold>; 206 215 ··· 223 214 vccio-supply = <&vsys>; 224 215 225 216 regulators { 226 - vcc_rtc: regulator@0 { 217 + vcc_rtc: vrtc { 227 218 regulator-name = "vcc_rtc"; 228 219 regulator-always-on; 229 220 }; 230 221 231 - vcc_io: regulator@1 { 222 + vcc_io: vio { 232 223 regulator-name = "vcc_io"; 233 224 regulator-min-microvolt = <3300000>; 234 225 regulator-max-microvolt = <3300000>; 235 226 regulator-always-on; 236 227 }; 237 228 238 - vdd_arm: regulator@2 { 229 + vdd_arm: vdd1 { 239 230 regulator-name = "vdd_arm"; 240 231 regulator-min-microvolt = <600000>; 241 232 regulator-max-microvolt = <1500000>; ··· 243 234 regulator-boot-on; 244 235 }; 245 236 246 - vcc_ddr: regulator@3 { 237 + vcc_ddr: vdd2 { 247 238 regulator-name = "vcc_ddr"; 248 239 regulator-min-microvolt = <600000>; 249 240 regulator-max-microvolt = <1500000>; ··· 251 242 regulator-boot-on; 252 243 }; 253 244 254 - vcc18: regulator@5 { 245 + vcc18: vdig1 { 255 246 regulator-name = "vcc18"; 256 247 regulator-min-microvolt = <1800000>; 257 248 regulator-max-microvolt = <1800000>; 258 249 regulator-always-on; 259 250 }; 260 251 261 - vdd_11: regulator@6 { 252 + vdd_11: vdig2 { 262 253 regulator-name = "vdd_11"; 263 254 regulator-min-microvolt = <1100000>; 264 255 regulator-max-microvolt = <1100000>; 265 256 regulator-always-on; 266 257 }; 267 258 268 - vcc_25: regulator@7 { 259 + vcc_25: vpll { 269 260 regulator-name = "vcc_25"; 270 261 regulator-min-microvolt = <2500000>; 271 262 regulator-max-microvolt = <2500000>; 272 263 regulator-always-on; 273 264 }; 274 265 275 - vccio_wl: regulator@8 { 266 + vccio_wl: vdac { 276 267 regulator-name = "vccio_wl"; 277 268 regulator-min-microvolt = <1800000>; 278 269 regulator-max-microvolt = <1800000>; 279 270 }; 280 271 281 - vcc25_hdmi: regulator@9 { 272 + vcc25_hdmi: vaux1 { 282 273 regulator-name = "vcc25_hdmi"; 283 274 regulator-min-microvolt = <2500000>; 284 275 regulator-max-microvolt = <2500000>; 285 276 }; 286 277 287 - vcca_33: regulator@10 { 278 + vcca_33: vaux2 { 288 279 regulator-name = "vcca_33"; 289 280 regulator-min-microvolt = <3300000>; 290 281 regulator-max-microvolt = <3300000>; 291 282 }; 292 283 293 - vcc_rmii: regulator@11 { 284 + vcc_rmii: vaux33 { 294 285 regulator-name = "vcc_rmii"; 295 286 regulator-min-microvolt = <3300000>; 296 287 regulator-max-microvolt = <3300000>; 297 288 }; 298 289 299 - vcc28_cif: regulator@12 { 290 + vcc28_cif: vmmc { 300 291 regulator-name = "vcc28_cif"; 301 292 regulator-min-microvolt = <2800000>; 302 293 regulator-max-microvolt = <2800000>; ··· 304 295 }; 305 296 }; 306 297 }; 307 - 308 - #include "../tps65910.dtsi" 309 298 310 299 &i2c2 { 311 300 status = "okay";

+1 -1

arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi

··· 388 388 389 389 rx-sample-delay-ns = <12>; 390 390 391 - flash@0 { 391 + spi_flash: flash@0 { 392 392 compatible = "jedec,spi-nor"; 393 393 spi-max-frequency = <50000000>; 394 394 reg = <0>;

+2 -7

arch/arm/boot/dts/rockchip/rk3288.dtsi

··· 34 34 i2c3 = &i2c3; 35 35 i2c4 = &i2c4; 36 36 i2c5 = &i2c5; 37 - mshc0 = &emmc; 38 - mshc1 = &sdmmc; 39 - mshc2 = &sdio0; 40 - mshc3 = &sdio1; 41 37 serial0 = &uart0; 42 38 serial1 = &uart1; 43 39 serial2 = &uart2; ··· 741 745 #address-cells = <1>; 742 746 #size-cells = <0>; 743 747 744 - assigned-clocks = <&cru SCLK_EDP_24M>; 745 - assigned-clock-parents = <&xin24m>; 746 - 747 748 /* 748 749 * Note: Although SCLK_* are the working clocks 749 750 * of device without including on the NOC, needed for ··· 1190 1197 compatible = "rockchip,rk3288-dp"; 1191 1198 reg = <0x0 0xff970000 0x0 0x4000>; 1192 1199 interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>; 1200 + assigned-clocks = <&cru SCLK_EDP_24M>; 1201 + assigned-clock-parents = <&xin24m>; 1193 1202 clocks = <&cru SCLK_EDP>, <&cru PCLK_EDP_CTRL>; 1194 1203 clock-names = "dp", "pclk"; 1195 1204 phys = <&edp_phy>;