3 files changed, 18 insertions, 54 deletions

diff --git a/include/linux/input/ti_am335x_tsc.h b/include/linux/input/ti_am335x_tsc.h
deleted file mode 100644
index 49269a2aa329..000000000000
--- a/include/linux/input/ti_am335x_tsc.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef __LINUX_TI_AM335X_TSC_H
-#define __LINUX_TI_AM335X_TSC_H
-
-/**
- * struct tsc_data      Touchscreen wire configuration
- * @wires:              Wires refer to application modes
- *                      i.e. 4/5/8 wire touchscreen support
- *                      on the platform.
- * @x_plate_resistance: X plate resistance.
- * @steps_to_configure: The sequencer supports a total of
- *                      16 programmable steps.
- *                      A step configured to read a single
- *                      co-ordinate value, can be applied
- *                      more number of times for better results.
- */
-
-struct tsc_data {
-        int wires;
-        int x_plate_resistance;
-        int steps_to_configure;
-};
-
-#endif
diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h
index c79ad5d2f271..8d73fe29796a 100644
--- a/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@ -30,8 +30,8 @@
 #define REG_IDLECONFIG          0x058
 #define REG_CHARGECONFIG        0x05C
 #define REG_CHARGEDELAY         0x060
-#define REG_STEPCONFIG(n)       (0x64 + ((n - 1) * 8))
-#define REG_STEPDELAY(n)        (0x68 + ((n - 1) * 8))
+#define REG_STEPCONFIG(n)       (0x64 + ((n) * 8))
+#define REG_STEPDELAY(n)        (0x68 + ((n) * 8))
 #define REG_FIFO0CNT            0xE4
 #define REG_FIFO0THR            0xE8
 #define REG_FIFO1CNT            0xF0
@@ -46,8 +46,6 @@
 /* Step Enable */
 #define STEPENB_MASK            (0x1FFFF << 0)
 #define STEPENB(val)            ((val) << 0)
-#define STPENB_STEPENB          STEPENB(0x1FFFF)
-#define STPENB_STEPENB_TC       STEPENB(0x1FFF)
 
 /* IRQ enable */
 #define IRQENB_HW_PEN           BIT(0)
@@ -73,8 +71,6 @@
 #define STEPCONFIG_INM_ADCREFM  STEPCONFIG_INM(8)
 #define STEPCONFIG_INP_MASK     (0xF << 19)
 #define STEPCONFIG_INP(val)     ((val) << 19)
-#define STEPCONFIG_INP_AN2      STEPCONFIG_INP(2)
-#define STEPCONFIG_INP_AN3      STEPCONFIG_INP(3)
 #define STEPCONFIG_INP_AN4      STEPCONFIG_INP(4)
 #define STEPCONFIG_INP_ADCREFM  STEPCONFIG_INP(8)
 #define STEPCONFIG_FIFO1        BIT(26)
@@ -96,7 +92,6 @@
 #define STEPCHARGE_INM_AN1      STEPCHARGE_INM(1)
 #define STEPCHARGE_INP_MASK     (0xF << 19)
 #define STEPCHARGE_INP(val)     ((val) << 19)
-#define STEPCHARGE_INP_AN1      STEPCHARGE_INP(1)
 #define STEPCHARGE_RFM_MASK     (3 << 23)
 #define STEPCHARGE_RFM(val)     ((val) << 23)
 #define STEPCHARGE_RFM_XNUR     STEPCHARGE_RFM(1)
@@ -125,22 +120,17 @@
 
 #define TSCADC_CELLS            2
 
-enum tscadc_cells {
-        TSC_CELL,
-        ADC_CELL,
-};
-
-struct mfd_tscadc_board {
-        struct tsc_data *tsc_init;
-        struct adc_data *adc_init;
-};
-
 struct ti_tscadc_dev {
         struct device *dev;
         struct regmap *regmap_tscadc;
         void __iomem *tscadc_base;
         int irq;
+        int used_cells; /* 1-2 */
+        int tsc_cell;   /* -1 if not used */
+        int adc_cell;   /* -1 if not used */
         struct mfd_cell cells[TSCADC_CELLS];
+        u32 reg_se_cache;
+        spinlock_t reg_lock;
 
         /* tsc device */
         struct titsc *tsc;
@@ -149,4 +139,15 @@ struct ti_tscadc_dev {
         struct adc_device *adc;
 };
 
+static inline struct ti_tscadc_dev *ti_tscadc_dev_get(struct platform_device *p)
+{
+        struct ti_tscadc_dev **tscadc_dev = p->dev.platform_data;
+
+        return *tscadc_dev;
+}
+
+void am335x_tsc_se_update(struct ti_tscadc_dev *tsadc);
+void am335x_tsc_se_set(struct ti_tscadc_dev *tsadc, u32 val);
+void am335x_tsc_se_clr(struct ti_tscadc_dev *tsadc, u32 val);
+
 #endif
diff --git a/include/linux/platform_data/ti_am335x_adc.h b/include/linux/platform_data/ti_am335x_adc.h
deleted file mode 100644
index e41d5834cb84..000000000000
--- a/include/linux/platform_data/ti_am335x_adc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __LINUX_TI_AM335X_ADC_H
-#define __LINUX_TI_AM335X_ADC_H
-
-/**
- * struct adc_data      ADC Input information
- * @adc_channels:       Number of analog inputs
- *                      available for ADC.
- */
-
-struct adc_data {
-        unsigned int adc_channels;
-};
-
-#endif