diff options
-rw-r--r-- | arch/arm/boot/dts/omap3-beagle.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap4-sdp.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/twl4030.dtsi | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/twl6030.dtsi | 26 |
4 files changed, 19 insertions, 19 deletions
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts index cdcb98c7e075..e60cba0ed6f1 100644 --- a/arch/arm/boot/dts/omap3-beagle.dts +++ b/arch/arm/boot/dts/omap3-beagle.dts | |||
@@ -27,7 +27,7 @@ | |||
27 | interrupts = <7>; /* SYS_NIRQ cascaded to intc */ | 27 | interrupts = <7>; /* SYS_NIRQ cascaded to intc */ |
28 | interrupt-parent = <&intc>; | 28 | interrupt-parent = <&intc>; |
29 | 29 | ||
30 | vsim: regulator@10 { | 30 | vsim: regulator-vsim { |
31 | compatible = "ti,twl4030-vsim"; | 31 | compatible = "ti,twl4030-vsim"; |
32 | regulator-min-microvolt = <1800000>; | 32 | regulator-min-microvolt = <1800000>; |
33 | regulator-max-microvolt = <3000000>; | 33 | regulator-max-microvolt = <3000000>; |
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts index 72216e932fc0..dbcdc4a79491 100644 --- a/arch/arm/boot/dts/omap4-sdp.dts +++ b/arch/arm/boot/dts/omap4-sdp.dts | |||
@@ -18,7 +18,7 @@ | |||
18 | reg = <0x80000000 0x40000000>; /* 1 GB */ | 18 | reg = <0x80000000 0x40000000>; /* 1 GB */ |
19 | }; | 19 | }; |
20 | 20 | ||
21 | vdd_eth: fixedregulator@0 { | 21 | vdd_eth: fixedregulator-vdd-eth { |
22 | compatible = "regulator-fixed"; | 22 | compatible = "regulator-fixed"; |
23 | regulator-name = "VDD_ETH"; | 23 | regulator-name = "VDD_ETH"; |
24 | regulator-min-microvolt = <3300000>; | 24 | regulator-min-microvolt = <3300000>; |
@@ -28,7 +28,7 @@ | |||
28 | regulator-boot-on; | 28 | regulator-boot-on; |
29 | }; | 29 | }; |
30 | 30 | ||
31 | vbat: fixedregulator@2 { | 31 | vbat: fixedregulator-vbat { |
32 | compatible = "regulator-fixed"; | 32 | compatible = "regulator-fixed"; |
33 | regulator-name = "VBAT"; | 33 | regulator-name = "VBAT"; |
34 | regulator-min-microvolt = <3750000>; | 34 | regulator-min-microvolt = <3750000>; |
diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi index 22f4d1394ed3..ff000172c93c 100644 --- a/arch/arm/boot/dts/twl4030.dtsi +++ b/arch/arm/boot/dts/twl4030.dtsi | |||
@@ -19,19 +19,19 @@ | |||
19 | interrupts = <11>; | 19 | interrupts = <11>; |
20 | }; | 20 | }; |
21 | 21 | ||
22 | vdac: regulator@0 { | 22 | vdac: regulator-vdac { |
23 | compatible = "ti,twl4030-vdac"; | 23 | compatible = "ti,twl4030-vdac"; |
24 | regulator-min-microvolt = <1800000>; | 24 | regulator-min-microvolt = <1800000>; |
25 | regulator-max-microvolt = <1800000>; | 25 | regulator-max-microvolt = <1800000>; |
26 | }; | 26 | }; |
27 | 27 | ||
28 | vpll2: regulator@1 { | 28 | vpll2: regulator-vpll2 { |
29 | compatible = "ti,twl4030-vpll2"; | 29 | compatible = "ti,twl4030-vpll2"; |
30 | regulator-min-microvolt = <1800000>; | 30 | regulator-min-microvolt = <1800000>; |
31 | regulator-max-microvolt = <1800000>; | 31 | regulator-max-microvolt = <1800000>; |
32 | }; | 32 | }; |
33 | 33 | ||
34 | vmmc1: regulator@2 { | 34 | vmmc1: regulator-vmmc1 { |
35 | compatible = "ti,twl4030-vmmc1"; | 35 | compatible = "ti,twl4030-vmmc1"; |
36 | regulator-min-microvolt = <1850000>; | 36 | regulator-min-microvolt = <1850000>; |
37 | regulator-max-microvolt = <3150000>; | 37 | regulator-max-microvolt = <3150000>; |
diff --git a/arch/arm/boot/dts/twl6030.dtsi b/arch/arm/boot/dts/twl6030.dtsi index d351b27d7213..123e2c40218a 100644 --- a/arch/arm/boot/dts/twl6030.dtsi +++ b/arch/arm/boot/dts/twl6030.dtsi | |||
@@ -20,70 +20,70 @@ | |||
20 | interrupts = <11>; | 20 | interrupts = <11>; |
21 | }; | 21 | }; |
22 | 22 | ||
23 | vaux1: regulator@0 { | 23 | vaux1: regulator-vaux1 { |
24 | compatible = "ti,twl6030-vaux1"; | 24 | compatible = "ti,twl6030-vaux1"; |
25 | regulator-min-microvolt = <1000000>; | 25 | regulator-min-microvolt = <1000000>; |
26 | regulator-max-microvolt = <3000000>; | 26 | regulator-max-microvolt = <3000000>; |
27 | }; | 27 | }; |
28 | 28 | ||
29 | vaux2: regulator@1 { | 29 | vaux2: regulator-vaux2 { |
30 | compatible = "ti,twl6030-vaux2"; | 30 | compatible = "ti,twl6030-vaux2"; |
31 | regulator-min-microvolt = <1200000>; | 31 | regulator-min-microvolt = <1200000>; |
32 | regulator-max-microvolt = <2800000>; | 32 | regulator-max-microvolt = <2800000>; |
33 | }; | 33 | }; |
34 | 34 | ||
35 | vaux3: regulator@2 { | 35 | vaux3: regulator-vaux3 { |
36 | compatible = "ti,twl6030-vaux3"; | 36 | compatible = "ti,twl6030-vaux3"; |
37 | regulator-min-microvolt = <1000000>; | 37 | regulator-min-microvolt = <1000000>; |
38 | regulator-max-microvolt = <3000000>; | 38 | regulator-max-microvolt = <3000000>; |
39 | }; | 39 | }; |
40 | 40 | ||
41 | vmmc: regulator@3 { | 41 | vmmc: regulator-vmmc { |
42 | compatible = "ti,twl6030-vmmc"; | 42 | compatible = "ti,twl6030-vmmc"; |
43 | regulator-min-microvolt = <1200000>; | 43 | regulator-min-microvolt = <1200000>; |
44 | regulator-max-microvolt = <3000000>; | 44 | regulator-max-microvolt = <3000000>; |
45 | }; | 45 | }; |
46 | 46 | ||
47 | vpp: regulator@4 { | 47 | vpp: regulator-vpp { |
48 | compatible = "ti,twl6030-vpp"; | 48 | compatible = "ti,twl6030-vpp"; |
49 | regulator-min-microvolt = <1800000>; | 49 | regulator-min-microvolt = <1800000>; |
50 | regulator-max-microvolt = <2500000>; | 50 | regulator-max-microvolt = <2500000>; |
51 | }; | 51 | }; |
52 | 52 | ||
53 | vusim: regulator@5 { | 53 | vusim: regulator-vusim { |
54 | compatible = "ti,twl6030-vusim"; | 54 | compatible = "ti,twl6030-vusim"; |
55 | regulator-min-microvolt = <1200000>; | 55 | regulator-min-microvolt = <1200000>; |
56 | regulator-max-microvolt = <2900000>; | 56 | regulator-max-microvolt = <2900000>; |
57 | }; | 57 | }; |
58 | 58 | ||
59 | vdac: regulator@6 { | 59 | vdac: regulator-vdac { |
60 | compatible = "ti,twl6030-vdac"; | 60 | compatible = "ti,twl6030-vdac"; |
61 | }; | 61 | }; |
62 | 62 | ||
63 | vana: regulator@7 { | 63 | vana: regulator-vana { |
64 | compatible = "ti,twl6030-vana"; | 64 | compatible = "ti,twl6030-vana"; |
65 | }; | 65 | }; |
66 | 66 | ||
67 | vcxio: regulator@8 { | 67 | vcxio: regulator-vcxio { |
68 | compatible = "ti,twl6030-vcxio"; | 68 | compatible = "ti,twl6030-vcxio"; |
69 | regulator-always-on; | 69 | regulator-always-on; |
70 | }; | 70 | }; |
71 | 71 | ||
72 | vusb: regulator@9 { | 72 | vusb: regulator-vusb { |
73 | compatible = "ti,twl6030-vusb"; | 73 | compatible = "ti,twl6030-vusb"; |
74 | }; | 74 | }; |
75 | 75 | ||
76 | v1v8: regulator@10 { | 76 | v1v8: regulator-v1v8 { |
77 | compatible = "ti,twl6030-v1v8"; | 77 | compatible = "ti,twl6030-v1v8"; |
78 | regulator-always-on; | 78 | regulator-always-on; |
79 | }; | 79 | }; |
80 | 80 | ||
81 | v2v1: regulator@11 { | 81 | v2v1: regulator-v2v1 { |
82 | compatible = "ti,twl6030-v2v1"; | 82 | compatible = "ti,twl6030-v2v1"; |
83 | regulator-always-on; | 83 | regulator-always-on; |
84 | }; | 84 | }; |
85 | 85 | ||
86 | clk32kg: regulator@12 { | 86 | clk32kg: regulator-clk32kg { |
87 | compatible = "ti,twl6030-clk32kg"; | 87 | compatible = "ti,twl6030-clk32kg"; |
88 | }; | 88 | }; |
89 | }; | 89 | }; |