diff mbox

[v6,5/7] ARM: dts: add pbias dt node

Message ID 1387456720-7202-6-git-send-email-balajitk@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Balaji T K Dec. 19, 2013, 12:38 p.m. UTC
Add pbias regulator node as a child of system control
module - syscon.

Signed-off-by: Balaji T K <balajitk@ti.com>
---
Added control module region which has pbias register.
remaining control module region for syscon can be added later when needed.

 arch/arm/boot/dts/dra7.dtsi     |   19 +++++++++++++++++++
 arch/arm/boot/dts/omap2430.dtsi |   19 +++++++++++++++++++
 arch/arm/boot/dts/omap3.dtsi    |   19 +++++++++++++++++++
 arch/arm/boot/dts/omap4.dtsi    |   19 +++++++++++++++++++
 arch/arm/boot/dts/omap5.dtsi    |   19 +++++++++++++++++++
 5 files changed, 95 insertions(+), 0 deletions(-)

Comments

Tony Lindgren Dec. 19, 2013, 4:33 p.m. UTC | #1
* Balaji T K <balajitk@ti.com> [131219 04:40]:
> @@ -485,6 +503,7 @@
>  			dmas = <&sdma 61>, <&sdma 62>;
>  			dma-names = "tx", "rx";
>  			status = "disabled";
> +			pbias-supply = <&pbias_mmc_reg>;
>  		};
>  
>  		mmc2: mmc@480b4000 {
> diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi
> index d624345..f127901 100644
> --- a/arch/arm/boot/dts/omap2430.dtsi
> +++ b/arch/arm/boot/dts/omap2430.dtsi
> @@ -29,6 +29,24 @@
>  			pinctrl-single,function-mask = <0x3f>;
>  		};
>  
> +		omap2_scm_general: tisyscon@49002270 {
> +			compatible = "ti,control-syscon", "syscon", "simple-bus";
> +			reg = <0x49002270 0x240>;
> +			#address-cells = <1>;
> +			#size-cells = <1>;
> +			ranges;
> +			pbias_regulator: pbias_regulator {
> +				compatible = "ti,pbias-omap";
> +				reg = <0x230 0x4>;
> +				pbias_mmc_reg: pbias_mmc_omap3 {
> +					regulator-name = "pbias_mmc_omap3";
> +					regulator-min-microvolt = <1800000>;
> +					regulator-max-microvolt = <3000000>;
> +					regulator-enable-ramp-delay = <100>;
> +				};
> +			};
> +		};
> +
>  		gpio1: gpio@4900c000 {
>  			compatible = "ti,omap2-gpio";
>  			reg = <0x4900c000 0x200>;

Here too you may need to set up pbias_mmc_omap2430?

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Balaji T K Dec. 20, 2013, 11:40 a.m. UTC | #2
On Thursday 19 December 2013 10:03 PM, Tony Lindgren wrote:
> * Balaji T K <balajitk@ti.com> [131219 04:40]:
>> @@ -485,6 +503,7 @@
>>   			dmas = <&sdma 61>, <&sdma 62>;
>>   			dma-names = "tx", "rx";
>>   			status = "disabled";
>> +			pbias-supply = <&pbias_mmc_reg>;
>>   		};
>>
>>   		mmc2: mmc@480b4000 {
>> diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi
>> index d624345..f127901 100644
>> --- a/arch/arm/boot/dts/omap2430.dtsi
>> +++ b/arch/arm/boot/dts/omap2430.dtsi
>> @@ -29,6 +29,24 @@
>>   			pinctrl-single,function-mask = <0x3f>;
>>   		};
>>
>> +		omap2_scm_general: tisyscon@49002270 {
>> +			compatible = "ti,control-syscon", "syscon", "simple-bus";
>> +			reg = <0x49002270 0x240>;
>> +			#address-cells = <1>;
>> +			#size-cells = <1>;
>> +			ranges;
>> +			pbias_regulator: pbias_regulator {
>> +				compatible = "ti,pbias-omap";
>> +				reg = <0x230 0x4>;
>> +				pbias_mmc_reg: pbias_mmc_omap3 {
>> +					regulator-name = "pbias_mmc_omap3";
>> +					regulator-min-microvolt = <1800000>;
>> +					regulator-max-microvolt = <3000000>;
>> +					regulator-enable-ramp-delay = <100>;
>> +				};
>> +			};
>> +		};
>> +
>>   		gpio1: gpio@4900c000 {
>>   			compatible = "ti,omap2-gpio";
>>   			reg = <0x4900c000 0x200>;
>
> Here too you may need to set up pbias_mmc_omap2430?
>

2430 pbias reg config is same as 3430/3630 w.r.t to mmc pbias i/o,
hence using the same name, if you think regulator name needs to be changed
let me know the more appropriate one.
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tony Lindgren Dec. 20, 2013, 3:58 p.m. UTC | #3
* Balaji T K <balajitk@ti.com> [131220 03:41]:
> On Thursday 19 December 2013 10:03 PM, Tony Lindgren wrote:
> >* Balaji T K <balajitk@ti.com> [131219 04:40]:
> >>@@ -485,6 +503,7 @@
> >>  			dmas = <&sdma 61>, <&sdma 62>;
> >>  			dma-names = "tx", "rx";
> >>  			status = "disabled";
> >>+			pbias-supply = <&pbias_mmc_reg>;
> >>  		};
> >>
> >>  		mmc2: mmc@480b4000 {
> >>diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi
> >>index d624345..f127901 100644
> >>--- a/arch/arm/boot/dts/omap2430.dtsi
> >>+++ b/arch/arm/boot/dts/omap2430.dtsi
> >>@@ -29,6 +29,24 @@
> >>  			pinctrl-single,function-mask = <0x3f>;
> >>  		};
> >>
> >>+		omap2_scm_general: tisyscon@49002270 {
> >>+			compatible = "ti,control-syscon", "syscon", "simple-bus";
> >>+			reg = <0x49002270 0x240>;
> >>+			#address-cells = <1>;
> >>+			#size-cells = <1>;
> >>+			ranges;
> >>+			pbias_regulator: pbias_regulator {
> >>+				compatible = "ti,pbias-omap";
> >>+				reg = <0x230 0x4>;
> >>+				pbias_mmc_reg: pbias_mmc_omap3 {
> >>+					regulator-name = "pbias_mmc_omap3";
> >>+					regulator-min-microvolt = <1800000>;
> >>+					regulator-max-microvolt = <3000000>;
> >>+					regulator-enable-ramp-delay = <100>;
> >>+				};
> >>+			};
> >>+		};
> >>+
> >>  		gpio1: gpio@4900c000 {
> >>  			compatible = "ti,omap2-gpio";
> >>  			reg = <0x4900c000 0x200>;
> >
> >Here too you may need to set up pbias_mmc_omap2430?
> >
> 
> 2430 pbias reg config is same as 3430/3630 w.r.t to mmc pbias i/o,
> hence using the same name, if you think regulator name needs to be changed
> let me know the more appropriate one.

If they are compatible then we should use the earliest revision number
which would be 2430 instead of omap3 :)

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Balaji T K Dec. 20, 2013, 4:08 p.m. UTC | #4
On Friday 20 December 2013 09:28 PM, Tony Lindgren wrote:
> * Balaji T K <balajitk@ti.com> [131220 03:41]:
>> On Thursday 19 December 2013 10:03 PM, Tony Lindgren wrote:
>>> * Balaji T K <balajitk@ti.com> [131219 04:40]:
>>>> @@ -485,6 +503,7 @@
>>>>   			dmas = <&sdma 61>, <&sdma 62>;
>>>>   			dma-names = "tx", "rx";
>>>>   			status = "disabled";
>>>> +			pbias-supply = <&pbias_mmc_reg>;
>>>>   		};
>>>>
>>>>   		mmc2: mmc@480b4000 {
>>>> diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi
>>>> index d624345..f127901 100644
>>>> --- a/arch/arm/boot/dts/omap2430.dtsi
>>>> +++ b/arch/arm/boot/dts/omap2430.dtsi
>>>> @@ -29,6 +29,24 @@
>>>>   			pinctrl-single,function-mask = <0x3f>;
>>>>   		};
>>>>
>>>> +		omap2_scm_general: tisyscon@49002270 {
>>>> +			compatible = "ti,control-syscon", "syscon", "simple-bus";
>>>> +			reg = <0x49002270 0x240>;
>>>> +			#address-cells = <1>;
>>>> +			#size-cells = <1>;
>>>> +			ranges;
>>>> +			pbias_regulator: pbias_regulator {
>>>> +				compatible = "ti,pbias-omap";
>>>> +				reg = <0x230 0x4>;
>>>> +				pbias_mmc_reg: pbias_mmc_omap3 {
>>>> +					regulator-name = "pbias_mmc_omap3";
>>>> +					regulator-min-microvolt = <1800000>;
>>>> +					regulator-max-microvolt = <3000000>;
>>>> +					regulator-enable-ramp-delay = <100>;
>>>> +				};
>>>> +			};
>>>> +		};
>>>> +
>>>>   		gpio1: gpio@4900c000 {
>>>>   			compatible = "ti,omap2-gpio";
>>>>   			reg = <0x4900c000 0x200>;
>>>
>>> Here too you may need to set up pbias_mmc_omap2430?
>>>
>>
>> 2430 pbias reg config is same as 3430/3630 w.r.t to mmc pbias i/o,
>> hence using the same name, if you think regulator name needs to be changed
>> let me know the more appropriate one.
>
> If they are compatible then we should use the earliest revision number
> which would be 2430 instead of omap3 :)

