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: imx: use generic node name for fixed regulator

The device tree specification recommends that generic name should be
used for nodes. So instead of naming those fixed regulator nodes
arbitrarily, let's use the generic name 'regulator@num' for those nodes.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

Shawn Guo 352d318c a4a2aa9b

+126 -42
+6 -2
arch/arm/boot/dts/imx23-evk.dts
··· 127 127 128 128 regulators { 129 129 compatible = "simple-bus"; 130 + #address-cells = <1>; 131 + #size-cells = <0>; 130 132 131 - reg_vddio_sd0: vddio-sd0 { 133 + reg_vddio_sd0: regulator@0 { 132 134 compatible = "regulator-fixed"; 135 + reg = <0>; 133 136 regulator-name = "vddio-sd0"; 134 137 regulator-min-microvolt = <3300000>; 135 138 regulator-max-microvolt = <3300000>; 136 139 gpio = <&gpio1 29 0>; 137 140 }; 138 141 139 - reg_lcd_3v3: lcd-3v3 { 142 + reg_lcd_3v3: regulator@1 { 140 143 compatible = "regulator-fixed"; 144 + reg = <1>; 141 145 regulator-name = "lcd-3v3"; 142 146 regulator-min-microvolt = <3300000>; 143 147 regulator-max-microvolt = <3300000>;
+4 -1
arch/arm/boot/dts/imx23-olinuxino.dts
··· 100 100 101 101 regulators { 102 102 compatible = "simple-bus"; 103 + #address-cells = <1>; 104 + #size-cells = <0>; 103 105 104 - reg_usb0_vbus: usb0_vbus { 106 + reg_usb0_vbus: regulator@0 { 105 107 compatible = "regulator-fixed"; 108 + reg = <0>; 106 109 regulator-name = "usb0_vbus"; 107 110 regulator-min-microvolt = <5000000>; 108 111 regulator-max-microvolt = <5000000>;
+4 -1
arch/arm/boot/dts/imx23-stmp378x_devb.dts
··· 66 66 67 67 regulators { 68 68 compatible = "simple-bus"; 69 + #address-cells = <1>; 70 + #size-cells = <0>; 69 71 70 - reg_vddio_sd0: vddio-sd0 { 72 + reg_vddio_sd0: regulator@0 { 71 73 compatible = "regulator-fixed"; 74 + reg = <0>; 72 75 regulator-name = "vddio-sd0"; 73 76 regulator-min-microvolt = <3300000>; 74 77 regulator-max-microvolt = <3300000>;
+4 -1
arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
··· 37 37 38 38 regulators { 39 39 compatible = "simple-bus"; 40 + #address-cells = <1>; 41 + #size-cells = <0>; 40 42 41 - reg_3v3: 3v3 { 43 + reg_3v3: regulator@0 { 42 44 compatible = "regulator-fixed"; 45 + reg = <0>; 43 46 regulator-name = "3V3"; 44 47 regulator-min-microvolt = <3300000>; 45 48 regulator-max-microvolt = <3300000>;
+4 -1
arch/arm/boot/dts/imx28-apf28dev.dts
··· 150 150 151 151 regulators { 152 152 compatible = "simple-bus"; 153 + #address-cells = <1>; 154 + #size-cells = <0>; 153 155 154 - reg_usb0_vbus: usb0_vbus { 156 + reg_usb0_vbus: regulator@0 { 155 157 compatible = "regulator-fixed"; 158 + reg = <0>; 156 159 regulator-name = "usb0_vbus"; 157 160 regulator-min-microvolt = <5000000>; 158 161 regulator-max-microvolt = <5000000>;
+4 -1
arch/arm/boot/dts/imx28-apx4devkit.dts
··· 193 193 194 194 regulators { 195 195 compatible = "simple-bus"; 196 + #address-cells = <1>; 197 + #size-cells = <0>; 196 198 197 - reg_3p3v: 3p3v { 199 + reg_3p3v: regulator@0 { 198 200 compatible = "regulator-fixed"; 201 + reg = <0>; 199 202 regulator-name = "3P3V"; 200 203 regulator-min-microvolt = <3300000>; 201 204 regulator-max-microvolt = <3300000>;
+4 -1
arch/arm/boot/dts/imx28-cfa10037.dts
··· 72 72 73 73 regulators { 74 74 compatible = "simple-bus"; 75 + #address-cells = <1>; 76 + #size-cells = <0>; 75 77 76 - reg_usb1_vbus: usb1_vbus { 78 + reg_usb1_vbus: regulator@0 { 77 79 compatible = "regulator-fixed"; 80 + reg = <0>; 78 81 pinctrl-names = "default"; 79 82 pinctrl-0 = <&usb_pins_cfa10037>; 80 83 regulator-name = "usb1_vbus";
+4 -1
arch/arm/boot/dts/imx28-cfa10049.dts
··· 282 282 283 283 regulators { 284 284 compatible = "simple-bus"; 285 + #address-cells = <1>; 286 + #size-cells = <0>; 285 287 286 - reg_usb1_vbus: usb1_vbus { 288 + reg_usb1_vbus: regulator@0 { 287 289 compatible = "regulator-fixed"; 290 + reg = <0>; 288 291 pinctrl-names = "default"; 289 292 pinctrl-0 = <&usb_pins_cfa10049>; 290 293 regulator-name = "usb1_vbus";
+4 -1
arch/arm/boot/dts/imx28-cfa10057.dts
··· 142 142 143 143 regulators { 144 144 compatible = "simple-bus"; 145 + #address-cells = <1>; 146 + #size-cells = <0>; 145 147 146 - reg_usb1_vbus: usb1_vbus { 148 + reg_usb1_vbus: regulator@0 { 147 149 compatible = "regulator-fixed"; 150 + reg = <0>; 148 151 pinctrl-names = "default"; 149 152 pinctrl-0 = <&usb_pins_cfa10057>; 150 153 regulator-name = "usb1_vbus";
+4 -1
arch/arm/boot/dts/imx28-cfa10058.dts
··· 109 109 110 110 regulators { 111 111 compatible = "simple-bus"; 112 + #address-cells = <1>; 113 + #size-cells = <0>; 112 114 113 - reg_usb1_vbus: usb1_vbus { 115 + reg_usb1_vbus: regulator@0 { 114 116 pinctrl-names = "default"; 115 117 pinctrl-0 = <&usb_pins_cfa10058>; 116 118 compatible = "regulator-fixed"; 119 + reg = <0>; 117 120 regulator-name = "usb1_vbus"; 118 121 regulator-min-microvolt = <5000000>; 119 122 regulator-max-microvolt = <5000000>;
+16 -7
arch/arm/boot/dts/imx28-evk.dts
··· 278 278 279 279 regulators { 280 280 compatible = "simple-bus"; 281 + #address-cells = <1>; 282 + #size-cells = <0>; 281 283 282 - reg_3p3v: 3p3v { 284 + reg_3p3v: regulator@0 { 283 285 compatible = "regulator-fixed"; 286 + reg = <0>; 284 287 regulator-name = "3P3V"; 285 288 regulator-min-microvolt = <3300000>; 286 289 regulator-max-microvolt = <3300000>; 287 290 regulator-always-on; 288 291 }; 289 292 290 - reg_vddio_sd0: vddio-sd0 { 293 + reg_vddio_sd0: regulator@1 { 291 294 compatible = "regulator-fixed"; 295 + reg = <1>; 292 296 regulator-name = "vddio-sd0"; 293 297 regulator-min-microvolt = <3300000>; 294 298 regulator-max-microvolt = <3300000>; 295 299 gpio = <&gpio3 28 0>; 296 300 }; 297 301 298 - reg_fec_3v3: fec-3v3 { 302 + reg_fec_3v3: regulator@2 { 299 303 compatible = "regulator-fixed"; 304 + reg = <2>; 300 305 regulator-name = "fec-3v3"; 301 306 regulator-min-microvolt = <3300000>; 302 307 regulator-max-microvolt = <3300000>; 303 308 gpio = <&gpio2 15 0>; 304 309 }; 305 310 306 - reg_usb0_vbus: usb0_vbus { 311 + reg_usb0_vbus: regulator@3 { 307 312 compatible = "regulator-fixed"; 313 + reg = <3>; 308 314 regulator-name = "usb0_vbus"; 309 315 regulator-min-microvolt = <5000000>; 310 316 regulator-max-microvolt = <5000000>; ··· 318 312 enable-active-high; 319 313 }; 320 314 321 - reg_usb1_vbus: usb1_vbus { 315 + reg_usb1_vbus: regulator@4 { 322 316 compatible = "regulator-fixed"; 317 + reg = <4>; 323 318 regulator-name = "usb1_vbus"; 324 319 regulator-min-microvolt = <5000000>; 325 320 regulator-max-microvolt = <5000000>; ··· 328 321 enable-active-high; 329 322 }; 330 323 331 - reg_lcd_3v3: lcd-3v3 { 324 + reg_lcd_3v3: regulator@5 { 332 325 compatible = "regulator-fixed"; 326 + reg = <5>; 333 327 regulator-name = "lcd-3v3"; 334 328 regulator-min-microvolt = <3300000>; 335 329 regulator-max-microvolt = <3300000>; ··· 338 330 enable-active-high; 339 331 }; 340 332 341 - reg_can_3v3: can-3v3 { 333 + reg_can_3v3: regulator@6 { 342 334 compatible = "regulator-fixed"; 335 + reg = <6>; 343 336 regulator-name = "can-3v3"; 344 337 regulator-min-microvolt = <3300000>; 345 338 regulator-max-microvolt = <3300000>;
+10 -4
arch/arm/boot/dts/imx28-m28cu3.dts
··· 229 229 230 230 regulators { 231 231 compatible = "simple-bus"; 232 + #address-cells = <1>; 233 + #size-cells = <0>; 232 234 233 - reg_3p3v: 3p3v { 235 + reg_3p3v: regulator@0 { 234 236 compatible = "regulator-fixed"; 237 + reg = <0>; 235 238 regulator-name = "3P3V"; 236 239 regulator-min-microvolt = <3300000>; 237 240 regulator-max-microvolt = <3300000>; 238 241 regulator-always-on; 239 242 }; 240 243 241 - reg_vddio_sd0: vddio-sd0 { 244 + reg_vddio_sd0: regulator@1 { 242 245 compatible = "regulator-fixed"; 246 + reg = <1>; 243 247 regulator-name = "vddio-sd0"; 244 248 regulator-min-microvolt = <3300000>; 245 249 regulator-max-microvolt = <3300000>; 246 250 gpio = <&gpio3 29 0>; 247 251 }; 248 252 249 - reg_vddio_sd1: vddio-sd1 { 253 + reg_vddio_sd1: regulator@2 { 250 254 compatible = "regulator-fixed"; 255 + reg = <2>; 251 256 regulator-name = "vddio-sd1"; 252 257 regulator-min-microvolt = <3300000>; 253 258 regulator-max-microvolt = <3300000>; 254 259 gpio = <&gpio2 19 0>; 255 260 }; 256 261 257 - reg_usb1_vbus: usb1_vbus { 262 + reg_usb1_vbus: regulator@3 { 258 263 compatible = "regulator-fixed"; 264 + reg = <3>; 259 265 regulator-name = "usb1_vbus"; 260 266 regulator-min-microvolt = <5000000>; 261 267 regulator-max-microvolt = <5000000>;
+10 -4
arch/arm/boot/dts/imx28-m28evk.dts
··· 285 285 286 286 regulators { 287 287 compatible = "simple-bus"; 288 + #address-cells = <1>; 289 + #size-cells = <0>; 288 290 289 - reg_3p3v: 3p3v { 291 + reg_3p3v: regulator@0 { 290 292 compatible = "regulator-fixed"; 293 + reg = <0>; 291 294 regulator-name = "3P3V"; 292 295 regulator-min-microvolt = <3300000>; 293 296 regulator-max-microvolt = <3300000>; 294 297 regulator-always-on; 295 298 }; 296 299 297 - reg_vddio_sd0: vddio-sd0 { 300 + reg_vddio_sd0: regulator@1 { 298 301 compatible = "regulator-fixed"; 302 + reg = <1>; 299 303 regulator-name = "vddio-sd0"; 300 304 regulator-min-microvolt = <3300000>; 301 305 regulator-max-microvolt = <3300000>; 302 306 gpio = <&gpio3 28 0>; 303 307 }; 304 308 305 - reg_usb0_vbus: usb0_vbus { 309 + reg_usb0_vbus: regulator@2 { 306 310 compatible = "regulator-fixed"; 311 + reg = <2>; 307 312 regulator-name = "usb0_vbus"; 308 313 regulator-min-microvolt = <5000000>; 309 314 regulator-max-microvolt = <5000000>; 310 315 gpio = <&gpio3 12 0>; 311 316 }; 312 317 313 - reg_usb1_vbus: usb1_vbus { 318 + reg_usb1_vbus: regulator@3 { 314 319 compatible = "regulator-fixed"; 320 + reg = <3>; 315 321 regulator-name = "usb1_vbus"; 316 322 regulator-min-microvolt = <5000000>; 317 323 regulator-max-microvolt = <5000000>;
+4 -1
arch/arm/boot/dts/imx28-sps1.dts
··· 127 127 128 128 regulators { 129 129 compatible = "simple-bus"; 130 + #address-cells = <1>; 131 + #size-cells = <0>; 130 132 131 - reg_usb0_vbus: usb0_vbus { 133 + reg_usb0_vbus: regulator@0 { 132 134 compatible = "regulator-fixed"; 135 + reg = <0>; 133 136 regulator-name = "usb0_vbus"; 134 137 regulator-min-microvolt = <5000000>; 135 138 regulator-max-microvolt = <5000000>;
+16 -7
arch/arm/boot/dts/imx28-tx28.dts
··· 43 43 44 44 regulators { 45 45 compatible = "simple-bus"; 46 + #address-cells = <1>; 47 + #size-cells = <0>; 46 48 47 - reg_usb0_vbus: usb0_vbus { 49 + reg_usb0_vbus: regulator@0 { 48 50 compatible = "regulator-fixed"; 51 + reg = <0>; 49 52 regulator-name = "usb0_vbus"; 50 53 regulator-min-microvolt = <5000000>; 51 54 regulator-max-microvolt = <5000000>; ··· 56 53 enable-active-high; 57 54 }; 58 55 59 - reg_usb1_vbus: usb1_vbus { 56 + reg_usb1_vbus: regulator@1 { 60 57 compatible = "regulator-fixed"; 58 + reg = <1>; 61 59 regulator-name = "usb1_vbus"; 62 60 regulator-min-microvolt = <5000000>; 63 61 regulator-max-microvolt = <5000000>; ··· 66 62 enable-active-high; 67 63 }; 68 64 69 - reg_2p5v: 2p5v { 65 + reg_2p5v: regulator@2 { 70 66 compatible = "regulator-fixed"; 67 + reg = <2>; 71 68 regulator-name = "2P5V"; 72 69 regulator-min-microvolt = <2500000>; 73 70 regulator-max-microvolt = <2500000>; 74 71 regulator-always-on; 75 72 }; 76 73 77 - reg_3p3v: 3p3v { 74 + reg_3p3v: regulator@3 { 78 75 compatible = "regulator-fixed"; 76 + reg = <3>; 79 77 regulator-name = "3P3V"; 80 78 regulator-min-microvolt = <3300000>; 81 79 regulator-max-microvolt = <3300000>; 82 80 regulator-always-on; 83 81 }; 84 82 85 - reg_can_xcvr: can-xcvr { 83 + reg_can_xcvr: regulator@4 { 86 84 compatible = "regulator-fixed"; 85 + reg = <4>; 87 86 regulator-name = "CAN XCVR"; 88 87 regulator-min-microvolt = <3300000>; 89 88 regulator-max-microvolt = <3300000>; ··· 96 89 pinctrl-0 = <&tx28_flexcan_xcvr_pins>; 97 90 }; 98 91 99 - reg_lcd: lcd-power { 92 + reg_lcd: regulator@5 { 100 93 compatible = "regulator-fixed"; 94 + reg = <5>; 101 95 regulator-name = "LCD POWER"; 102 96 regulator-min-microvolt = <3300000>; 103 97 regulator-max-microvolt = <3300000>; ··· 106 98 enable-active-high; 107 99 }; 108 100 109 - reg_lcd_reset: lcd-reset { 101 + reg_lcd_reset: regulator@6 { 110 102 compatible = "regulator-fixed"; 103 + reg = <6>; 111 104 regulator-name = "LCD RESET"; 112 105 regulator-min-microvolt = <3300000>; 113 106 regulator-max-microvolt = <3300000>;
+4 -1
arch/arm/boot/dts/imx53-ard.dts
··· 49 49 50 50 regulators { 51 51 compatible = "simple-bus"; 52 + #address-cells = <1>; 53 + #size-cells = <0>; 52 54 53 - reg_3p3v: 3p3v { 55 + reg_3p3v: regulator@0 { 54 56 compatible = "regulator-fixed"; 57 + reg = <0>; 55 58 regulator-name = "3P3V"; 56 59 regulator-min-microvolt = <3300000>; 57 60 regulator-max-microvolt = <3300000>;
+4 -1
arch/arm/boot/dts/imx53-m53evk.dts
··· 73 73 74 74 regulators { 75 75 compatible = "simple-bus"; 76 + #address-cells = <1>; 77 + #size-cells = <0>; 76 78 77 - reg_3p2v: 3p2v { 79 + reg_3p2v: regulator@0 { 78 80 compatible = "regulator-fixed"; 81 + reg = <0>; 79 82 regulator-name = "3P2V"; 80 83 regulator-min-microvolt = <3200000>; 81 84 regulator-max-microvolt = <3200000>;
+6 -2
arch/arm/boot/dts/imx53-mba53.dts
··· 37 37 38 38 regulators { 39 39 compatible = "simple-bus"; 40 + #address-cells = <1>; 41 + #size-cells = <0>; 40 42 41 - reg_backlight: fixed@0 { 43 + reg_backlight: regulator@0 { 42 44 compatible = "regulator-fixed"; 45 + reg = <0>; 43 46 regulator-name = "lcd-supply"; 44 47 gpio = <&gpio2 5 0>; 45 48 startup-delay-us = <5000>; 46 49 enable-active-low; 47 50 }; 48 51 49 - reg_3p2v: 3p2v { 52 + reg_3p2v: regulator@1 { 50 53 compatible = "regulator-fixed"; 54 + reg = <1>; 51 55 regulator-name = "3P2V"; 52 56 regulator-min-microvolt = <3200000>; 53 57 regulator-max-microvolt = <3200000>;
+6 -2
arch/arm/boot/dts/imx53-qsb.dts
··· 86 86 87 87 regulators { 88 88 compatible = "simple-bus"; 89 + #address-cells = <1>; 90 + #size-cells = <0>; 89 91 90 - reg_3p2v: 3p2v { 92 + reg_3p2v: regulator@0 { 91 93 compatible = "regulator-fixed"; 94 + reg = <0>; 92 95 regulator-name = "3P2V"; 93 96 regulator-min-microvolt = <3200000>; 94 97 regulator-max-microvolt = <3200000>; 95 98 regulator-always-on; 96 99 }; 97 100 98 - reg_usb_vbus: usb_vbus { 101 + reg_usb_vbus: regulator@1 { 99 102 compatible = "regulator-fixed"; 103 + reg = <1>; 100 104 regulator-name = "usb_vbus"; 101 105 regulator-min-microvolt = <5000000>; 102 106 regulator-max-microvolt = <5000000>;
+4 -1
arch/arm/boot/dts/imx53-tqma53.dtsi
··· 22 22 23 23 regulators { 24 24 compatible = "simple-bus"; 25 + #address-cells = <1>; 26 + #size-cells = <0>; 25 27 26 - reg_3p3v: 3p3v { 28 + reg_3p3v: regulator@0 { 27 29 compatible = "regulator-fixed"; 30 + reg = <0>; 28 31 regulator-name = "3P3V"; 29 32 regulator-min-microvolt = <3300000>; 30 33 regulator-max-microvolt = <3300000>;
+4 -1
arch/arm/boot/dts/imx53-tx53.dtsi
··· 21 21 22 22 regulators { 23 23 compatible = "simple-bus"; 24 + #address-cells = <1>; 25 + #size-cells = <0>; 24 26 25 - reg_3p3v: 3p3v { 27 + reg_3p3v: regulator@0 { 26 28 compatible = "regulator-fixed"; 29 + reg = <0>; 27 30 regulator-name = "3P3V"; 28 31 regulator-min-microvolt = <3300000>; 29 32 regulator-max-microvolt = <3300000>;