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

ARM: dts: am335x-wega: Clean up regulators

Cleaned up the regulators on the wega board. Created a simple bus,
renamed the regulators according to the schematics and added missing
regulator on wega.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>

authored by

Teresa Remmet and committed by
Tony Lindgren
c72bfb88 863987af

+31 -18
+19 -17
arch/arm/boot/dts/am335x-phycore-som.dtsi
··· 29 29 reg = <0x80000000 0x10000000>; /* 256 MB */ 30 30 }; 31 31 32 - vbat: fixedregulator@0 { 33 - compatible = "regulator-fixed"; 32 + regulators { 33 + compatible = "simple-bus"; 34 + 35 + vcc5v: fixedregulator@0 { 36 + compatible = "regulator-fixed"; 37 + regulator-name = "vcc5v"; 38 + regulator-min-microvolt = <5000000>; 39 + regulator-max-microvolt = <5000000>; 40 + regulator-boot-on; 41 + regulator-always-on; 42 + }; 34 43 }; 35 44 }; 36 45 ··· 242 233 #include "tps65910.dtsi" 243 234 244 235 &tps { 245 - vcc1-supply = <&vbat>; 246 - vcc2-supply = <&vbat>; 247 - vcc3-supply = <&vbat>; 248 - vcc4-supply = <&vbat>; 249 - vcc5-supply = <&vbat>; 250 - vcc6-supply = <&vbat>; 251 - vcc7-supply = <&vbat>; 252 - vccio-supply = <&vbat>; 236 + vcc1-supply = <&vcc5v>; 237 + vcc2-supply = <&vcc5v>; 238 + vcc3-supply = <&vcc5v>; 239 + vcc4-supply = <&vcc5v>; 240 + vcc5-supply = <&vcc5v>; 241 + vcc6-supply = <&vcc5v>; 242 + vcc7-supply = <&vcc5v>; 243 + vccio-supply = <&vcc5v>; 253 244 254 245 regulators { 255 246 vrtc_reg: regulator@0 { ··· 318 309 regulator-always-on; 319 310 }; 320 311 }; 321 - }; 322 - 323 - &vbat { 324 - regulator-name = "vbat"; 325 - regulator-min-microvolt = <5000000>; 326 - regulator-max-microvolt = <5000000>; 327 - regulator-boot-on; 328 312 }; 329 313 330 314 /* SPI Busses */
+12 -1
arch/arm/boot/dts/am335x-wega.dtsi
··· 11 11 model = "Phytec AM335x phyBOARD-WEGA"; 12 12 compatible = "phytec,am335x-wega", "phytec,am335x-phycore-som", "ti,am33xx"; 13 13 14 + regulators { 15 + compatible = "simple-bus"; 16 + 17 + vcc3v3: fixedregulator@1 { 18 + compatible = "regulator-fixed"; 19 + regulator-name = "vcc3v3"; 20 + regulator-min-microvolt = <3300000>; 21 + regulator-max-microvolt = <3300000>; 22 + regulator-boot-on; 23 + }; 24 + }; 14 25 }; 15 26 16 27 /* CAN Busses */ ··· 91 80 }; 92 81 93 82 &mmc1 { 94 - vmmc-supply = <&vmmc_reg>; 83 + vmmc-supply = <&vcc3v3>; 95 84 bus-width = <4>; 96 85 pinctrl-names = "default"; 97 86 pinctrl-0 = <&mmc1_pins>;