diff options
author | Nishanth Menon <nm@ti.com> | 2016-05-06 09:37:57 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2016-05-12 16:45:33 -0400 |
commit | 3d9f77be066ccf8d364928154552ed6ca910793b (patch) | |
tree | b9017975b1b5f37586e9ba3acb14b49e77e2788a | |
parent | 10ce2404ccab6828f86fb038e4888837f49f9f48 (diff) |
ARM: dts: am57xx-idk-common: Fix input supply names
Palmas Regulator is an exception and does not follow the standard
"vin-supply" common definitions for all regulators, as a result of this,
the input supplies are not reported to regulator framework, with the
obvious result of not being appropriately mapped. Fix the same.
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/boot/dts/am57xx-idk-common.dtsi | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi b/arch/arm/boot/dts/am57xx-idk-common.dtsi index b01a5948cdd0..0e63b9dff6e7 100644 --- a/arch/arm/boot/dts/am57xx-idk-common.dtsi +++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi | |||
@@ -60,10 +60,26 @@ | |||
60 | 60 | ||
61 | tps659038_pmic { | 61 | tps659038_pmic { |
62 | compatible = "ti,tps659038-pmic"; | 62 | compatible = "ti,tps659038-pmic"; |
63 | |||
64 | smps12-in-supply = <&vmain>; | ||
65 | smps3-in-supply = <&vmain>; | ||
66 | smps45-in-supply = <&vmain>; | ||
67 | smps6-in-supply = <&vmain>; | ||
68 | smps7-in-supply = <&vmain>; | ||
69 | smps8-in-supply = <&vmain>; | ||
70 | smps9-in-supply = <&vmain>; | ||
71 | ldo1-in-supply = <&vmain>; | ||
72 | ldo2-in-supply = <&vmain>; | ||
73 | ldo3-in-supply = <&vmain>; | ||
74 | ldo4-in-supply = <&vmain>; | ||
75 | ldo9-in-supply = <&vmain>; | ||
76 | ldoln-in-supply = <&vmain>; | ||
77 | ldousb-in-supply = <&vmain>; | ||
78 | ldortc-in-supply = <&vmain>; | ||
79 | |||
63 | regulators { | 80 | regulators { |
64 | smps12_reg: smps12 { | 81 | smps12_reg: smps12 { |
65 | /* VDD_MPU */ | 82 | /* VDD_MPU */ |
66 | vin-supply = <&vmain>; | ||
67 | regulator-name = "smps12"; | 83 | regulator-name = "smps12"; |
68 | regulator-min-microvolt = <850000>; | 84 | regulator-min-microvolt = <850000>; |
69 | regulator-max-microvolt = <1250000>; | 85 | regulator-max-microvolt = <1250000>; |
@@ -73,7 +89,6 @@ | |||
73 | 89 | ||
74 | smps3_reg: smps3 { | 90 | smps3_reg: smps3 { |
75 | /* VDD_DDR EMIF1 EMIF2 */ | 91 | /* VDD_DDR EMIF1 EMIF2 */ |
76 | vin-supply = <&vmain>; | ||
77 | regulator-name = "smps3"; | 92 | regulator-name = "smps3"; |
78 | regulator-min-microvolt = <1350000>; | 93 | regulator-min-microvolt = <1350000>; |
79 | regulator-max-microvolt = <1350000>; | 94 | regulator-max-microvolt = <1350000>; |
@@ -84,7 +99,6 @@ | |||
84 | smps45_reg: smps45 { | 99 | smps45_reg: smps45 { |
85 | /* VDD_DSPEVE on AM572 */ | 100 | /* VDD_DSPEVE on AM572 */ |
86 | /* VDD_IVA + VDD_DSP on AM571 */ | 101 | /* VDD_IVA + VDD_DSP on AM571 */ |
87 | vin-supply = <&vmain>; | ||
88 | regulator-name = "smps45"; | 102 | regulator-name = "smps45"; |
89 | regulator-min-microvolt = <850000>; | 103 | regulator-min-microvolt = <850000>; |
90 | regulator-max-microvolt = <1250000>; | 104 | regulator-max-microvolt = <1250000>; |
@@ -94,7 +108,6 @@ | |||
94 | 108 | ||
95 | smps6_reg: smps6 { | 109 | smps6_reg: smps6 { |
96 | /* VDD_GPU */ | 110 | /* VDD_GPU */ |
97 | vin-supply = <&vmain>; | ||
98 | regulator-name = "smps6"; | 111 | regulator-name = "smps6"; |
99 | regulator-min-microvolt = <850000>; | 112 | regulator-min-microvolt = <850000>; |
100 | regulator-max-microvolt = <1250000>; | 113 | regulator-max-microvolt = <1250000>; |
@@ -104,7 +117,6 @@ | |||
104 | 117 | ||
105 | smps7_reg: smps7 { | 118 | smps7_reg: smps7 { |
106 | /* VDD_CORE */ | 119 | /* VDD_CORE */ |
107 | vin-supply = <&vmain>; | ||
108 | regulator-name = "smps7"; | 120 | regulator-name = "smps7"; |
109 | regulator-min-microvolt = <850000>; | 121 | regulator-min-microvolt = <850000>; |
110 | regulator-max-microvolt = <1150000>; | 122 | regulator-max-microvolt = <1150000>; |
@@ -115,13 +127,11 @@ | |||
115 | smps8_reg: smps8 { | 127 | smps8_reg: smps8 { |
116 | /* 5728 - VDD_IVAHD */ | 128 | /* 5728 - VDD_IVAHD */ |
117 | /* 5718 - N.C. test point */ | 129 | /* 5718 - N.C. test point */ |
118 | vin-supply = <&vmain>; | ||
119 | regulator-name = "smps8"; | 130 | regulator-name = "smps8"; |
120 | }; | 131 | }; |
121 | 132 | ||
122 | smps9_reg: smps9 { | 133 | smps9_reg: smps9 { |
123 | /* VDD_3_3D */ | 134 | /* VDD_3_3D */ |
124 | vin-supply = <&vmain>; | ||
125 | regulator-name = "smps9"; | 135 | regulator-name = "smps9"; |
126 | regulator-min-microvolt = <3300000>; | 136 | regulator-min-microvolt = <3300000>; |
127 | regulator-max-microvolt = <3300000>; | 137 | regulator-max-microvolt = <3300000>; |
@@ -132,7 +142,6 @@ | |||
132 | ldo1_reg: ldo1 { | 142 | ldo1_reg: ldo1 { |
133 | /* VDDSHV8 - VSDMMC */ | 143 | /* VDDSHV8 - VSDMMC */ |
134 | /* NOTE: on rev 1.3a, data supply */ | 144 | /* NOTE: on rev 1.3a, data supply */ |
135 | vin-supply = <&vmain>; | ||
136 | regulator-name = "ldo1"; | 145 | regulator-name = "ldo1"; |
137 | regulator-min-microvolt = <1800000>; | 146 | regulator-min-microvolt = <1800000>; |
138 | regulator-max-microvolt = <3300000>; | 147 | regulator-max-microvolt = <3300000>; |
@@ -142,7 +151,6 @@ | |||
142 | 151 | ||
143 | ldo2_reg: ldo2 { | 152 | ldo2_reg: ldo2 { |
144 | /* VDDSH18V */ | 153 | /* VDDSH18V */ |
145 | vin-supply = <&vmain>; | ||
146 | regulator-name = "ldo2"; | 154 | regulator-name = "ldo2"; |
147 | regulator-min-microvolt = <1800000>; | 155 | regulator-min-microvolt = <1800000>; |
148 | regulator-max-microvolt = <1800000>; | 156 | regulator-max-microvolt = <1800000>; |
@@ -152,7 +160,6 @@ | |||
152 | 160 | ||
153 | ldo3_reg: ldo3 { | 161 | ldo3_reg: ldo3 { |
154 | /* R1.3a 572x V1_8PHY_LDO3: USB, SATA */ | 162 | /* R1.3a 572x V1_8PHY_LDO3: USB, SATA */ |
155 | vin-supply = <&vmain>; | ||
156 | regulator-name = "ldo3"; | 163 | regulator-name = "ldo3"; |
157 | regulator-min-microvolt = <1800000>; | 164 | regulator-min-microvolt = <1800000>; |
158 | regulator-max-microvolt = <1800000>; | 165 | regulator-max-microvolt = <1800000>; |
@@ -162,7 +169,6 @@ | |||
162 | 169 | ||
163 | ldo4_reg: ldo4 { | 170 | ldo4_reg: ldo4 { |
164 | /* R1.3a 572x V1_8PHY_LDO4: PCIE, HDMI*/ | 171 | /* R1.3a 572x V1_8PHY_LDO4: PCIE, HDMI*/ |
165 | vin-supply = <&vmain>; | ||
166 | regulator-name = "ldo4"; | 172 | regulator-name = "ldo4"; |
167 | regulator-min-microvolt = <1800000>; | 173 | regulator-min-microvolt = <1800000>; |
168 | regulator-max-microvolt = <1800000>; | 174 | regulator-max-microvolt = <1800000>; |
@@ -174,7 +180,6 @@ | |||
174 | 180 | ||
175 | ldo9_reg: ldo9 { | 181 | ldo9_reg: ldo9 { |
176 | /* VDD_RTC */ | 182 | /* VDD_RTC */ |
177 | vin-supply = <&vmain>; | ||
178 | regulator-name = "ldo9"; | 183 | regulator-name = "ldo9"; |
179 | regulator-min-microvolt = <840000>; | 184 | regulator-min-microvolt = <840000>; |
180 | regulator-max-microvolt = <1160000>; | 185 | regulator-max-microvolt = <1160000>; |
@@ -184,7 +189,6 @@ | |||
184 | 189 | ||
185 | ldoln_reg: ldoln { | 190 | ldoln_reg: ldoln { |
186 | /* VDDA_1V8_PLL */ | 191 | /* VDDA_1V8_PLL */ |
187 | vin-supply = <&vmain>; | ||
188 | regulator-name = "ldoln"; | 192 | regulator-name = "ldoln"; |
189 | regulator-min-microvolt = <1800000>; | 193 | regulator-min-microvolt = <1800000>; |
190 | regulator-max-microvolt = <1800000>; | 194 | regulator-max-microvolt = <1800000>; |
@@ -194,7 +198,6 @@ | |||
194 | 198 | ||
195 | ldousb_reg: ldousb { | 199 | ldousb_reg: ldousb { |
196 | /* VDDA_3V_USB: VDDA_USBHS33 */ | 200 | /* VDDA_3V_USB: VDDA_USBHS33 */ |
197 | vin-supply = <&vmain>; | ||
198 | regulator-name = "ldousb"; | 201 | regulator-name = "ldousb"; |
199 | regulator-min-microvolt = <3300000>; | 202 | regulator-min-microvolt = <3300000>; |
200 | regulator-max-microvolt = <3300000>; | 203 | regulator-max-microvolt = <3300000>; |
@@ -204,7 +207,6 @@ | |||
204 | 207 | ||
205 | ldortc_reg: ldortc { | 208 | ldortc_reg: ldortc { |
206 | /* VDDA_RTC */ | 209 | /* VDDA_RTC */ |
207 | vin-supply = <&vmain>; | ||
208 | regulator-name = "ldortc"; | 210 | regulator-name = "ldortc"; |
209 | regulator-min-microvolt = <1800000>; | 211 | regulator-min-microvolt = <1800000>; |
210 | regulator-max-microvolt = <1800000>; | 212 | regulator-max-microvolt = <1800000>; |