arm: dts: rk3288-evb-rk818: set tsadc default pinctrl to gpio

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3288-evb-rk818.dts

diff --git a/arch/arm/boot/dts/rk3288-evb-rk818.dts b/arch/arm/boot/dts/rk3288-evb-rk818.dts
index 134f0c218c4cd0500a085ed40959e76f140882fe..12e54c22f041f59fbc4ac547a647870b7db43114 100644 (file)
--- a/arch/arm/boot/dts/rk3288-evb-rk818.dts
+++ b/arch/arm/boot/dts/rk3288-evb-rk818.dts
@@ -61,6 +61,11 @@
                reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>;
        };
 
+       wireless-bluetooth {
+               clocks = <&rk818 1>;
+               clock-names = "ext_clock";
+       };
+
        /delete-node/ sdmmc-regulator;
 
        vcc_lcd: vcc-lcd {
@@ -78,6 +83,10 @@
        cpu0-supply = <&vdd_cpu>;
 };
 
+&edp_panel {
+       power-supply = <&vcc_lcd>;
+};
+
 &gpu {
        status = "okay";
        mali-supply = <&vdd_gpu>;
@@ -111,7 +120,7 @@
                reg = <0x1c>;
                status = "okay";
 
-               clock-output-names = "rk808-clkout1", "wifibt_32kin";
+               clock-output-names = "xin32k", "wifibt_32kin";
                interrupt-parent = <&gpio0>;
                interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
@@ -318,8 +327,10 @@
        power-supply = <&vcc_lcd>;
 };
 
-&panel {
-       power-supply = <&vcc_lcd>;
+&tsadc {
+       rockchip,hw-tshut-mode = <0>; /* tshut mode 0:CRU 1:GPIO */
+       rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
+       pinctrl-1 = <&otp_gpio>;
 };
 
 &pinctrl {