diff options
author | Thierry Reding <treding@nvidia.com> | 2019-01-22 09:45:05 -0500 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2019-04-17 10:48:44 -0400 |
commit | 2f03e39b5bfe41f3a0d9a8b01231e7e5045cb9c4 (patch) | |
tree | ffba121b52b11a1d7ecd0faf23a82b11d57ee44c | |
parent | 72f8ae3f8d6dbde8d37e597489f9813c597e846b (diff) |
arm64: tegra: Remove regulator hacks on Jetson TX2
Various regulators were marked as always-on for Jetson TX2. At this
point, all of the regulators are properly hooked up, so this workaround
is no longer required.
Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r-- | arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi b/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi index 952062f0b9a9..64686b033c38 100644 --- a/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | |||
@@ -268,43 +268,30 @@ | |||
268 | regulator-name = "AVDD_DSI_CSI_1V2"; | 268 | regulator-name = "AVDD_DSI_CSI_1V2"; |
269 | regulator-min-microvolt = <1200000>; | 269 | regulator-min-microvolt = <1200000>; |
270 | regulator-max-microvolt = <1200000>; | 270 | regulator-max-microvolt = <1200000>; |
271 | /* XXX */ | ||
272 | regulator-always-on; | ||
273 | regulator-boot-on; | ||
274 | }; | 271 | }; |
275 | 272 | ||
276 | vdd_1v8: sd2 { | 273 | vdd_1v8: sd2 { |
277 | regulator-name = "VDD_1V8"; | 274 | regulator-name = "VDD_1V8"; |
278 | regulator-min-microvolt = <1800000>; | 275 | regulator-min-microvolt = <1800000>; |
279 | regulator-max-microvolt = <1800000>; | 276 | regulator-max-microvolt = <1800000>; |
280 | /* XXX */ | ||
281 | regulator-always-on; | ||
282 | regulator-boot-on; | ||
283 | }; | 277 | }; |
284 | 278 | ||
285 | vdd_3v3_sys: sd3 { | 279 | vdd_3v3_sys: sd3 { |
286 | regulator-name = "VDD_3V3_SYS"; | 280 | regulator-name = "VDD_3V3_SYS"; |
287 | regulator-min-microvolt = <3300000>; | 281 | regulator-min-microvolt = <3300000>; |
288 | regulator-max-microvolt = <3300000>; | 282 | regulator-max-microvolt = <3300000>; |
289 | /* XXX */ | ||
290 | regulator-always-on; | ||
291 | regulator-boot-on; | ||
292 | }; | 283 | }; |
293 | 284 | ||
294 | vdd_1v8_pll: ldo0 { | 285 | vdd_1v8_pll: ldo0 { |
295 | regulator-name = "VDD_1V8_AP_PLL"; | 286 | regulator-name = "VDD_1V8_AP_PLL"; |
296 | regulator-min-microvolt = <1800000>; | 287 | regulator-min-microvolt = <1800000>; |
297 | regulator-max-microvolt = <1800000>; | 288 | regulator-max-microvolt = <1800000>; |
298 | /* XXX */ | ||
299 | regulator-always-on; | ||
300 | regulator-boot-on; | ||
301 | }; | 289 | }; |
302 | 290 | ||
303 | ldo2 { | 291 | ldo2 { |
304 | regulator-name = "VDDIO_3V3_AOHV"; | 292 | regulator-name = "VDDIO_3V3_AOHV"; |
305 | regulator-min-microvolt = <3300000>; | 293 | regulator-min-microvolt = <3300000>; |
306 | regulator-max-microvolt = <3300000>; | 294 | regulator-max-microvolt = <3300000>; |
307 | /* XXX */ | ||
308 | regulator-always-on; | 295 | regulator-always-on; |
309 | regulator-boot-on; | 296 | regulator-boot-on; |
310 | }; | 297 | }; |
@@ -331,18 +318,12 @@ | |||
331 | regulator-name = "VDD_HDMI_1V05"; | 318 | regulator-name = "VDD_HDMI_1V05"; |
332 | regulator-min-microvolt = <1050000>; | 319 | regulator-min-microvolt = <1050000>; |
333 | regulator-max-microvolt = <1050000>; | 320 | regulator-max-microvolt = <1050000>; |
334 | /* XXX */ | ||
335 | regulator-always-on; | ||
336 | regulator-boot-on; | ||
337 | }; | 321 | }; |
338 | 322 | ||
339 | vdd_pex: ldo8 { | 323 | vdd_pex: ldo8 { |
340 | regulator-name = "VDD_PEX_1V05"; | 324 | regulator-name = "VDD_PEX_1V05"; |
341 | regulator-min-microvolt = <1050000>; | 325 | regulator-min-microvolt = <1050000>; |
342 | regulator-max-microvolt = <1050000>; | 326 | regulator-max-microvolt = <1050000>; |
343 | /* XXX */ | ||
344 | regulator-always-on; | ||
345 | regulator-boot-on; | ||
346 | }; | 327 | }; |
347 | }; | 328 | }; |
348 | }; | 329 | }; |
@@ -390,10 +371,6 @@ | |||
390 | regulator-min-microvolt = <1800000>; | 371 | regulator-min-microvolt = <1800000>; |
391 | regulator-max-microvolt = <1800000>; | 372 | regulator-max-microvolt = <1800000>; |
392 | 373 | ||
393 | /* XXX */ | ||
394 | regulator-always-on; | ||
395 | regulator-boot-on; | ||
396 | |||
397 | gpio = <&pmic 1 GPIO_ACTIVE_HIGH>; | 374 | gpio = <&pmic 1 GPIO_ACTIVE_HIGH>; |
398 | enable-active-high; | 375 | enable-active-high; |
399 | 376 | ||