I went with most commonly used omap SoC :-)

>
> Tony
>

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index d0df4c4..a599cae 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -110,6 +110,24 @@ 
 			ti,hwmods = "counter_32k";
 		};
 
+		dra7_ctrl_general: tisyscon@4a002e00 {
+			compatible = "ti,control-syscon", "syscon", "simple-bus";
+			reg = <0x4a002e00 0x7c>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges;
+			pbias_regulator: pbias_regulator {
+				compatible = "ti,pbias-omap";
+				reg = <0 0x4>;
+				pbias_mmc_reg: pbias_mmc_omap5 {
+					regulator-name = "pbias_mmc_omap5";
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <3000000>;
+					regulator-enable-ramp-delay = <100>;
+				};
+			};
+		};
+
 		dra7_pmx_core: pinmux@4a003400 {
 			compatible = "pinctrl-single";
 			reg = <0x4a003400 0x0464>;
@@ -485,6 +503,7 @@ 
 			dmas = <&sdma 61>, <&sdma 62>;
 			dma-names = "tx", "rx";
 			status = "disabled";
+			pbias-supply = <&pbias_mmc_reg>;
 		};
 
 		mmc2: mmc@480b4000 {
diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi
index d624345..f127901 100644
--- a/arch/arm/boot/dts/omap2430.dtsi
+++ b/arch/arm/boot/dts/omap2430.dtsi
@@ -29,6 +29,24 @@ 
 			pinctrl-single,function-mask = <0x3f>;
 		};
 
