diff mbox

[v4,3/3] ARM: tegra: correct Colibri T20 regulator settings

Message ID fc7440a2f4bf9ab95e47a911c0e0b3b6a2250356.1386108712.git.stefan@agner.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Stefan Agner Dec. 3, 2013, 10:18 p.m. UTC
Set the parent of the regulators LDO2 to LDO9 according to the
schematic. Set the base voltage to 3.3V, there is only 3.3V on the
module itself.

Set the Core and CPU voltage to the specified voltages of 1.2V and
1.0V respectivly.

LDO6 should deliver 2.85V. The attached peripherals were not in
use so far.

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 arch/arm/boot/dts/tegra20-colibri-512.dtsi | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

Comments

Lucas Stach Dec. 4, 2013, 11:52 a.m. UTC | #1
Am Dienstag, den 03.12.2013, 23:18 +0100 schrieb Stefan Agner:
> Set the parent of the regulators LDO2 to LDO9 according to the
> schematic. Set the base voltage to 3.3V, there is only 3.3V on the
> module itself.
> 
> Set the Core and CPU voltage to the specified voltages of 1.2V and
> 1.0V respectivly.
> 
> LDO6 should deliver 2.85V. The attached peripherals were not in
> use so far.
> 
> Signed-off-by: Stefan Agner <stefan@agner.ch>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>

