ARM64: dts: rockchip: enable the gt9xx touchscreen on rk3399-tb dts

The gt9xx touchscreen should be used by rk3399 evb board.
The rk3399-monkey.dtsi and rk3399-chrome.dtsi just run the different OS.
So... we should move the touchscreen node into the rk3399-tb.dtsi.

Change-Id: Ida8203e045e0fc0eb49e8a37e4ad609c230e040f
Signed-off-by: Caesar Wang <wxt@rock-chips.com>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-monkey.dts b/arch/arm64/boot/dts/rockchip/rk3399-monkey.dts
index aeca00141ed1c5744822d55ae1fc4e1b046ae22d..c38c6ed8cf3af96fd9558fb0f08977ecdc197b6e 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-monkey.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-monkey.dts
@@ -130,10 +130,6 @@
        };
 };
 
-&gt9xx {
-       status = "okay";
-};
-
 &fb {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-tb.dtsi
index 88c25a4b8a42944496b7307634a176fd227333b1..79cd312600047e5614568cff011dc7be785238f6 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-tb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-tb.dtsi
@@ -460,7 +460,6 @@
                max-y = <1900>;
                tp-size = <911>;
                tp-supply = <&vcc3v0_tp>;
-               status = "disabled";
        };
 };