+		omap2_scm_general: tisyscon@49002270 {
+			compatible = "ti,control-syscon", "syscon", "simple-bus";
+			reg = <0x49002270 0x240>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges;
+			pbias_regulator: pbias_regulator {
+				compatible = "ti,pbias-omap";
+				reg = <0x230 0x4>;
+				pbias_mmc_reg: pbias_mmc_omap3 {
+					regulator-name = "pbias_mmc_omap3";
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <3000000>;
+					regulator-enable-ramp-delay = <100>;
+				};
+			};
+		};
+
 		gpio1: gpio@4900c000 {
 			compatible = "ti,omap2-gpio";
 			reg = <0x4900c000 0x200>;
@@ -183,6 +201,7 @@ 
 			ti,dual-volt;
 			dmas = <&sdma 61>, <&sdma 62>;
 			dma-names = "tx", "rx";
+			pbias-supply = <&pbias_mmc_reg>;
 		};
 
 		mmc2: mmc@480b4000 {
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index daabf99..380a4c4 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -137,6 +137,24 @@ 
 			pinctrl-single,function-mask = <0xff1f>;
 		};
 
+		omap3_scm_general: tisyscon@48002270 {
+			compatible = "ti,control-syscon", "syscon", "simple-bus";
+			reg = <0x48002270 0x2f0>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges;
+			pbias_regulator: pbias_regulator {
+				compatible = "ti,pbias-omap";
+				reg = <0x2b0 0x4>;
+				pbias_mmc_reg: pbias_mmc_omap3 {
+					regulator-name = "pbias_mmc_omap3";
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <3000000>;
+					regulator-enable-ramp-delay = <100>;
+				};
+			};
+		};
+
 		gpio1: gpio@48310000 {
 			compatible = "ti,omap3-gpio";
 			reg = <0x48310000 0x200>;
@@ -351,6 +369,7 @@ 
 			ti,dual-volt;
 			dmas = <&sdma 61>, <&sdma 62>;
 			dma-names = "tx", "rx";
+			pbias-supply = <&pbias_mmc_reg>;
 		};
 
 		mmc2: mmc@480b4000 {
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index a1e0585..938b596 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -134,6 +134,24 @@ 
 			pinctrl-single,function-mask = <0x7fff>;
 		};
 
