[PATCH] ARM: tegra: Fix typoed ams,ext-control properties

[PATCH] ARM: tegra: Fix typoed ams,ext-control properties

[Tuomas Tynkkynen]

The property for enabling external rail control on the AS3722 is
ams,ext-control, not ams,external-control. Since the external rail
control property was previously being ignored, LP1 suspend on these
boards wasn't actually turning the CPU rail off at all.

Signed-off-by: Tuomas Tynkkynen <ttynkkynen@nvidia.com>
---
So here's a dilemma, either change the existing DTs, change the
binding + driver, or make the driver recognize both properties.
I chose the first one since the old behaviour was broken in the
first place and the old DTs stay as buggy as they were before.

 arch/arm/boot/dts/tegra124-jetson-tk1.dts | 6 +++---
 arch/arm/boot/dts/tegra124-venice2.dts    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index 16082c0..89a772d 100644
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -1461,7 +1461,7 @@
 					regulator-max-microamp = <3500000>;
 					regulator-always-on;
 					regulator-boot-on;
-					ams,external-control = <2>;
+					ams,ext-control = <2>;
 				};
 
 				sd1 {
@@ -1472,7 +1472,7 @@
 					regulator-max-microamp = <2500000>;
 					regulator-always-on;
 					regulator-boot-on;
-					ams,external-control = <1>;
+					ams,ext-control = <1>;
 				};
 
 				vdd_1v35_lp0: sd2 {
@@ -1521,7 +1521,7 @@
 					regulator-max-microvolt = <1050000>;
 					regulator-boot-on;
 					regulator-always-on;
-					ams,external-control = <1>;
+					ams,ext-control = <1>;
 				};
 
 				ldo1 {
diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index f1a5bac..70ad91d 100644
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -682,7 +682,7 @@
 					regulator-max-microamp = <3500000>;
 					regulator-always-on;
 					regulator-boot-on;
-					ams,external-control = <2>;
+					ams,ext-control = <2>;
 				};
 
 				sd1 {
@@ -693,7 +693,7 @@
 					regulator-max-microamp = <2500000>;
 					regulator-always-on;
 					regulator-boot-on;
-					ams,external-control = <1>;
+					ams,ext-control = <1>;
 				};
 
 				vdd_1v35_lp0: sd2 {
@@ -742,7 +742,7 @@
 					regulator-max-microvolt = <1050000>;
 					regulator-boot-on;
 					regulator-always-on;
-					ams,external-control = <1>;
+					ams,ext-control = <1>;
 				};
 
 				ldo1 {
-- 
1.8.1.5

Re: [PATCH] ARM: tegra: Fix typoed ams,ext-control properties

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 900 bytes --]

On Wed, Jul 09, 2014 at 09:53:17PM +0300, Tuomas Tynkkynen wrote:
> The property for enabling external rail control on the AS3722 is
> ams,ext-control, not ams,external-control. Since the external rail
> control property was previously being ignored, LP1 suspend on these
> boards wasn't actually turning the CPU rail off at all.
> 
> Signed-off-by: Tuomas Tynkkynen <ttynkkynen@nvidia.com>
> ---
> So here's a dilemma, either change the existing DTs, change the
> binding + driver, or make the driver recognize both properties.
> I chose the first one since the old behaviour was broken in the
> first place and the old DTs stay as buggy as they were before.
> 
>  arch/arm/boot/dts/tegra124-jetson-tk1.dts | 6 +++---
>  arch/arm/boot/dts/tegra124-venice2.dts    | 6 +++---
>  2 files changed, 6 insertions(+), 6 deletions(-)

Applied to the for-3.17/dt branch. Thanks.

Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]