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

ARM: dts: ux500: Update AB850[05] nodes

The new YAML device tree bindings gives new and proper names
to several of the AB850[05] nodes and redefines the way we
use numbering on PWMs to use reg.

Update all the DTS nodes accordingly.

Add the missing thermal node to the AB8505.

Drop the debugfs nodes because these are not real devices.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Linus Walleij 218b2f88 1afc8a28

+58 -51
+20 -19
arch/arm/boot/dts/ste-ab8500.dtsi
··· 28 28 interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; 29 29 interrupt-controller; 30 30 #interrupt-cells = <2>; 31 + #address-cells = <1>; 32 + #size-cells = <0>; 31 33 32 34 ab8500_clock: clock-controller { 33 35 compatible = "stericsson,ab8500-clk"; 34 36 #clock-cells = <1>; 35 37 }; 36 38 37 - ab8500_gpio: ab8500-gpiocontroller { 39 + ab8500_gpio: gpio { 38 40 compatible = "stericsson,ab8500-gpio"; 39 41 gpio-controller; 40 42 #gpio-cells = <2>; 41 43 }; 42 44 43 - ab8500-rtc { 45 + rtc { 44 46 compatible = "stericsson,ab8500-rtc"; 45 47 interrupts = <17 IRQ_TYPE_LEVEL_HIGH>, 46 48 <18 IRQ_TYPE_LEVEL_HIGH>; 47 49 interrupt-names = "60S", "ALARM"; 48 50 }; 49 51 50 - gpadc: ab8500-gpadc { 52 + gpadc: adc { 51 53 compatible = "stericsson,ab8500-gpadc"; 52 54 interrupts = <32 IRQ_TYPE_LEVEL_HIGH>, 53 55 <39 IRQ_TYPE_LEVEL_HIGH>; ··· 122 120 }; 123 121 }; 124 122 125 - ab8500_temp { 123 + thermal { 126 124 compatible = "stericsson,abx500-temp"; 127 125 interrupts = <3 IRQ_TYPE_LEVEL_HIGH>; 128 126 interrupt-names = "ABX500_TEMP_WARM"; 129 - io-channels = <&gpadc 0x06>, 130 - <&gpadc 0x07>; 131 - io-channel-names = "aux1", "aux2"; 132 127 }; 133 128 134 129 ab8500_fg { ··· 211 212 monitored-battery = <&battery>; 212 213 }; 213 214 214 - ab8500_usb: ab8500_usb { 215 + ab8500_usb: phy { 215 216 compatible = "stericsson,ab8500-usb"; 216 217 interrupts = <90 IRQ_TYPE_LEVEL_HIGH>, 217 218 <96 IRQ_TYPE_LEVEL_HIGH>, ··· 235 236 #phy-cells = <0>; 236 237 }; 237 238 238 - ab8500-ponkey { 239 + key { 239 240 compatible = "stericsson,ab8500-poweron-key"; 240 241 interrupts = <6 IRQ_TYPE_LEVEL_HIGH>, 241 242 <7 IRQ_TYPE_LEVEL_HIGH>; ··· 246 247 compatible = "stericsson,ab8500-sysctrl"; 247 248 }; 248 249 249 - ab8500-pwm-1 { 250 + pwm@1 { 250 251 compatible = "stericsson,ab8500-pwm"; 252 + reg = <1>; 251 253 clocks = <&ab8500_clock AB8500_SYSCLK_INT>; 252 254 clock-names = "intclk"; 255 + #pwm-cells = <1>; 253 256 }; 254 257 255 - ab8500-pwm-2 { 258 + pwm@2 { 256 259 compatible = "stericsson,ab8500-pwm"; 260 + reg = <2>; 257 261 clocks = <&ab8500_clock AB8500_SYSCLK_INT>; 258 262 clock-names = "intclk"; 263 + #pwm-cells = <1>; 259 264 }; 260 265 261 - ab8500-pwm-3 { 266 + pwm@3 { 262 267 compatible = "stericsson,ab8500-pwm"; 268 + reg = <3>; 263 269 clocks = <&ab8500_clock AB8500_SYSCLK_INT>; 264 270 clock-names = "intclk"; 271 + #pwm-cells = <1>; 265 272 }; 266 273 267 - ab8500-debugfs { 268 - compatible = "stericsson,ab8500-debug"; 269 - }; 270 - 271 - codec: ab8500-codec { 274 + codec: codec { 272 275 compatible = "stericsson,ab8500-codec"; 273 276 274 277 V-AUD-supply = <&ab8500_ldo_audio_reg>; ··· 284 283 stericsson,earpeice-cmv = <950>; /* Units in mV. */ 285 284 }; 286 285 287 - ext_regulators: ab8500-ext-regulators { 286 + ext_regulators: regulator-external { 288 287 compatible = "stericsson,ab8500-ext-regulator"; 289 288 290 289 ab8500_ext1_reg: ab8500_ext1 { ··· 308 307 }; 309 308 }; 310 309 311 - ab8500-regulators { 310 + regulator { 312 311 compatible = "stericsson,ab8500-regulator"; 313 312 vin-supply = <&ab8500_ext3_reg>; 314 313
+18 -12
arch/arm/boot/dts/ste-ab8505.dtsi
··· 25 25 interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; 26 26 interrupt-controller; 27 27 #interrupt-cells = <2>; 28 + #address-cells = <1>; 29 + #size-cells = <0>; 28 30 29 31 ab8500_clock: clock-controller { 30 32 compatible = "stericsson,ab8500-clk"; 31 33 #clock-cells = <1>; 32 34 }; 33 35 34 - ab8505_gpio: ab8505-gpiocontroller { 36 + ab8505_gpio: gpio { 35 37 compatible = "stericsson,ab8505-gpio"; 36 38 gpio-controller; 37 39 #gpio-cells = <2>; 38 40 }; 39 41 40 - ab8500-rtc { 42 + rtc { 41 43 compatible = "stericsson,ab8500-rtc"; 42 44 interrupts = <17 IRQ_TYPE_LEVEL_HIGH>, 43 45 <18 IRQ_TYPE_LEVEL_HIGH>; 44 46 interrupt-names = "60S", "ALARM"; 45 47 }; 46 48 47 - gpadc: ab8500-gpadc { 49 + gpadc: adc { 48 50 compatible = "stericsson,ab8500-gpadc"; 49 51 interrupts = <39 IRQ_TYPE_LEVEL_HIGH>; 50 52 interrupt-names = "SW_CONV_END"; ··· 92 90 usb_id: channel@e { 93 91 reg = <0x0e>; 94 92 }; 93 + }; 94 + 95 + thermal { 96 + compatible = "stericsson,abx500-temp"; 97 + interrupts = <3 IRQ_TYPE_LEVEL_HIGH>; 98 + interrupt-names = "ABX500_TEMP_WARM"; 95 99 }; 96 100 97 101 ab8500_fg { ··· 179 171 monitored-battery = <&battery>; 180 172 }; 181 173 182 - ab8500_usb: ab8500_usb { 174 + ab8500_usb: phy { 183 175 compatible = "stericsson,ab8500-usb"; 184 176 interrupts = <90 IRQ_TYPE_LEVEL_HIGH>, 185 177 <96 IRQ_TYPE_LEVEL_HIGH>, ··· 203 195 #phy-cells = <0>; 204 196 }; 205 197 206 - ab8500-ponkey { 198 + key { 207 199 compatible = "stericsson,ab8500-poweron-key"; 208 200 interrupts = <6 IRQ_TYPE_LEVEL_HIGH>, 209 201 <7 IRQ_TYPE_LEVEL_HIGH>; ··· 214 206 compatible = "stericsson,ab8500-sysctrl"; 215 207 }; 216 208 217 - ab8500-pwm { 209 + pwm@1 { 218 210 compatible = "stericsson,ab8500-pwm"; 211 + reg = <1>; 219 212 clocks = <&ab8500_clock AB8500_SYSCLK_INT>; 220 213 clock-names = "intclk"; 214 + #pwm-cells = <1>; 221 215 }; 222 216 223 - ab8500-debugfs { 224 - compatible = "stericsson,ab8500-debug"; 225 - }; 226 - 227 - codec: ab8500-codec { 217 + codec: codec { 228 218 compatible = "stericsson,ab8500-codec"; 229 219 230 220 V-AUD-supply = <&ab8500_ldo_audio_reg>; ··· 235 229 stericsson,earpeice-cmv = <950>; /* Units in mV. */ 236 230 }; 237 231 238 - ab8505-regulators { 232 + regulator { 239 233 compatible = "stericsson,ab8505-regulator"; 240 234 241 235 ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
+1 -1
arch/arm/boot/dts/ste-href-ab8500.dtsi
··· 9 9 soc { 10 10 prcmu@80157000 { 11 11 ab8500 { 12 - ab8500-gpiocontroller { 12 + gpio { 13 13 /* Hog a few default settings */ 14 14 pinctrl-names = "default"; 15 15 pinctrl-0 = <&gpio2_default_mode>,
+3 -3
arch/arm/boot/dts/ste-href.dtsi
··· 236 236 237 237 prcmu@80157000 { 238 238 ab8500 { 239 - ab8500-gpiocontroller { 239 + gpio { 240 240 }; 241 241 242 - ab8500_usb { 242 + phy { 243 243 pinctrl-names = "default", "sleep"; 244 244 pinctrl-0 = <&usb_a_1_default>; 245 245 pinctrl-1 = <&usb_a_1_sleep>; 246 246 }; 247 247 248 - ab8500-regulators { 248 + regulator { 249 249 ab8500_ldo_aux1_reg: ab8500_ldo_aux1 { 250 250 regulator-name = "V-DISPLAY"; 251 251 };
+4 -4
arch/arm/boot/dts/ste-snowball.dts
··· 401 401 402 402 prcmu@80157000 { 403 403 ab8500 { 404 - ab8500-gpiocontroller { 404 + gpio { 405 405 /* 406 406 * AB8500 GPIOs are numbered starting from 1, so the first 407 407 * index 0 is what in the datasheet is called "GPIO1", and ··· 423 423 "PM_GPIO42"; /* AB8500 GPIO42 */ 424 424 }; 425 425 426 - ab8500_usb { 426 + phy { 427 427 pinctrl-names = "default", "sleep"; 428 428 pinctrl-0 = <&usb_a_1_default>; 429 429 pinctrl-1 = <&usb_a_1_sleep>; 430 430 }; 431 431 432 - ext_regulators: ab8500-ext-regulators { 432 + ext_regulators: regulator-external { 433 433 ab8500_ext1_reg: ab8500_ext1 { 434 434 regulator-name = "ab8500-ext-supply1"; 435 435 }; ··· 443 443 }; 444 444 }; 445 445 446 - ab8500-regulators { 446 + regulator { 447 447 ab8500_ldo_aux1_reg: ab8500_ldo_aux1 { 448 448 regulator-name = "V-DISPLAY"; 449 449 };
+2 -2
arch/arm/boot/dts/ste-ux500-samsung-codina.dts
··· 477 477 478 478 prcmu@80157000 { 479 479 ab8500 { 480 - ab8500_usb { 480 + phy { 481 481 pinctrl-names = "default", "sleep"; 482 482 pinctrl-0 = <&usb_a_1_default>; 483 483 pinctrl-1 = <&usb_a_1_sleep>; 484 484 }; 485 485 486 - ab8500-regulators { 486 + regulator { 487 487 ab8500_ldo_aux1 { 488 488 /* Used for VDD for sensors */ 489 489 regulator-name = "V-SENSORS-VDD";
+2 -2
arch/arm/boot/dts/ste-ux500-samsung-gavini.dts
··· 450 450 451 451 prcmu@80157000 { 452 452 ab8500 { 453 - ab8500_usb { 453 + phy { 454 454 pinctrl-names = "default", "sleep"; 455 455 pinctrl-0 = <&usb_a_1_default>; 456 456 pinctrl-1 = <&usb_a_1_sleep>; 457 457 }; 458 458 459 - ab8500-regulators { 459 + regulator { 460 460 ab8500_ldo_aux1 { 461 461 /* Used for VDD for sensors */ 462 462 regulator-name = "V-SENSORS-VDD";
+2 -2
arch/arm/boot/dts/ste-ux500-samsung-golden.dts
··· 298 298 299 299 prcmu@80157000 { 300 300 ab8505 { 301 - ab8500_usb { 301 + phy { 302 302 pinctrl-names = "default", "sleep"; 303 303 pinctrl-0 = <&usb_a_1_default>; 304 304 pinctrl-1 = <&usb_a_1_sleep>; 305 305 }; 306 306 307 - ab8505-regulators { 307 + regulator { 308 308 ab8500_ldo_aux1 { 309 309 regulator-name = "sensor_3v"; 310 310 regulator-min-microvolt = <3000000>;
+2 -2
arch/arm/boot/dts/ste-ux500-samsung-janice.dts
··· 498 498 499 499 prcmu@80157000 { 500 500 ab8500 { 501 - ab8500_usb { 501 + phy { 502 502 pinctrl-names = "default", "sleep"; 503 503 pinctrl-0 = <&usb_a_1_default>; 504 504 pinctrl-1 = <&usb_a_1_sleep>; 505 505 }; 506 506 507 - ab8500-regulators { 507 + regulator { 508 508 ab8500_ldo_aux1 { 509 509 /* Used for VDD for sensors */ 510 510 regulator-name = "V-SENSORS-VDD";
+2 -2
arch/arm/boot/dts/ste-ux500-samsung-kyle.dts
··· 319 319 320 320 prcmu@80157000 { 321 321 ab8505 { 322 - ab8500_usb { 322 + phy { 323 323 pinctrl-names = "default", "sleep"; 324 324 pinctrl-0 = <&usb_a_1_default>; 325 325 pinctrl-1 = <&usb_a_1_sleep>; 326 326 }; 327 327 328 - ab8505-regulators { 328 + regulator { 329 329 ab8500_ldo_aux1 { 330 330 /* Used for VDD for sensors */ 331 331 regulator-name = "AUX1";
+2 -2
arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
··· 303 303 304 304 prcmu@80157000 { 305 305 ab8505 { 306 - ab8500_usb { 306 + phy { 307 307 pinctrl-names = "default", "sleep"; 308 308 pinctrl-0 = <&usb_a_1_default>; 309 309 pinctrl-1 = <&usb_a_1_sleep>; 310 310 }; 311 311 312 - ab8505-regulators { 312 + regulator { 313 313 ab8500_ldo_aux1 { 314 314 /* Used for VDD for sensors */ 315 315 regulator-name = "AUX1";