+		omap4_padconf_global: tisyscon@4a1005a0 {
+			compatible = "ti,control-syscon", "syscon", "simple-bus";
+			reg = <0x4a1005a0 0x170>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges;
+			pbias_regulator: pbias_regulator {
+				compatible = "ti,pbias-omap";
+				reg = <0x60 0x4>;
+				pbias_mmc_reg: pbias_mmc_omap4 {
+					regulator-name = "pbias_mmc_omap4";
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <3000000>;
+					regulator-enable-ramp-delay = <10>;
+				};
+			};
+		};
+
 		sdma: dma-controller@4a056000 {
 			compatible = "ti,omap4430-sdma";
 			reg = <0x4a056000 0x1000>;
@@ -367,6 +385,7 @@ 
 			ti,needs-special-reset;
 			dmas = <&sdma 61>, <&sdma 62>;
 			dma-names = "tx", "rx";
+			pbias-supply = <&pbias_mmc_reg>;
 		};
 
 		mmc2: mmc@480b4000 {
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index fc3fad5..2df4862 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -130,6 +130,24 @@ 
 			pinctrl-single,function-mask = <0x7fff>;
 		};
 
+		omap5_padconf_global: tisyscon@4a002da0 {
+			compatible = "ti,control-syscon", "syscon", "simple-bus";
+			reg = <0x4A002da0 0xec>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges;
+			pbias_regulator: pbias_regulator {
+				compatible = "ti,pbias-omap";
+				reg = <0x60 0x4>;
+				pbias_mmc_reg: pbias_mmc_omap5 {
+					regulator-name = "pbias_mmc_omap5";
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <3000000>;
+					regulator-enable-ramp-delay = <100>;
+				};
+			};
+		};
+
 		sdma: dma-controller@4a056000 {
 			compatible = "ti,omap4430-sdma";
 			reg = <0x4a056000 0x1000>;
@@ -409,6 +427,7 @@ 
 			ti,needs-special-reset;
 			dmas = <&sdma 61>, <&sdma 62>;
 			dma-names = "tx", "rx";
+			pbias-supply = <&pbias_mmc_reg>;
 		};
 
 		mmc2: mmc@480b4000 {