arm64: dts: rk3399-box: compatible for rev2 board which cpu_b's vdd gpio is different

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / boot / dts / rockchip / rk3399-box-rev2.dts

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts
index f3b98b3622b9b7a9d09d19d927f30ada055ebb26..2fe8cefb6abdcb20dc07a9475636051cbbaa4dd1 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts
@@ -49,6 +49,9 @@
 };
 
 &pinctrl {
+       pinctrl-names = "default";
+       pinctrl-0 = <&cpt_gpio>;
+
        sdio0 {
                sdio0_bus1: sdio0-bus1 {
                        rockchip,pins =
@@ -106,10 +109,10 @@
                };
        };
 
-       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>;
                };
        };
 };
@@ -144,17 +147,6 @@
        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 =