1 files changed, 77 insertions, 40 deletions

diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c
index a260f83bcb02..a984c0efabf0 100644
--- a/drivers/mfd/ucb1x00-ts.c
+++ b/drivers/mfd/ucb1x00-ts.c
@@ -32,15 +32,18 @@
 #include <linux/suspend.h>
 #include <linux/slab.h>
 #include <linux/kthread.h>
+#include <linux/delay.h>
 
 #include <asm/dma.h>
 #include <asm/semaphore.h>
+#include <asm/arch/collie.h>
+#include <asm/mach-types.h>
 
 #include "ucb1x00.h"
 
 
 struct ucb1x00_ts {
-        struct input_dev        idev;
+        struct input_dev        *idev;
         struct ucb1x00          *ucb;
 
         wait_queue_head_t       irq_wait;
@@ -56,16 +59,16 @@ static int adcsync;
 
 static inline void ucb1x00_ts_evt_add(struct ucb1x00_ts *ts, u16 pressure, u16 x, u16 y)
 {
-        input_report_abs(&ts->idev, ABS_X, x);
-        input_report_abs(&ts->idev, ABS_Y, y);
-        input_report_abs(&ts->idev, ABS_PRESSURE, pressure);
-        input_sync(&ts->idev);
+        input_report_abs(ts->idev, ABS_X, x);
+        input_report_abs(ts->idev, ABS_Y, y);
+        input_report_abs(ts->idev, ABS_PRESSURE, pressure);
+        input_sync(ts->idev);
 }
 
 static inline void ucb1x00_ts_event_release(struct ucb1x00_ts *ts)
 {
-        input_report_abs(&ts->idev, ABS_PRESSURE, 0);
-        input_sync(&ts->idev);
+        input_report_abs(ts->idev, ABS_PRESSURE, 0);
+        input_sync(ts->idev);
 }
 
 /*
@@ -85,12 +88,23 @@ static inline void ucb1x00_ts_mode_int(struct ucb1x00_ts *ts)
  */
 static inline unsigned int ucb1x00_ts_read_pressure(struct ucb1x00_ts *ts)
 {
-        ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
-                        UCB_TS_CR_TSMX_POW | UCB_TS_CR_TSPX_POW |
-                        UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_GND |
-                        UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);
+        if (machine_is_collie()) {
+                ucb1x00_io_write(ts->ucb, COLLIE_TC35143_GPIO_TBL_CHK, 0);
+                ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
+                                  UCB_TS_CR_TSPX_POW | UCB_TS_CR_TSMX_POW |
+                                  UCB_TS_CR_MODE_POS | UCB_TS_CR_BIAS_ENA);
 
-        return ucb1x00_adc_read(ts->ucb, UCB_ADC_INP_TSPY, ts->adcsync);
+                udelay(55);
+
+                return ucb1x00_adc_read(ts->ucb, UCB_ADC_INP_AD2, ts->adcsync);
+        } else {
+                ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
+                                  UCB_TS_CR_TSMX_POW | UCB_TS_CR_TSPX_POW |
+                                  UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_GND |
+                                  UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);
+
+                return ucb1x00_adc_read(ts->ucb, UCB_ADC_INP_TSPY, ts->adcsync);
+        }
 }
 
 /*
@@ -101,12 +115,16 @@ static inline unsigned int ucb1x00_ts_read_pressure(struct ucb1x00_ts *ts)
  */
 static inline unsigned int ucb1x00_ts_read_xpos(struct ucb1x00_ts *ts)
 {
-        ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
-                        UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW |
-                        UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);
-        ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
-                        UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW |
-                        UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);
+        if (machine_is_collie())
+                ucb1x00_io_write(ts->ucb, 0, COLLIE_TC35143_GPIO_TBL_CHK);
+        else {
+                ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
+                                  UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW |
+                                  UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);
+                ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
+                                  UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW |
+                                  UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);
+        }
         ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
                         UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW |
                         UCB_TS_CR_MODE_POS | UCB_TS_CR_BIAS_ENA);
@@ -124,12 +142,17 @@ static inline unsigned int ucb1x00_ts_read_xpos(struct ucb1x00_ts *ts)
  */
 static inline unsigned int ucb1x00_ts_read_ypos(struct ucb1x00_ts *ts)
 {
-        ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
-                        UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW |
-                        UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);
-        ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
-                        UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW |
-                        UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);
+        if (machine_is_collie())
+                ucb1x00_io_write(ts->ucb, 0, COLLIE_TC35143_GPIO_TBL_CHK);
+        else {
+                ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
+                                  UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW |
+                                  UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);
+                ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
+                                  UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW |
+                                  UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);
+        }
+
         ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
                         UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW |
                         UCB_TS_CR_MODE_POS | UCB_TS_CR_BIAS_ENA);
