ARM64: dts: rk3399: fix pwm id for vdd_center

RK3399 EVB1 and EVB2 use pwm3 for vdd_center, but EVB3 use pwm2.
This patch moved the vdd_center node to each board dtsi file.

Change-Id: I2b46b06b622c30ab65f26663a3628e73733472ad
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts
index 7226fa16ee2b3aa5048c60db1621e6dadcc21490..105e7a44aeae769979b9dbb054fc1212a317fdee 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts
@@ -50,16 +50,6 @@
        compatible = "rockchip,android", "rockchip,rk3399-evb-rev1", "rockchip,rk3399";
 };
 
-&vdd_log {
-       rockchip,pwm_id= <2>;
-       rockchip,pwm_voltage = <900000>;
-};
-
-&vdd_center {
-       rockchip,pwm_id= <3>;
-       rockchip,pwm_voltage = <900000>;
-};
-
 &rk_screen {
        #include <dt-bindings/display/screen-timing/lcd-tv080wum-nl0-mipi.dtsi>
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi
index dc8653b93070da15a10ea76d31453972b773e773..249d4d7ac811b29d5982cd4aee48b6314e5e5319 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi
@@ -47,6 +47,8 @@
 
        vdd_log: vdd-log {
                compatible = "pwm-regulator";
+               rockchip,pwm_id = <2>;
+               rockchip,pwm_voltage = <900000>;
                pwms = <&pwm2 0 25000 0>;
                regulator-name = "vdd_log";
                regulator-min-microvolt = <800000>;
@@ -54,6 +56,18 @@
                regulator-always-on;
                regulator-boot-on;
        };
+
+       vdd_center: vdd-center {
+               compatible = "pwm-regulator";
+               rockchip,pwm_id = <3>;
+               rockchip,pwm_voltage = <900000>;
+               pwms = <&pwm3 0 25000 0>;
+               regulator-name = "vdd_center";
+               regulator-min-microvolt = <800000>;
+               regulator-max-microvolt = <1400000>;
+               regulator-always-on;
+               regulator-boot-on;
+       };
 };
 
 &cpu_l0 {
@@ -318,6 +332,10 @@
        status = "okay";
 };
 
+&pwm3 {
+       status = "okay";
+};
+
 &u2phy0_otg {
        rockchip,utmi-avalid;
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts
index 1f9e58c1423d6091af3ff59e1bb32d6d11a33cea..cf68431bb10af10edbf5af5facf4d2b506bbc544 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts
@@ -50,11 +50,6 @@
        compatible = "rockchip,android", "rockchip,rk3399-evb-rev2", "rockchip,rk3399";
 };
 
-&vdd_center {
-       rockchip,pwm_id= <3>;
-       rockchip,pwm_voltage = <900000>;
-};
-
 &rk_screen {
        #include <dt-bindings/display/screen-timing/lcd-tv080wum-nl0-mipi.dtsi>
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi
index 8fb8df2d27dc9b084a970aa390473148c235b506..941d75ac6f3e9d8320b9a0cdd8325e8c99c53697 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi
@@ -53,6 +53,18 @@
                regulator-min-microvolt = <5000000>;
                regulator-max-microvolt = <5000000>;
        };
+
+       vdd_center: vdd-center {
+               compatible = "pwm-regulator";
+               rockchip,pwm_id = <3>;
+               rockchip,pwm_voltage = <900000>;
+               pwms = <&pwm3 0 25000 0>;
+               regulator-name = "vdd_center";
+               regulator-min-microvolt = <800000>;
+               regulator-max-microvolt = <1400000>;
+               regulator-always-on;
+               regulator-boot-on;
+       };
 };
 
 &cpu_l0 {
@@ -458,6 +470,10 @@
        };
 };
 
+&pwm3 {
+       status = "okay";
+};
+
 &u2phy0_otg {
        rockchip,utmi-avalid;
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts
index 6005f9bbf95c50c869a67b5dd86e99914655e4ef..8a09650ba3723875cdf6f3313352edaa95c17ff1 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts
@@ -50,11 +50,6 @@
        compatible = "rockchip,android", "rockchip,rk3399-evb-rev3", "rockchip,rk3399";
 };
 
-&vdd_center {
-       rockchip,pwm_id= <3>;
-       rockchip,pwm_voltage = <900000>;
-};
-
 &rk_screen {
        #include <dt-bindings/display/screen-timing/lcd-tv080wum-nl0-mipi.dtsi>
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3.dtsi
index 89bc3d4913726e00ace6de33798449703f96535f..a151c739fe095c8c042e5fe3eeff0a73249fa2b6 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3.dtsi
@@ -53,6 +53,18 @@
                regulator-min-microvolt = <5000000>;
                regulator-max-microvolt = <5000000>;
        };
+
+       vdd_center: vdd-center {
+               compatible = "pwm-regulator";
+               rockchip,pwm_id = <2>;
+               rockchip,pwm_voltage = <900000>;
+               pwms = <&pwm2 0 25000 0>;
+               regulator-name = "vdd_center";
+               regulator-min-microvolt = <800000>;
+               regulator-max-microvolt = <1400000>;
+               regulator-always-on;
+               regulator-boot-on;
+       };
 };
 
 &cluster0_opp {
@@ -472,3 +484,7 @@
                status = "okay";
        };
 };
+
+&pwm2 {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
index 122f28cbc040d74594ff3c9e4cda0dfa2d53e319..0b67e7a0d75f56d3ad6e54bb05342ee9129ea48d 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
@@ -46,16 +46,6 @@
 / {
        compatible = "rockchip,rk3399-evb", "rockchip,rk3399";
 
-       vdd_center: vdd-center {
-               compatible = "pwm-regulator";
-               pwms = <&pwm3 0 25000 0>;
-               regulator-name = "vdd_center";
-               regulator-min-microvolt = <800000>;
-               regulator-max-microvolt = <1400000>;
-               regulator-always-on;
-               regulator-boot-on;
-       };
-
        vcc3v3_sys: vcc3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc3v3_sys";
@@ -467,10 +457,6 @@
        status = "okay";
 };
 
-&pwm3 {
-       status = "okay";
-};
-
 &gmac {
        phy-supply = <&vcc_phy>;
        phy-mode = "rgmii";