diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index e88043aad383..787f68400aea 100755 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -20,43 +20,19 @@ choice config TOUCHSCREEN_XPT2046_SPI bool "800X480 TOUCHSCREEN" - depends on SPIM_RK2818 + depends on SPIM_RK2818 || SPIM_RK29XX config TOUCHSCREEN_XPT2046_CBN_SPI bool "800X480 CALIBRATION TOUCHSCREEN" - depends on SPIM_RK2818 + depends on SPIM_RK2818 || SPIM_RK29XX config TOUCHSCREEN_XPT2046_320X480_SPI bool "320X480 TOUCHSCREEN" - depends on SPIM_RK2818 + depends on SPIM_RK2818 || SPIM_RK29XX config TOUCHSCREEN_XPT2046_320X480_CBN_SPI bool "320X480 CALIBRATION TOUCHSCREEN" - depends on SPIM_RK2818 - -endchoice -choice - prompt "XPT2046 based touchscreens: SPI Interface" - default TOUCHSCREEN_XPT2046_CBN_SPI - - config TOUCHSCREEN_XPT2046_SPI_NOCHOOSE - bool "DO NOT CHOOSE TOUCHSCREEN_XPT2046" - - config TOUCHSCREEN_XPT2046_SPI - bool "800X480 TOUCHSCREEN" - depends on SPIM_RK29XX - - config TOUCHSCREEN_XPT2046_CBN_SPI - bool "800X480 CALIBRATION TOUCHSCREEN" - depends on SPIM_RK29XX - - config TOUCHSCREEN_XPT2046_320X480_SPI - bool "320X480 TOUCHSCREEN" - depends on SPIM_RK29XX - - config TOUCHSCREEN_XPT2046_320X480_CBN_SPI - bool "320X480 CALIBRATION TOUCHSCREEN" - depends on SPIM_RK29XX + depends on SPIM_RK2818 || SPIM_RK29XX endchoice config TOUCHSCREEN_ADS7846