@@ -163,6 +186,15 @@ static inline unsigned int ucb1x00_ts_read_yres(struct ucb1x00_ts *ts)
         return ucb1x00_adc_read(ts->ucb, 0, ts->adcsync);
 }
 
+static inline int ucb1x00_ts_pen_down(struct ucb1x00_ts *ts)
+{
+        unsigned int val = ucb1x00_reg_read(ts->ucb, UCB_TS_CR);
+        if (machine_is_collie())
+                return (!(val & (UCB_TS_CR_TSPX_LOW)));
+        else
+                return (val & (UCB_TS_CR_TSPX_LOW | UCB_TS_CR_TSMX_LOW));
+}
+
 /*
  * This is a RT kernel thread that handles the ADC accesses
  * (mainly so we can use semaphores in the UCB1200 core code
@@ -186,7 +218,7 @@ static int ucb1x00_thread(void *_ts)
 
         add_wait_queue(&ts->irq_wait, &wait);
         while (!kthread_should_stop()) {
-                unsigned int x, y, p, val;
+                unsigned int x, y, p;
                 signed long timeout;
 
                 ts->restart = 0;
@@ -206,12 +238,12 @@ static int ucb1x00_thread(void *_ts)
                 msleep(10);
 
                 ucb1x00_enable(ts->ucb);
-                val = ucb1x00_reg_read(ts->ucb, UCB_TS_CR);
 
-                if (val & (UCB_TS_CR_TSPX_LOW | UCB_TS_CR_TSMX_LOW)) {
+
+                if (ucb1x00_ts_pen_down(ts)) {
                         set_task_state(tsk, TASK_INTERRUPTIBLE);
 
-                        ucb1x00_enable_irq(ts->ucb, UCB_IRQ_TSPX, UCB_FALLING);
+                        ucb1x00_enable_irq(ts->ucb, UCB_IRQ_TSPX, machine_is_collie() ? UCB_RISING : UCB_FALLING);
                         ucb1x00_disable(ts->ucb);
 
                         /*
@@ -341,26 +373,30 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev)
 {
         struct ucb1x00_ts *ts;
 
-        ts = kmalloc(sizeof(struct ucb1x00_ts), GFP_KERNEL);
+        ts = kzalloc(sizeof(struct ucb1x00_ts), GFP_KERNEL);
         if (!ts)
                 return -ENOMEM;
 
-        memset(ts, 0, sizeof(struct ucb1x00_ts));
+        ts->idev = input_allocate_device();
+        if (!ts->idev) {
+                kfree(ts);
+                return -ENOMEM;
+        }
 
         ts->ucb = dev->ucb;
         ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC;
 
-        ts->idev.name       = "Touchscreen panel";
-        ts->idev.id.product = ts->ucb->id;
-        ts->idev.open       = ucb1x00_ts_open;
-        ts->idev.close      = ucb1x00_ts_close;
+        ts->idev->name       = "Touchscreen panel";
+        ts->idev->id.product = ts->ucb->id;
+        ts->idev->open       = ucb1x00_ts_open;
+        ts->idev->close      = ucb1x00_ts_close;
 
-        __set_bit(EV_ABS, ts->idev.evbit);
-        __set_bit(ABS_X, ts->idev.absbit);
-        __set_bit(ABS_Y, ts->idev.absbit);
-        __set_bit(ABS_PRESSURE, ts->idev.absbit);
+        __set_bit(EV_ABS, ts->idev->evbit);
+        __set_bit(ABS_X, ts->idev->absbit);
+        __set_bit(ABS_Y, ts->idev->absbit);
+        __set_bit(ABS_PRESSURE, ts->idev->absbit);
 
-        input_register_device(&ts->idev);
+        input_register_device(ts->idev);
 
         dev->priv = ts;
 
@@ -370,7 +406,8 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev)
 static void ucb1x00_ts_remove(struct ucb1x00_dev *dev)
 {
         struct ucb1x00_ts *ts = dev->priv;
-        input_unregister_device(&ts->idev);
+
+        input_unregister_device(ts->idev);
         kfree(ts);
 }