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

Change-Id: Ie7088b526a1a384435136933a5f57c957e2bb5b0
Signed-off-by: buluess.li <buluess.li@rock-chips.com>

Author: buluess

arch/arm64/boot/dts/rockchip/rk3399-box-rev2-android-6.0.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>;
 		};
 	};
 };
@@ -126,14 +129,3 @@
 		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>;
-};

arch/arm64/boot/dts/rockchip/rk3399-box-rev2-disvr.dts

@@ -54,6 +54,9 @@
 };
 
 &pinctrl {
+	pinctrl-names = "default";
+	pinctrl-0 = <&cpt_gpio>;
+
 	sdio0 {
 		sdio0_bus1: sdio0-bus1 {
 			rockchip,pins =
@@ -111,10 +114,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>;
 		};
 	};
 };
@@ -250,14 +253,3 @@
 		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>;
-};

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 =