diff mbox

[RESEND,1/2] ARM: dts: Improve Peach Pit and Pi power scheme

Message ID 1407757091-18730-1-git-send-email-javier.martinez@collabora.co.uk (mailing list archive)
State New, archived
Headers show

Commit Message

Javier Martinez Canillas Aug. 11, 2014, 11:38 a.m. UTC
The DeviceTree files for the Peach Pit and Pi machines have
a simplistic model of the connections between the different
regulators since not all the tps65090 regulators get their
input supply voltage from the VDC. DCDC1-3, LD0-1 and fet7
parent supply is indded VDC but the fet1-6 get their input
supply from the DCDC1 and DCDC2 output voltage rails.

Update the DeviceTree to better reflect the real connections
between tps65090 regulators. Having this information in the
DTS is useful since FETs are switches that don't provide an
output voltage so the regulator core needs to fetch the FET
parent output voltage if the child voltage is queried.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Acked-by: Mark Brown <broonie@linaro.org>
---
 arch/arm/boot/dts/exynos5420-peach-pit.dts | 12 ++++++------
 arch/arm/boot/dts/exynos5800-peach-pi.dts  | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

Comments

Doug Anderson Aug. 11, 2014, 3:46 p.m. UTC | #1
Javier,

On Mon, Aug 11, 2014 at 4:38 AM, Javier Martinez Canillas
<javier.martinez@collabora.co.uk> wrote:
> The DeviceTree files for the Peach Pit and Pi machines have
> a simplistic model of the connections between the different
> regulators since not all the tps65090 regulators get their
> input supply voltage from the VDC. DCDC1-3, LD0-1 and fet7
> parent supply is indded VDC but the fet1-6 get their input
> supply from the DCDC1 and DCDC2 output voltage rails.
>
> Update the DeviceTree to better reflect the real connections
> between tps65090 regulators. Having this information in the
> DTS is useful since FETs are switches that don't provide an
> output voltage so the regulator core needs to fetch the FET
> parent output voltage if the child voltage is queried.
>
> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
> Acked-by: Mark Brown <broonie@linaro.org>
> ---
>  arch/arm/boot/dts/exynos5420-peach-pit.dts | 12 ++++++------
>  arch/arm/boot/dts/exynos5800-peach-pi.dts  | 12 ++++++------
>  2 files changed, 12 insertions(+), 12 deletions(-)

Matches my schematics.  Kukjin: I think this could be applied to
for-next whenever it's convenient.

Acked-by: Doug Anderson <dianders@chromium.org>
Kim Kukjin Aug. 18, 2014, 6:27 p.m. UTC | #2
On 08/11/14 10:46, Doug Anderson wrote:
> Javier,
>
> On Mon, Aug 11, 2014 at 4:38 AM, Javier Martinez Canillas
> <javier.martinez@collabora.co.uk>  wrote:
>> The DeviceTree files for the Peach Pit and Pi machines have
>> a simplistic model of the connections between the different
>> regulators since not all the tps65090 regulators get their
>> input supply voltage from the VDC. DCDC1-3, LD0-1 and fet7
>> parent supply is indded VDC but the fet1-6 get their input
>> supply from the DCDC1 and DCDC2 output voltage rails.
>>
>> Update the DeviceTree to better reflect the real connections
>> between tps65090 regulators. Having this information in the
>> DTS is useful since FETs are switches that don't provide an
>> output voltage so the regulator core needs to fetch the FET
>> parent output voltage if the child voltage is queried.
>>
>> Signed-off-by: Javier Martinez Canillas<javier.martinez@collabora.co.uk>
>> Acked-by: Mark Brown<broonie@linaro.org>
>> ---
>>   arch/arm/boot/dts/exynos5420-peach-pit.dts | 12 ++++++------
>>   arch/arm/boot/dts/exynos5800-peach-pi.dts  | 12 ++++++------
>>   2 files changed, 12 insertions(+), 12 deletions(-)
>
> Matches my schematics.  Kukjin: I think this could be applied to
> for-next whenever it's convenient.
>
OK, I've applied this but 2nd in this series...

> Acked-by: Doug Anderson<dianders@chromium.org>
>
Thanks,
Kukjin
Javier Martinez Canillas Aug. 18, 2014, 9:43 p.m. UTC | #3
Hello Kukjin,

On 08/18/2014 08:27 PM, Kukjin Kim wrote:
> On 08/11/14 10:46, Doug Anderson wrote:
>>
> OK, I've applied this but 2nd in this series...
>

Thanks for picking this and yes PATCH 2/2 from this series was dropped.

>> Acked-by: Doug Anderson<dianders@chromium.org>
>>
> Thanks,
> Kukjin
> 

I've posted PATCH "mmc: core: Use regulator_get_voltage() if OCR mask is
empty." [0] instead to solve the issue that patch 2/2 tried to address.

Best regards,
Javier

[0]: https://lkml.org/lkml/2014/8/14/200
diff mbox

Patch

diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index 228a6b1..d8710c1 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -365,12 +365,12 @@ 
 				vsys2-supply = <&vbat>;
 				vsys3-supply = <&vbat>;
 				infet1-supply = <&vbat>;
-				infet2-supply = <&vbat>;
-				infet3-supply = <&vbat>;
-				infet4-supply = <&vbat>;
-				infet5-supply = <&vbat>;
-				infet6-supply = <&vbat>;
-				infet7-supply = <&vbat>;
+				infet2-supply = <&tps65090_dcdc1>;
+				infet3-supply = <&tps65090_dcdc2>;
+				infet4-supply = <&tps65090_dcdc2>;
+				infet5-supply = <&tps65090_dcdc2>;
+				infet6-supply = <&tps65090_dcdc2>;
+				infet7-supply = <&tps65090_dcdc1>;
 				vsys-l1-supply = <&vbat>;
 				vsys-l2-supply = <&vbat>;
 
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index f3ee48b..07b29b7 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -363,12 +363,12 @@ 
 				vsys2-supply = <&vbat>;
 				vsys3-supply = <&vbat>;
 				infet1-supply = <&vbat>;
-				infet2-supply = <&vbat>;
-				infet3-supply = <&vbat>;
-				infet4-supply = <&vbat>;
-				infet5-supply = <&vbat>;
-				infet6-supply = <&vbat>;
-				infet7-supply = <&vbat>;
+				infet2-supply = <&tps65090_dcdc1>;
+				infet3-supply = <&tps65090_dcdc2>;
+				infet4-supply = <&tps65090_dcdc2>;
+				infet5-supply = <&tps65090_dcdc2>;
+				infet6-supply = <&tps65090_dcdc2>;
+				infet7-supply = <&tps65090_dcdc1>;
 				vsys-l1-supply = <&vbat>;
 				vsys-l2-supply = <&vbat>;