Input: tsc2007 - move header file out of I2C realm

include/linux/i2c is not for client devices. Move the header file to a
more appropriate location.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 6d612792f6b8ec6f41fd720cec952d173e4f5ca2..1faf6cb93dcb5659f1765c4072b93fe8297c0efc 100644 (file)
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -24,7 +24,7 @@
 #include <linux/usb/r8a66597.h>
 #include <linux/usb/renesas_usbhs.h>
 #include <linux/i2c.h>
-#include <linux/i2c/tsc2007.h>
+#include <linux/platform_data/tsc2007.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/sh_msiof.h>
 #include <linux/spi/mmc_spi.h>

diff --git a/drivers/input/touchscreen/tsc2007_core.c b/drivers/input/touchscreen/tsc2007_core.c
index fc7384936011dce48ba6d7c96d83bcc358409df8..8342e0c48a534d5554522a136cb46550e1a06461 100644 (file)
--- a/drivers/input/touchscreen/tsc2007_core.c
+++ b/drivers/input/touchscreen/tsc2007_core.c
@@ -25,9 +25,9 @@
 #include <linux/input.h>
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
-#include <linux/i2c/tsc2007.h>
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
+#include <linux/platform_data/tsc2007.h>
 #include "tsc2007.h"
 
 int tsc2007_xfer(struct tsc2007 *tsc, u8 cmd)

diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index c9339f85359b74482358f1d15328e0d03c4f732c..cd4a6d7d6750e8dabcb48518afc20518f471bb8c 100644 (file)
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -32,13 +32,13 @@
 #include <linux/i2c.h>
 #include <linux/i2c-ocores.h>
 #include <linux/i2c-xiic.h>
-#include <linux/i2c/tsc2007.h>
 
 #include <linux/spi/spi.h>
 #include <linux/spi/xilinx_spi.h>
 #include <linux/spi/max7301.h>
 #include <linux/spi/mc33880.h>
 
+#include <linux/platform_data/tsc2007.h>
 #include <linux/platform_data/media/timb_radio.h>
 #include <linux/platform_data/media/timb_video.h>
 

diff --git a/include/linux/i2c/tsc2007.h b/include/linux/i2c/tsc2007.h
deleted file mode 100644 (file)
index 4f35b6a..0000000
--- a/include/linux/i2c/tsc2007.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __LINUX_I2C_TSC2007_H
-#define __LINUX_I2C_TSC2007_H
-
-/* linux/i2c/tsc2007.h */
-
-struct tsc2007_platform_data {
-       u16     model;                          /* 2007. */
-       u16     x_plate_ohms;   /* must be non-zero value */
-       u16     max_rt; /* max. resistance above which samples are ignored */
-       unsigned long poll_period; /* time (in ms) between samples */
-       int     fuzzx; /* fuzz factor for X, Y and pressure axes */
-       int     fuzzy;
-       int     fuzzz;
-
-       int     (*get_pendown_state)(struct device *);
-       /* If needed, clear 2nd level interrupt source */
-       void    (*clear_penirq)(void);
-       int     (*init_platform_hw)(void);
-       void    (*exit_platform_hw)(void);
-};
-
-#endif

diff --git a/include/linux/platform_data/tsc2007.h b/include/linux/platform_data/tsc2007.h
new file mode 100644 (file)
index 0000000..c2d3aa1
--- /dev/null
+++ b/include/linux/platform_data/tsc2007.h
@@ -0,0 +1,22 @@
+#ifndef __LINUX_I2C_TSC2007_H
+#define __LINUX_I2C_TSC2007_H
+
+/* linux/platform_data/tsc2007.h */
+
+struct tsc2007_platform_data {
+       u16     model;                          /* 2007. */
+       u16     x_plate_ohms;   /* must be non-zero value */
+       u16     max_rt; /* max. resistance above which samples are ignored */
+       unsigned long poll_period; /* time (in ms) between samples */
+       int     fuzzx; /* fuzz factor for X, Y and pressure axes */
+       int     fuzzy;
+       int     fuzzz;
+
+       int     (*get_pendown_state)(struct device *);
+       /* If needed, clear 2nd level interrupt source */
+       void    (*clear_penirq)(void);
+       int     (*init_platform_hw)(void);
+       void    (*exit_platform_hw)(void);
+};
+
+#endif