From: Jagan Teki Date: Wed, 16 Oct 2019 20:49:40 +0530 Subject: [U-Boot] [PATCH] arm: dts: rk3399-roc-pc: Sync latest dts changes from Linux Message-ID: <20191016151940.6147-1-jagan@amarulasolutions.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: u-boot@lists.denx.de Few important regulator=C2=A0power 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 Cc: Levin Du Signed-off-by: Jagan Teki --- 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 =3D "regulator-fixed"; - regulator-name =3D "vcc12v_sys"; + regulator-name =3D "dc_12v"; regulator-always-on; regulator-boot-on; regulator-min-microvolt =3D <12000000>; @@ -85,7 +85,7 @@ regulator-boot-on; regulator-min-microvolt =3D <3300000>; regulator-max-microvolt =3D <3300000>; - vin-supply =3D <&vcc12v_sys>; + vin-supply =3D <&vcc_sys>; }; =20 /* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */ @@ -118,7 +118,7 @@ regulator-boot-on; regulator-min-microvolt =3D <5000000>; regulator-max-microvolt =3D <5000000>; - vin-supply =3D <&vcc12v_sys>; + vin-supply =3D <&dc_12v>; }; =20 vdd_log: vdd-log { @@ -129,7 +129,7 @@ regulator-boot-on; regulator-min-microvolt =3D <800000>; regulator-max-microvolt =3D <1400000>; - vin-supply =3D <&vcc3v3_sys>; + vin-supply =3D <&vcc_sys>; }; }; =20 @@ -202,16 +202,16 @@ rockchip,system-power-controller; wakeup-source; =20 - vcc1-supply =3D <&vcc3v3_sys>; - vcc2-supply =3D <&vcc3v3_sys>; - vcc3-supply =3D <&vcc3v3_sys>; - vcc4-supply =3D <&vcc3v3_sys>; - vcc6-supply =3D <&vcc3v3_sys>; - vcc7-supply =3D <&vcc3v3_sys>; + vcc1-supply =3D <&vcc_sys>; + vcc2-supply =3D <&vcc_sys>; + vcc3-supply =3D <&vcc_sys>; + vcc4-supply =3D <&vcc_sys>; + vcc6-supply =3D <&vcc_sys>; + vcc7-supply =3D <&vcc_sys>; vcc8-supply =3D <&vcc3v3_sys>; - vcc9-supply =3D <&vcc3v3_sys>; - vcc10-supply =3D <&vcc3v3_sys>; - vcc11-supply =3D <&vcc3v3_sys>; + vcc9-supply =3D <&vcc_sys>; + vcc10-supply =3D <&vcc_sys>; + vcc11-supply =3D <&vcc_sys>; vcc12-supply =3D <&vcc3v3_sys>; vddio-supply =3D <&vcc1v8_pmu>; =20 @@ -385,7 +385,7 @@ regulator-ramp-delay =3D <1000>; regulator-always-on; regulator-boot-on; - vin-supply =3D <&vcc3v3_sys>; + vin-supply =3D <&vcc_sys>; =20 regulator-state-mem { regulator-off-in-suspend; @@ -404,7 +404,7 @@ regulator-ramp-delay =3D <1000>; regulator-always-on; regulator-boot-on; - vin-supply =3D <&vcc3v3_sys>; + vin-supply =3D <&vcc_sys>; =20 regulator-state-mem { regulator-off-in-suspend; --=20 2.18.0.321.gffc6fa0e3