diff options
author | Stephen Warren <swarren@nvidia.com> | 2013-07-01 17:07:05 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-07-03 08:40:40 -0400 |
commit | 9f310dedfecdf53974e6e7c21d8d4dc7e8ab8c14 (patch) | |
tree | 024a8f78798eb840bf3cd24e37383f275e6d0345 | |
parent | d81f58753e088b8ce5305df7e2b4510a17159414 (diff) |
ARM: tegra: fix VBUS regulator GPIO polarity in DT
Commit 4c94c8b "ARM: tegra: update device trees for USB binding rework"
added regulator definitions for GPIO-controlled USB VBUS. However, none
of these contained the essential DT property enable-active-high. Add
this so that the regulator definitions are correct.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm/boot/dts/tegra20-seaboard.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra20-trimslice.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra20-whistler.dts | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts index ab177b406b78..365760b33a26 100644 --- a/arch/arm/boot/dts/tegra20-seaboard.dts +++ b/arch/arm/boot/dts/tegra20-seaboard.dts | |||
@@ -828,6 +828,7 @@ | |||
828 | regulator-name = "vdd_vbus_wup1"; | 828 | regulator-name = "vdd_vbus_wup1"; |
829 | regulator-min-microvolt = <5000000>; | 829 | regulator-min-microvolt = <5000000>; |
830 | regulator-max-microvolt = <5000000>; | 830 | regulator-max-microvolt = <5000000>; |
831 | enable-active-high; | ||
831 | gpio = <&gpio 24 0>; /* PD0 */ | 832 | gpio = <&gpio 24 0>; /* PD0 */ |
832 | }; | 833 | }; |
833 | }; | 834 | }; |
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts index 170159910455..ed4b901b0227 100644 --- a/arch/arm/boot/dts/tegra20-trimslice.dts +++ b/arch/arm/boot/dts/tegra20-trimslice.dts | |||
@@ -410,6 +410,7 @@ | |||
410 | regulator-name = "usb1_vbus"; | 410 | regulator-name = "usb1_vbus"; |
411 | regulator-min-microvolt = <5000000>; | 411 | regulator-min-microvolt = <5000000>; |
412 | regulator-max-microvolt = <5000000>; | 412 | regulator-max-microvolt = <5000000>; |
413 | enable-active-high; | ||
413 | gpio = <&gpio 170 0>; /* PV2 */ | 414 | gpio = <&gpio 170 0>; /* PV2 */ |
414 | }; | 415 | }; |
415 | }; | 416 | }; |
diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts index ea078ab8edeb..ab67c94db280 100644 --- a/arch/arm/boot/dts/tegra20-whistler.dts +++ b/arch/arm/boot/dts/tegra20-whistler.dts | |||
@@ -586,6 +586,7 @@ | |||
586 | regulator-name = "vbus1"; | 586 | regulator-name = "vbus1"; |
587 | regulator-min-microvolt = <5000000>; | 587 | regulator-min-microvolt = <5000000>; |
588 | regulator-max-microvolt = <5000000>; | 588 | regulator-max-microvolt = <5000000>; |
589 | enable-active-high; | ||
589 | gpio = <&tca6416 0 0>; /* GPIO_PMU0 */ | 590 | gpio = <&tca6416 0 0>; /* GPIO_PMU0 */ |
590 | }; | 591 | }; |
591 | 592 | ||
@@ -595,6 +596,7 @@ | |||
595 | regulator-name = "vbus3"; | 596 | regulator-name = "vbus3"; |
596 | regulator-min-microvolt = <5000000>; | 597 | regulator-min-microvolt = <5000000>; |
597 | regulator-max-microvolt = <5000000>; | 598 | regulator-max-microvolt = <5000000>; |
599 | enable-active-high; | ||
598 | gpio = <&tca6416 1 0>; /* GPIO_PMU1 */ | 600 | gpio = <&tca6416 1 0>; /* GPIO_PMU1 */ |
599 | }; | 601 | }; |
600 | }; | 602 | }; |