arm64: dts: rk3399-box: compatible for rev2 board which cpu_b's vdd gpio is different
authorbuluess.li <buluess.li@rock-chips.com>
Fri, 7 Apr 2017 02:29:26 +0000 (10:29 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Thu, 13 Apr 2017 11:37:07 +0000 (19:37 +0800)
Change-Id: Ie7088b526a1a384435136933a5f57c957e2bb5b0
Signed-off-by: buluess.li <buluess.li@rock-chips.com>
arch/arm64/boot/dts/rockchip/rk3399-box-rev2-android-6.0.dts
arch/arm64/boot/dts/rockchip/rk3399-box-rev2-disvr.dts
arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts

index b57536d..d294058 100644 (file)
@@ -49,6 +49,9 @@
 };
 
 &pinctrl {
+       pinctrl-names = "default";
+       pinctrl-0 = <&cpt_gpio>;
+
        sdio0 {
                sdio0_bus1: sdio0-bus1 {
                        rockchip,pins =
                };
        };
 
-       pmic {
-               vsel1_gpio: vsel1-gpio {
+       compat {
+               cpt_gpio: cpt-gpio {
                        rockchip,pins =
-                               <1 18 RK_FUNC_GPIO &pcfg_pull_up>;
+                               <1 18 RK_FUNC_GPIO &pcfg_output_low>;
                };
        };
 };
                status = "okay";
        };
 };
-
-&vdd_cpu_b {
-       vsel-gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>;
-       fcs,suspend-voltage-selector = <0>;
-};
-
-&rockchip_suspend {
-       rockchip,power-ctrl =
-               <&gpio1 18 GPIO_ACTIVE_LOW>,
-               <&gpio1 14 GPIO_ACTIVE_HIGH>;
-};
index 523ad9e..8fc4231 100644 (file)
@@ -54,6 +54,9 @@
 };
 
 &pinctrl {
+       pinctrl-names = "default";
+       pinctrl-0 = <&cpt_gpio>;
+
        sdio0 {
                sdio0_bus1: sdio0-bus1 {
                        rockchip,pins =
                };
        };
 
-       pmic {
-               vsel1_gpio: vsel1-gpio {
+       compat {
+               cpt_gpio: cpt-gpio {
                        rockchip,pins =
-                               <1 18 RK_FUNC_GPIO &pcfg_pull_up>;
+                               <1 18 RK_FUNC_GPIO &pcfg_output_low>;
                };
        };
 };
                status = "disabled";
        };
 };
-
-&vdd_cpu_b {
-       vsel-gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>;
-       fcs,suspend-voltage-selector = <0>;
-};
-
-&rockchip_suspend {
-       rockchip,power-ctrl =
-               <&gpio1 18 GPIO_ACTIVE_LOW>,
-               <&gpio1 14 GPIO_ACTIVE_HIGH>;
-};
index f3b98b3..2fe8cef 100644 (file)
@@ -49,6 +49,9 @@
 };
 
 &pinctrl {
+       pinctrl-names = "default";
+       pinctrl-0 = <&cpt_gpio>;
+
        sdio0 {
                sdio0_bus1: sdio0-bus1 {
                        rockchip,pins =
                };
        };
 
-       pmic {
-               vsel1_gpio: vsel1-gpio {
+       compat {
+               cpt_gpio: cpt-gpio {
                        rockchip,pins =
-                               <1 18 RK_FUNC_GPIO &pcfg_pull_up>;
+                               <1 18 RK_FUNC_GPIO &pcfg_output_low>;
                };
        };
 };
        status = "okay";
 };
 
-&vdd_cpu_b {
-       vsel-gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>;
-       fcs,suspend-voltage-selector = <0>;
-};
-
-&rockchip_suspend {
-       rockchip,power-ctrl =
-               <&gpio1 18 GPIO_ACTIVE_LOW>,
-               <&gpio1 14 GPIO_ACTIVE_HIGH>;
-};
-
 &hdmi {
        status = "okay";
        rockchip,phy-table =