3 files changed, 44 insertions, 11 deletions

diff --git a/include/linux/spi/74x164.h b/include/linux/spi/74x164.h
index d85c52f294a..0aa6acc7331 100644
--- a/include/linux/spi/74x164.h
+++ b/include/linux/spi/74x164.h
@@ -1,8 +1,6 @@
 #ifndef LINUX_SPI_74X164_H
 #define LINUX_SPI_74X164_H
 
-#define GEN_74X164_DRIVER_NAME "74x164"
-
 struct gen_74x164_chip_platform_data {
         /* number assigned to the first GPIO */
         unsigned        base;
diff --git a/include/linux/spi/mcp23s08.h b/include/linux/spi/mcp23s08.h
index c42cff8ca19..2d676d5aaa8 100644
--- a/include/linux/spi/mcp23s08.h
+++ b/include/linux/spi/mcp23s08.h
@@ -22,13 +22,4 @@ struct mcp23s08_platform_data {
          * base to base+15 (or base+31 for s17 variant).
          */
         unsigned        base;
-
-        void            *context;       /* param to setup/teardown */
-
-        int             (*setup)(struct spi_device *spi,
-                                        int gpio, unsigned ngpio,
-                                        void *context);
-        int             (*teardown)(struct spi_device *spi,
-                                        int gpio, unsigned ngpio,
-                                        void *context);
 };
diff --git a/include/linux/spi/rm31080a_ts.h b/include/linux/spi/rm31080a_ts.h
new file mode 100644
index 00000000000..13323a6f2ec
--- /dev/null
+++ b/include/linux/spi/rm31080a_ts.h
@@ -0,0 +1,44 @@
+#ifndef _RM31080A_TS_H_
+#define _RM31080A_TS_H_
+
+#define ENABLE_RAW_DATA_QUEUE
+
+#define RM_IOCTL_REPORT_POINT    0x1001
+#define RM_IOCTL_SET_HAL_PID     0x1002
+#define RM_IOCTL_INIT_START      0x1003
+#define RM_IOCTL_INIT_END        0x1004
+#define RM_IOCTL_FINISH_CALC     0x1005
+#define RM_IOCTL_SCRIBER_CTRL    0x1006
+#define RM_IOCTL_READ_RAW_DATA   0x1007
+#define RM_IOCTL_AUTOSCAN_CTRL   0x1008
+#define RM_IOCTL_NOISE_CHECK     0x1009
+#define RM_IOCTL_GET_PARAMETER   0x100A
+#define RM_IOCTL_SET_PARAMETER   0x100B
+
+#define RM_INPUT_RESOLUTION_X    4096
+#define RM_INPUT_RESOLUTION_Y    4096
+
+#define RM_TS_SIGNAL            44
+#define RM_TS_MAX_POINTS        16
+
+#define RM_SIGNAL_INTR          0x00000001
+#define RM_SIGNAL_SUSPEND       0x00000002
+#define RM_SIGNAL_RESUME        0x00000003
+
+typedef struct {
+        unsigned char ucTouchCount;
+        unsigned char ucID[RM_TS_MAX_POINTS];
+        unsigned short usX[RM_TS_MAX_POINTS];
+        unsigned short usY[RM_TS_MAX_POINTS];
+        unsigned short usZ[RM_TS_MAX_POINTS];
+} rm_touch_event;
+
+
+struct rm_spi_ts_platform_data{
+        int gpio_reset;
+        int x_size;
+        int y_size;
+        unsigned char* config;
+};
+
+#endif                          //_RM31080A_TS_H_