Input: mcs - 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>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/keyboard/mcs_touchkey.c b/drivers/input/keyboard/mcs_touchkey.c
index 31090d71a685d18fe7bc0093b1927f304e3de7eb..be56d4f262a7e8ac0169b97698db2d6897acb2d4 100644 (file)
--- a/drivers/input/keyboard/mcs_touchkey.c
+++ b/drivers/input/keyboard/mcs_touchkey.c
@@ -13,11 +13,11 @@
 
 #include <linux/module.h>
 #include <linux/i2c.h>
-#include <linux/i2c/mcs.h>
 #include <linux/interrupt.h>
 #include <linux/input.h>
 #include <linux/irq.h>
 #include <linux/slab.h>
+#include <linux/platform_data/mcs.h>
 #include <linux/pm.h>
 
 /* MCS5000 Touchkey */

diff --git a/drivers/input/touchscreen/mcs5000_ts.c b/drivers/input/touchscreen/mcs5000_ts.c
index 90fc07dc98a6bbf86d000da1fc2834190b77c30e..8868573133ab24da5f9347f196ba7cded92ff97b 100644 (file)
--- a/drivers/input/touchscreen/mcs5000_ts.c
+++ b/drivers/input/touchscreen/mcs5000_ts.c
@@ -15,10 +15,10 @@
 
 #include <linux/module.h>
 #include <linux/i2c.h>
-#include <linux/i2c/mcs.h>
 #include <linux/interrupt.h>
 #include <linux/input.h>
 #include <linux/irq.h>
+#include <linux/platform_data/mcs.h>
 #include <linux/slab.h>
 
 /* Registers */

diff --git a/include/linux/i2c/mcs.h b/include/linux/i2c/mcs.h
deleted file mode 100644 (file)
index 61bb18a..0000000
--- a/include/linux/i2c/mcs.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2009 - 2010 Samsung Electronics Co.Ltd
- * Author: Joonyoung Shim <jy0922.shim@samsung.com>
- * Author: HeungJun Kim <riverful.kim@samsung.com>
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- */
-
-#ifndef __LINUX_MCS_H
-#define __LINUX_MCS_H
-
-#define MCS_KEY_MAP(v, c)      ((((v) & 0xff) << 16) | ((c) & 0xffff))
-#define MCS_KEY_VAL(v)         (((v) >> 16) & 0xff)
-#define MCS_KEY_CODE(v)                ((v) & 0xffff)
-
-struct mcs_platform_data {
-       void (*poweron)(bool);
-       void (*cfg_pin)(void);
-
-       /* touchscreen */
-       unsigned int x_size;
-       unsigned int y_size;
-
-       /* touchkey */
-       const u32 *keymap;
-       unsigned int keymap_size;
-       unsigned int key_maxval;
-       bool no_autorepeat;
-};
-
-#endif /* __LINUX_MCS_H */

diff --git a/include/linux/platform_data/mcs.h b/include/linux/platform_data/mcs.h
new file mode 100644 (file)
index 0000000..61bb18a
--- /dev/null
+++ b/include/linux/platform_data/mcs.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2009 - 2010 Samsung Electronics Co.Ltd
+ * Author: Joonyoung Shim <jy0922.shim@samsung.com>
+ * Author: HeungJun Kim <riverful.kim@samsung.com>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ */
+
+#ifndef __LINUX_MCS_H
+#define __LINUX_MCS_H
+
+#define MCS_KEY_MAP(v, c)      ((((v) & 0xff) << 16) | ((c) & 0xffff))
+#define MCS_KEY_VAL(v)         (((v) >> 16) & 0xff)
+#define MCS_KEY_CODE(v)                ((v) & 0xffff)
+
+struct mcs_platform_data {
+       void (*poweron)(bool);
+       void (*cfg_pin)(void);
+
+       /* touchscreen */
+       unsigned int x_size;
+       unsigned int y_size;
+
+       /* touchkey */
+       const u32 *keymap;
+       unsigned int keymap_size;
+       unsigned int key_maxval;
+       bool no_autorepeat;
+};
+
+#endif /* __LINUX_MCS_H */