> ---
>  arch/arm/boot/dts/tegra20-colibri-512.dtsi | 30 +++++++++++++++---------------
>  1 file changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
> index cbe89ff..51e0880 100644
> --- a/arch/arm/boot/dts/tegra20-colibri-512.dtsi
> +++ b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
> @@ -225,15 +225,15 @@
>  			#gpio-cells = <2>;
>  			gpio-controller;
>  
> -			sys-supply = <&vdd_5v0_reg>;
> +			sys-supply = <&vdd_3v3_reg>;
>  			vin-sm0-supply = <&sys_reg>;
>  			vin-sm1-supply = <&sys_reg>;
>  			vin-sm2-supply = <&sys_reg>;
>  			vinldo01-supply = <&sm2_reg>;
> -			vinldo23-supply = <&sm2_reg>;
> -			vinldo4-supply = <&sm2_reg>;
> -			vinldo678-supply = <&sm2_reg>;
> -			vinldo9-supply = <&sm2_reg>;
> +			vinldo23-supply = <&vdd_3v3_reg>;
> +			vinldo4-supply = <&vdd_3v3_reg>;
> +			vinldo678-supply = <&vdd_3v3_reg>;
> +			vinldo9-supply = <&vdd_3v3_reg>;
>  
>  			regulators {
>  				#address-cells = <1>;
> @@ -250,8 +250,8 @@
>  					reg = <1>;
>  					regulator-compatible = "sm0";
>  					regulator-name = "vdd_sm0,vdd_core";
> -					regulator-min-microvolt = <1275000>;
> -					regulator-max-microvolt = <1275000>;
> +					regulator-min-microvolt = <1200000>;
> +					regulator-max-microvolt = <1200000>;
>  					regulator-always-on;
>  				};
>  
> @@ -259,8 +259,8 @@
>  					reg = <2>;
>  					regulator-compatible = "sm1";
>  					regulator-name = "vdd_sm1,vdd_cpu";
> -					regulator-min-microvolt = <1100000>;
> -					regulator-max-microvolt = <1100000>;
> +					regulator-min-microvolt = <1000000>;
> +					regulator-max-microvolt = <1000000>;
>  					regulator-always-on;
>  				};
>  
> @@ -316,8 +316,8 @@
>  					reg = <10>;
>  					regulator-compatible = "ldo6";
>  					regulator-name = "vdd_ldo6,avdd_vdac,vddio_vi,vddio_cam";
> -					regulator-min-microvolt = <1800000>;
> -					regulator-max-microvolt = <1800000>;
> +					regulator-min-microvolt = <2850000>;
> +					regulator-max-microvolt = <2850000>;
>  				};
>  
>  				hdmi_vdd_reg: regulator@11 {
> @@ -504,12 +504,12 @@
>  		#address-cells = <1>;
>  		#size-cells = <0>;
>  
> -		vdd_5v0_reg: regulator@100 {
> +		vdd_3v3_reg: regulator@100 {
>  			compatible = "regulator-fixed";
>  			reg = <100>;
> -			regulator-name = "vdd_5v0";
> -			regulator-min-microvolt = <5000000>;
> -			regulator-max-microvolt = <5000000>;
> +			regulator-name = "vdd_3v3";
> +			regulator-min-microvolt = <3300000>;
> +			regulator-max-microvolt = <3300000>;
>  			regulator-always-on;
>  		};
>
Stephen Warren Dec. 5, 2013, 5:12 p.m. UTC | #2
On 12/03/2013 03:18 PM, Stefan Agner wrote:
> Set the parent of the regulators LDO2 to LDO9 according to the
> schematic. Set the base voltage to 3.3V, there is only 3.3V on the
> module itself.
> 
> Set the Core and CPU voltage to the specified voltages of 1.2V and
> 1.0V respectivly.
> 
> LDO6 should deliver 2.85V. The attached peripherals were not in
> use so far.

Does this depend on patch 1/3 or 2/3, or can I apply it to the Tegra
tree which doesn't include those patches?

If this does depend on patch 1/3 or 2/3... this patch feels a bit big to
apply to the MFD tree. Perhaps patch 1/3 and 2/3 could be applied alone
to a topic branch in the MFD tree so I can merge that into the Tegra
tree in order to apply this?
Stefan Agner Dec. 5, 2013, 5:33 p.m. UTC | #3
Am 2013-12-05 18:12, schrieb Stephen Warren:
> On 12/03/2013 03:18 PM, Stefan Agner wrote:
>> Set the parent of the regulators LDO2 to LDO9 according to the
>> schematic. Set the base voltage to 3.3V, there is only 3.3V on the
>> module itself.
>>
>> Set the Core and CPU voltage to the specified voltages of 1.2V and
>> 1.0V respectivly.
>>
>> LDO6 should deliver 2.85V. The attached peripherals were not in
>> use so far.
> 
> Does this depend on patch 1/3 or 2/3, or can I apply it to the Tegra
> tree which doesn't include those patches?

This patch is independent from 1/3 and 2/3, so you can apply it to the
Tegra tree. The relevant DT change for 2/3 is included in 2/3...
diff mbox

Patch

diff --git a/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
index cbe89ff..51e0880 100644
--- a/arch/arm/boot/dts/tegra20-colibri-512.dtsi
+++ b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
@@ -225,15 +225,15 @@ 
 			#gpio-cells = <2>;
 			gpio-controller;
 
-			sys-supply = <&vdd_5v0_reg>;
+			sys-supply = <&vdd_3v3_reg>;
 			vin-sm0-supply = <&sys_reg>;
 			vin-sm1-supply = <&sys_reg>;
 			vin-sm2-supply = <&sys_reg>;
 			vinldo01-supply = <&sm2_reg>;
-			vinldo23-supply = <&sm2_reg>;
-			vinldo4-supply = <&sm2_reg>;
-			vinldo678-supply = <&sm2_reg>;
-			vinldo9-supply = <&sm2_reg>;
+			vinldo23-supply = <&vdd_3v3_reg>;
+			vinldo4-supply = <&vdd_3v3_reg>;
+			vinldo678-supply = <&vdd_3v3_reg>;
+			vinldo9-supply = <&vdd_3v3_reg>;
 
 			regulators {
 				#address-cells = <1>;
@@ -250,8 +250,8 @@ 
 					reg = <1>;
 					regulator-compatible = "sm0";
 					regulator-name = "vdd_sm0,vdd_core";
-					regulator-min-microvolt = <1275000>;
-					regulator-max-microvolt = <1275000>;
+					regulator-min-microvolt = <1200000>;
+					regulator-max-microvolt = <1200000>;
 					regulator-always-on;
 				};
 
@@ -259,8 +259,8 @@ 
 					reg = <2>;
 					regulator-compatible = "sm1";
 					regulator-name = "vdd_sm1,vdd_cpu";
-					regulator-min-microvolt = <1100000>;
-					regulator-max-microvolt = <1100000>;
+					regulator-min-microvolt = <1000000>;
+					regulator-max-microvolt = <1000000>;
 					regulator-always-on;
 				};
 
@@ -316,8 +316,8 @@ 
 					reg = <10>;
 					regulator-compatible = "ldo6";
 					regulator-name = "vdd_ldo6,avdd_vdac,vddio_vi,vddio_cam";
-					regulator-min-microvolt = <1800000>;
-					regulator-max-microvolt = <1800000>;
+					regulator-min-microvolt = <2850000>;
+					regulator-max-microvolt = <2850000>;
 				};
 
 				hdmi_vdd_reg: regulator@11 {
@@ -504,12 +504,12 @@ 
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		vdd_5v0_reg: regulator@100 {
+		vdd_3v3_reg: regulator@100 {
 			compatible = "regulator-fixed";
 			reg = <100>;
-			regulator-name = "vdd_5v0";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
+			regulator-name = "vdd_3v3";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
 			regulator-always-on;
 		};