ARM: dts: am335x-tx48: disable dysfunctional ti-am335x-tsc driver

diff --git a/arch/arm/boot/dts/am335x-tx48.dts b/arch/arm/boot/dts/am335x-tx48.dts
index a307908c18729b76adf4a8d1f40d899ffb9c707d..737bed2c45fe481deb7470bf08aa5a2b254b4cb9 100644 (file)
--- a/arch/arm/boot/dts/am335x-tx48.dts
+++ b/arch/arm/boot/dts/am335x-tx48.dts
@@ -862,21 +862,6 @@
        };
 };
 
-&tscadc {
-       status = "okay";
-
-       tsc {
-               ti,wires = <4>;
-               ti,x-plate-resistance = <200>;
-               ti,coordinate-readouts = <5>;
-               ti,wire-config = <0x01 0x10 0x23 0x32>;
-       };
-
-       adc {
-               ti,adc-channels = <4 5 6 7>;
-       };
-};
-
 &uart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_uart0_1>;

diff --git a/arch/arm/configs/tx48_defconfig b/arch/arm/configs/tx48_defconfig
index 269db86bafd819235bed6b4b883c51b68d15285b..c952837c6464277fd79a1c9ca294a72da484fc87 100644 (file)
--- a/arch/arm/configs/tx48_defconfig
+++ b/arch/arm/configs/tx48_defconfig
@@ -128,7 +128,6 @@ CONFIG_KEYBOARD_MATRIX=y
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_EDT_FT5X06=y
-CONFIG_TOUCHSCREEN_TI_AM335X_TSC=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=y
 # CONFIG_TOUCHSCREEN_USB_PANJIT is not set
 # CONFIG_TOUCHSCREEN_USB_3M is not set
@@ -185,7 +184,6 @@ CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_OMAP_WATCHDOG=y
 CONFIG_MFD_SYSCON=y
-CONFIG_MFD_TI_AM335X_TSCADC=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_DEBUG=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -282,7 +280,6 @@ CONFIG_DEVFREQ_GOV_PERFORMANCE=y
 CONFIG_DEVFREQ_GOV_POWERSAVE=y
 CONFIG_DEVFREQ_GOV_USERSPACE=y
 CONFIG_IIO=y
-CONFIG_TI_AM335X_ADC=y
 CONFIG_PWM=y
 CONFIG_PWM_TIECAP=y
 CONFIG_PWM_TIEHRPWM=y