2019-10-31 13:34:32

by Markus Reichl

Subject: [PATCH] arm64: dts: rockchip: Rework voltage supplies for regulators on rk3399-roc-pc

Correct the voltage supplies according to the board schematics
ROC-3399-PC-V10-A-20180804.

Signed-off-by: Markus Reichl <[email protected]>
---
.../arm64/boot/dts/rockchip/rk3399-roc-pc.dts | 30 ++++++++++---------
1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
index e06e4163605b..def8bca7d158 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
@@ -142,7 +142,7 @@
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
- vin-supply = <&vcc_sys>;
+ vin-supply = <&dc_12v>;
};

/* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */
@@ -190,7 +190,7 @@
regulator-boot-on;
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <1400000>;
- vin-supply = <&vcc_sys>;
+ vin-supply = <&vcc3v3_sys>;
};

/* on roc-rk3399-mezzanine board */
@@ -283,18 +283,20 @@
rockchip,system-power-controller;
wakeup-source;

- vcc1-supply = <&vcc_sys>;
- vcc2-supply = <&vcc_sys>;
- vcc3-supply = <&vcc_sys>;
- vcc4-supply = <&vcc_sys>;
- vcc6-supply = <&vcc_sys>;
- vcc7-supply = <&vcc_sys>;
+ vcc1-supply = <&vcc3v3_sys>;
+ vcc2-supply = <&vcc3v3_sys>;
+ vcc3-supply = <&vcc3v3_sys>;
+ vcc4-supply = <&vcc3v3_sys>;
+ vcc6-supply = <&vcc3v3_sys>;
+ vcc7-supply = <&vcc3v3_sys>;
vcc8-supply = <&vcc3v3_sys>;
- vcc9-supply = <&vcc_sys>;
- vcc10-supply = <&vcc_sys>;
- vcc11-supply = <&vcc_sys>;
+ vcc9-supply = <&vcc3v3_sys>;
+ vcc10-supply = <&vcc3v3_sys>;
+ vcc11-supply = <&vcc3v3_sys>;
vcc12-supply = <&vcc3v3_sys>;
- vddio-supply = <&vcc1v8_pmu>;
+ vcc13-supply = <&vcc3v3_sys>;
+ vcc14-supply = <&vcc3v3_sys>;
+ vddio-supply = <&vcc_3v0>;

regulators {
vdd_center: DCDC_REG1 {
@@ -466,7 +468,7 @@
regulator-ramp-delay = <1000>;
regulator-always-on;
regulator-boot-on;
- vin-supply = <&vcc_sys>;
+ vin-supply = <&vcc3v3_sys>;

regulator-state-mem {
regulator-off-in-suspend;
@@ -485,7 +487,7 @@
regulator-ramp-delay = <1000>;
regulator-always-on;
regulator-boot-on;
- vin-supply = <&vcc_sys>;
+ vin-supply = <&vcc3v3_sys>;

regulator-state-mem {
regulator-off-in-suspend;
--
2.20.1

2019-10-31 14:29:05

by Heiko Stübner

Subject: Re: [PATCH] arm64: dts: rockchip: Rework voltage supplies for regulators on rk3399-roc-pc

Am Donnerstag, 31. Oktober 2019, 14:30:06 CET schrieb Markus Reichl:
> Correct the voltage supplies according to the board schematics
> ROC-3399-PC-V10-A-20180804.
>
> Signed-off-by: Markus Reichl <[email protected]>
> ---
> .../arm64/boot/dts/rockchip/rk3399-roc-pc.dts | 30 ++++++++++---------
> 1 file changed, 16 insertions(+), 14 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
> index e06e4163605b..def8bca7d158 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
> @@ -142,7 +142,7 @@
> regulator-boot-on;
> regulator-min-microvolt = <3300000>;
> regulator-max-microvolt = <3300000>;
> - vin-supply = <&vcc_sys>;
> + vin-supply = <&dc_12v>;
> };
>
> /* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */
> @@ -190,7 +190,7 @@
> regulator-boot-on;
> regulator-min-microvolt = <800000>;
> regulator-max-microvolt = <1400000>;
> - vin-supply = <&vcc_sys>;
> + vin-supply = <&vcc3v3_sys>;
> };
>
> /* on roc-rk3399-mezzanine board */

This seems to be some change from somewhere else.
In any case I adapted that to the current dts and applied
the patch for 5.5. Please double-check though.

Thanks
Heiko

2019-10-31 15:58:34

by Markus Reichl

Subject: Re: [PATCH] arm64: dts: rockchip: Rework voltage supplies for regulators on rk3399-roc-pc

Am 31.10.19 um 15:24 schrieb Heiko Stuebner:
> Am Donnerstag, 31. Oktober 2019, 14:30:06 CET schrieb Markus Reichl:
>> Correct the voltage supplies according to the board schematics
>> ROC-3399-PC-V10-A-20180804.
>>
>> Signed-off-by: Markus Reichl <[email protected]>
>> ---
>> .../arm64/boot/dts/rockchip/rk3399-roc-pc.dts | 30 ++++++++++---------
>> 1 file changed, 16 insertions(+), 14 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
>> index e06e4163605b..def8bca7d158 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
>> +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
>> @@ -142,7 +142,7 @@
>> regulator-boot-on;
>> regulator-min-microvolt = <3300000>;
>> regulator-max-microvolt = <3300000>;
>> - vin-supply = <&vcc_sys>;
>> + vin-supply = <&dc_12v>;
>> };
>>
>> /* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */
>> @@ -190,7 +190,7 @@
>> regulator-boot-on;
>> regulator-min-microvolt = <800000>;
>> regulator-max-microvolt = <1400000>;
>> - vin-supply = <&vcc_sys>;
>> + vin-supply = <&vcc3v3_sys>;
>> };
>>
>> /* on roc-rk3399-mezzanine board */
>
> This seems to be some change from somewhere else.
> In any case I adapted that to the current dts and applied
> the patch for 5.5. Please double-check though.

Yes this comes from:

"arm64: dts: rockchip: Add PCIe node on rk3399-roc-pc"

https://patchwork.kernel.org/patch/11215659/

>
> Thanks
> Heiko
>
>
>
>
> _______________________________________________
> Linux-rockchip mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-rockchip
>

Gruß,
--
Markus Reichl