3 files changed, 8 insertions, 7 deletions

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 4f091800bfeb..e5cca9bd0406 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -12,17 +12,17 @@ menuconfig INPUT_TOUCHSCREEN
 if INPUT_TOUCHSCREEN
 
 config TOUCHSCREEN_ADS7846
-        tristate "ADS 7846/7843 based touchscreens"
+        tristate "ADS7846/TSC2046 and ADS7843 based touchscreens"
         depends on SPI_MASTER
         depends on HWMON = n || HWMON
         help
           Say Y here if you have a touchscreen interface using the
-          ADS7846 or ADS7843 controller, and your board-specific setup
-          code includes that in its table of SPI devices.
+          ADS7846/TSC2046 or ADS7843 controller, and your board-specific
+          setup code includes that in its table of SPI devices.
 
           If HWMON is selected, and the driver is told the reference voltage
           on your board, you will also get hwmon interfaces for the voltage
-          (and on ads7846, temperature) sensors of this chip.
+          (and on ads7846/tsc2046, temperature) sensors of this chip.
 
           If unsure, say N (but it's safe to say "Y").
 
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 693e3b2a65a3..1c9069cd3bae 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -39,6 +39,7 @@
 /*
  * This code has been heavily tested on a Nokia 770, and lightly
  * tested on other ads7846 devices (OSK/Mistral, Lubbock).
+ * TSC2046 is just newer ads7846 silicon.
  * Support for ads7843 tested on Atmel at91sam926x-EK.
  * Support for ads7845 has only been stubbed in.
  *
@@ -847,7 +848,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)
          * may not.  So we stick to very-portable 8 bit words, both RX and TX.
          */
         spi->bits_per_word = 8;
-        spi->mode = SPI_MODE_1;
+        spi->mode = SPI_MODE_0;
         err = spi_setup(spi);
         if (err < 0)
                 return err;
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c
index 6582816a0477..f0cbcdb008ed 100644
--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c
@@ -288,9 +288,9 @@ static int ucb1400_ts_thread(void *_ucb)
         struct ucb1400 *ucb = _ucb;
         struct task_struct *tsk = current;
         int valid = 0;
+        struct sched_param param = { .sched_priority = 1 };
 
-        tsk->policy = SCHED_FIFO;
-        tsk->rt_priority = 1;
+        sched_setscheduler(tsk, SCHED_FIFO, &param);
 
         while (!kthread_should_stop()) {
                 unsigned int x, y, p;