diff --git a/kernel/arch/arm/boot/dts/firefly-rk3288.dts b/kernel/arch/arm/boot/dts/firefly-rk3288.dts index b8c3338c4f..758b7a9aa0 100755 --- a/kernel/arch/arm/boot/dts/firefly-rk3288.dts +++ b/kernel/arch/arm/boot/dts/firefly-rk3288.dts @@ -486,6 +486,7 @@ reg = <0x51>; }; synaptics_ts@20 { + status = "disabled"; compatible = "synaptics,synaptics_dsx"; reg = <0x20>; touch-gpio = <&gpio8 GPIO_A7 IRQ_TYPE_EDGE_FALLING>; @@ -496,6 +497,15 @@ flip-x = <0>; flip-y = <0>; }; + ts@41 { + status = "disabled"; + compatible = "tchip,gsl3680"; + reg = <0x41>; + touch-gpio = <&gpio8 GPIO_A7 IRQ_TYPE_EDGE_RISING>; + //reset-gpio = <&gpio8 GPIO_A6 GPIO_ACTIVE_LOW>; + max-x = <1280>; + max-y = <800>; + }; }; &i2c2 { diff --git a/kernel/arch/arm/configs/firefly-rk3288_defconfig b/kernel/arch/arm/configs/firefly-rk3288_defconfig index 915b224b5c..60e10651fc 100644 --- a/kernel/arch/arm/configs/firefly-rk3288_defconfig +++ b/kernel/arch/arm/configs/firefly-rk3288_defconfig @@ -1536,7 +1536,7 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE=y # CONFIG_TOUCHSCREEN_SYNAPTICS_RK is not set # CONFIG_TOUCHSCREEN_ZET62XX is not set -# CONFIG_TOUCHSCREEN_GSLX680 is not set +CONFIG_TOUCHSCREEN_GSLX680=y # CONFIG_TOUCHSCREEN_GT8XX is not set # CONFIG_TOUCHSCREEN_GT9XX is not set # CONFIG_TOUCHSCREEN_CT36X_TS is not set