[U-Boot] [PATCH] arm: dts: rk3399-roc-pc: Sync latest dts changes from Linux

[Kever Yang]

On 2019/10/16 下午11:19, Jagan Teki wrote:
> Few important regulator power rails fixes are available in
> linux-next, so sync them same.
>
> Here is the last commit details:
> commit <9f7f9b610e1b7d2dc86c543ab0dfcf781bd42326> ("arm64: dts:
> rockchip: Fix roc-rk3399-pc regulator input rails")
>
> Cc: Kever Yang <kever.yang at rock-chips.com>
> Cc: Levin Du <djw at t-chip.com.cn>
> Signed-off-by: Jagan Teki <jagan at amarulasolutions.com>


Reviewed-by: Kever Yang <kever.yang at rock-chips.com>


Thanks,

-Kever

> ---
>   arch/arm/dts/rk3399-roc-pc.dts | 32 ++++++++++++++++----------------
>   1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/arch/arm/dts/rk3399-roc-pc.dts b/arch/arm/dts/rk3399-roc-pc.dts
> index 19f7732d72..257543d069 100644
> --- a/arch/arm/dts/rk3399-roc-pc.dts
> +++ b/arch/arm/dts/rk3399-roc-pc.dts
> @@ -57,9 +57,9 @@
>   	 * should be placed inside mp8859, but not until mp8859 has
>   	 * its own dt-binding.
>   	 */
> -	vcc12v_sys: mp8859-dcdc1 {
> +	dc_12v: mp8859-dcdc1 {
>   		compatible = "regulator-fixed";
> -		regulator-name = "vcc12v_sys";
> +		regulator-name = "dc_12v";
>   		regulator-always-on;
>   		regulator-boot-on;
>   		regulator-min-microvolt = <12000000>;
> @@ -85,7 +85,7 @@
>   		regulator-boot-on;
>   		regulator-min-microvolt = <3300000>;
>   		regulator-max-microvolt = <3300000>;
> -		vin-supply = <&vcc12v_sys>;
> +		vin-supply = <&vcc_sys>;
>   	};
>   
>   	/* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */
> @@ -118,7 +118,7 @@
>   		regulator-boot-on;
>   		regulator-min-microvolt = <5000000>;
>   		regulator-max-microvolt = <5000000>;
> -		vin-supply = <&vcc12v_sys>;
> +		vin-supply = <&dc_12v>;
>   	};
>   
>   	vdd_log: vdd-log {
> @@ -129,7 +129,7 @@
>   		regulator-boot-on;
>   		regulator-min-microvolt = <800000>;
>   		regulator-max-microvolt = <1400000>;
> -		vin-supply = <&vcc3v3_sys>;
> +		vin-supply = <&vcc_sys>;
>   	};
>   };
>   
> @@ -202,16 +202,16 @@
>   		rockchip,system-power-controller;
>   		wakeup-source;
>   
> -		vcc1-supply = <&vcc3v3_sys>;
> -		vcc2-supply = <&vcc3v3_sys>;
> -		vcc3-supply = <&vcc3v3_sys>;
> -		vcc4-supply = <&vcc3v3_sys>;
> -		vcc6-supply = <&vcc3v3_sys>;
> -		vcc7-supply = <&vcc3v3_sys>;
> +		vcc1-supply = <&vcc_sys>;
> +		vcc2-supply = <&vcc_sys>;
> +		vcc3-supply = <&vcc_sys>;
> +		vcc4-supply = <&vcc_sys>;
> +		vcc6-supply = <&vcc_sys>;
> +		vcc7-supply = <&vcc_sys>;
>   		vcc8-supply = <&vcc3v3_sys>;
> -		vcc9-supply = <&vcc3v3_sys>;
> -		vcc10-supply = <&vcc3v3_sys>;
> -		vcc11-supply = <&vcc3v3_sys>;
> +		vcc9-supply = <&vcc_sys>;
> +		vcc10-supply = <&vcc_sys>;
> +		vcc11-supply = <&vcc_sys>;
>   		vcc12-supply = <&vcc3v3_sys>;
>   		vddio-supply = <&vcc1v8_pmu>;
>   
> @@ -385,7 +385,7 @@
>   		regulator-ramp-delay = <1000>;
>   		regulator-always-on;
>   		regulator-boot-on;
> -		vin-supply = <&vcc3v3_sys>;
> +		vin-supply = <&vcc_sys>;
>   
>   		regulator-state-mem {
>   			regulator-off-in-suspend;
> @@ -404,7 +404,7 @@
>   		regulator-ramp-delay = <1000>;
>   		regulator-always-on;
>   		regulator-boot-on;
> -		vin-supply = <&vcc3v3_sys>;
> +		vin-supply = <&vcc_sys>;
>   
>   		regulator-state-mem {
>   			regulator-off-in-suspend;