5 files changed, 107 insertions, 15 deletions

diff --git a/include/linux/input.h b/include/linux/input.h
index 7ed2251b33f1..83524e4f3290 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -806,6 +806,7 @@ struct input_absinfo {
 #define BUS_HOST                0x19
 #define BUS_GSC                 0x1A
 #define BUS_ATARI               0x1B
+#define BUS_SPI                 0x1C
 
 /*
  * MT_TOOL types
diff --git a/include/linux/input/ad714x.h b/include/linux/input/ad714x.h
new file mode 100644
index 000000000000..0cbe5e81482e
--- /dev/null
+++ b/include/linux/input/ad714x.h
@@ -0,0 +1,63 @@
+/*
+ * include/linux/input/ad714x.h
+ *
+ * AD714x is very flexible, it can be used as buttons, scrollwheel,
+ * slider, touchpad at the same time. That depends on the boards.
+ * The platform_data for the device's "struct device" holds this
+ * information.
+ *
+ * Copyright 2009 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#ifndef __LINUX_INPUT_AD714X_H__
+#define __LINUX_INPUT_AD714X_H__
+
+#define STAGE_NUM              12
+#define STAGE_CFGREG_NUM       8
+#define SYS_CFGREG_NUM         8
+
+/* board information which need be initialized in arch/mach... */
+struct ad714x_slider_plat {
+        int start_stage;
+        int end_stage;
+        int max_coord;
+};
+
+struct ad714x_wheel_plat {
+        int start_stage;
+        int end_stage;
+        int max_coord;
+};
+
+struct ad714x_touchpad_plat {
+        int x_start_stage;
+        int x_end_stage;
+        int x_max_coord;
+
+        int y_start_stage;
+        int y_end_stage;
+        int y_max_coord;
+};
+
+struct ad714x_button_plat {
+        int keycode;
+        unsigned short l_mask;
+        unsigned short h_mask;
+};
+
+struct ad714x_platform_data {
+        int slider_num;
+        int wheel_num;
+        int touchpad_num;
+        int button_num;
+        struct ad714x_slider_plat *slider;
+        struct ad714x_wheel_plat *wheel;
+        struct ad714x_touchpad_plat *touchpad;
+        struct ad714x_button_plat *button;
+        unsigned short stage_cfg_reg[STAGE_NUM][STAGE_CFGREG_NUM];
+        unsigned short sys_cfg_reg[SYS_CFGREG_NUM];
+};
+
+#endif
diff --git a/include/linux/serio.h b/include/linux/serio.h
index 64b473066b9a..b5552568178d 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -196,5 +196,6 @@ static inline void serio_continue_rx(struct serio *serio)
 #define SERIO_TOUCHIT213        0x38
 #define SERIO_W8001     0x39
 #define SERIO_DYNAPRO   0x3a
+#define SERIO_HAMPSHIRE 0x3b
 
 #endif
diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
index 99adcdc0d3ca..4496322e28dd 100644
--- a/include/linux/sysrq.h
+++ b/include/linux/sysrq.h
@@ -39,41 +39,34 @@ struct sysrq_key_op {
 
 #ifdef CONFIG_MAGIC_SYSRQ
 
-extern int sysrq_on(void);
-
-/*
- * Do not use this one directly:
- */
-extern int __sysrq_enabled;
-
 /* Generic SysRq interface -- you may call it from any device driver, supplying
  * ASCII code of the key, pointer to registers and kbd/tty structs (if they
  * are available -- else NULL's).
  */
 
 void handle_sysrq(int key, struct tty_struct *tty);
-void __handle_sysrq(int key, struct tty_struct *tty, int check_mask);
 int register_sysrq_key(int key, struct sysrq_key_op *op);
 int unregister_sysrq_key(int key, struct sysrq_key_op *op);
 struct sysrq_key_op *__sysrq_get_key_op(int key);
 
+int sysrq_toggle_support(int enable_mask);
+
 #else
 
-static inline int sysrq_on(void)
+static inline void handle_sysrq(int key, struct tty_struct *tty)
 {
-        return 0;
 }
-static inline int __reterr(void)
+
+static inline int register_sysrq_key(int key, struct sysrq_key_op *op)
 {
         return -EINVAL;
 }
-static inline void handle_sysrq(int key, struct tty_struct *tty)
+
+static inline int unregister_sysrq_key(int key, struct sysrq_key_op *op)
 {
+        return -EINVAL;
 }
 
-#define register_sysrq_key(ig,nore) __reterr()
-#define unregister_sysrq_key(ig,nore) __reterr()
-
 #endif
 
 #endif /* _LINUX_SYSRQ_H */
diff --git a/include/linux/tca6416_keypad.h b/include/linux/tca6416_keypad.h
new file mode 100644
index 000000000000..7bd266f3525c
--- /dev/null
+++ b/include/linux/tca6416_keypad.h
@@ -0,0 +1,34 @@
+/*
+ * tca6416 keypad platform support
+ *
+ * Copyright (C) 2010 Texas Instruments
+ *
+ * Author: Sriramakrishnan <srk@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _TCA6416_KEYS_H
+#define _TCA6416_KEYS_H
+
+#include <linux/types.h>
+
+struct tca6416_button {
+        /* Configuration parameters */
+        int code;               /* input event code (KEY_*, SW_*) */
+        int active_low;
+        int type;               /* input event type (EV_KEY, EV_SW) */
+};
+
+struct tca6416_keys_platform_data {
+        struct tca6416_button *buttons;
+        int nbuttons;
+        unsigned int rep:1;     /* enable input subsystem auto repeat */
+        uint16_t pinmask;
+        uint16_t invert;
+        int irq_is_gpio;
+        int use_polling;        /* use polling if Interrupt is not connected*/
+};
+#endif