diff options
author | Marcel Ziswiler <marcel@ziswiler.com> | 2014-08-22 15:25:10 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-08-24 14:21:19 -0400 |
commit | caa9eac5bcc835cfd98085fcd3944f44890d8a8f (patch) | |
tree | 00eb089fdcb763b8e9ea071c59a8f7e5b1d75fbb | |
parent | 9d0b1f345e91acd458592d47430142073362b8cc (diff) |
ARM: tegra: apalis/colibri t30: fix on-module 5v0 supplies
Working on Gigabit/PCIe support in U-Boot for Apalis T30 I realised
that the current device tree source includes for our modules only
happen to work due to referencing the on-carrier 5v0 supply from USB
which is not at all available on-module. The modules actually contain
TPS60150 charge pumps to generate the PMIC required 5 volts from the
one and only 3.3 volt module supply. This patch fixes this.
(Note: When back-porting this to v3.16 stable releases, simply drop the
change to tegra30-apalis.dtsi; that file was added in v3.17)
Cc: <stable@vger.kernel.org> #v3.16+
Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/boot/dts/tegra30-apalis.dtsi | 11 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra30-colibri.dtsi | 11 |
2 files changed, 20 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi index 8adaa7871dd3..a5446cba9804 100644 --- a/arch/arm/boot/dts/tegra30-apalis.dtsi +++ b/arch/arm/boot/dts/tegra30-apalis.dtsi | |||
@@ -423,7 +423,7 @@ | |||
423 | vcc4-supply = <&sys_3v3_reg>; | 423 | vcc4-supply = <&sys_3v3_reg>; |
424 | vcc5-supply = <&sys_3v3_reg>; | 424 | vcc5-supply = <&sys_3v3_reg>; |
425 | vcc6-supply = <&vio_reg>; | 425 | vcc6-supply = <&vio_reg>; |
426 | vcc7-supply = <&sys_5v0_reg>; | 426 | vcc7-supply = <&charge_pump_5v0_reg>; |
427 | vccio-supply = <&sys_3v3_reg>; | 427 | vccio-supply = <&sys_3v3_reg>; |
428 | 428 | ||
429 | regulators { | 429 | regulators { |
@@ -674,5 +674,14 @@ | |||
674 | regulator-max-microvolt = <3300000>; | 674 | regulator-max-microvolt = <3300000>; |
675 | regulator-always-on; | 675 | regulator-always-on; |
676 | }; | 676 | }; |
677 | |||
678 | charge_pump_5v0_reg: regulator@101 { | ||
679 | compatible = "regulator-fixed"; | ||
680 | reg = <101>; | ||
681 | regulator-name = "5v0"; | ||
682 | regulator-min-microvolt = <5000000>; | ||
683 | regulator-max-microvolt = <5000000>; | ||
684 | regulator-always-on; | ||
685 | }; | ||
677 | }; | 686 | }; |
678 | }; | 687 | }; |
diff --git a/arch/arm/boot/dts/tegra30-colibri.dtsi b/arch/arm/boot/dts/tegra30-colibri.dtsi index bf16f8e65627..c4ed1bec4d92 100644 --- a/arch/arm/boot/dts/tegra30-colibri.dtsi +++ b/arch/arm/boot/dts/tegra30-colibri.dtsi | |||
@@ -201,7 +201,7 @@ | |||
201 | vcc4-supply = <&sys_3v3_reg>; | 201 | vcc4-supply = <&sys_3v3_reg>; |
202 | vcc5-supply = <&sys_3v3_reg>; | 202 | vcc5-supply = <&sys_3v3_reg>; |
203 | vcc6-supply = <&vio_reg>; | 203 | vcc6-supply = <&vio_reg>; |
204 | vcc7-supply = <&sys_5v0_reg>; | 204 | vcc7-supply = <&charge_pump_5v0_reg>; |
205 | vccio-supply = <&sys_3v3_reg>; | 205 | vccio-supply = <&sys_3v3_reg>; |
206 | 206 | ||
207 | regulators { | 207 | regulators { |
@@ -373,5 +373,14 @@ | |||
373 | regulator-max-microvolt = <3300000>; | 373 | regulator-max-microvolt = <3300000>; |
374 | regulator-always-on; | 374 | regulator-always-on; |
375 | }; | 375 | }; |
376 | |||
377 | charge_pump_5v0_reg: regulator@101 { | ||
378 | compatible = "regulator-fixed"; | ||
379 | reg = <101>; | ||
380 | regulator-name = "5v0"; | ||
381 | regulator-min-microvolt = <5000000>; | ||
382 | regulator-max-microvolt = <5000000>; | ||
383 | regulator-always-on; | ||
384 | }; | ||
376 | }; | 385 | }; |
377 | }; | 386 | }; |