24 files changed, 610 insertions, 287 deletions

diff --git a/Documentation/devicetree/bindings/input/gpio-keys-polled.txt b/Documentation/devicetree/bindings/input/gpio-keys-polled.txt
new file mode 100644
index 000000000000..313abefa37cc
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/gpio-keys-polled.txt
@@ -0,0 +1,38 @@
+Device-Tree bindings for input/gpio_keys_polled.c keyboard driver
+
+Required properties:
+        - compatible = "gpio-keys-polled";
+        - poll-interval: Poll interval time in milliseconds
+
+Optional properties:
+        - autorepeat: Boolean, Enable auto repeat feature of Linux input
+          subsystem.
+
+Each button (key) is represented as a sub-node of "gpio-keys-polled":
+Subnode properties:
+
+        - gpios: OF device-tree gpio specification.
+        - label: Descriptive name of the key.
+        - linux,code: Keycode to emit.
+
+Optional subnode-properties:
+        - linux,input-type: Specify event type this button/key generates.
+          If not specified defaults to <1> == EV_KEY.
+        - debounce-interval: Debouncing interval time in milliseconds.
+          If not specified defaults to 5.
+        - gpio-key,wakeup: Boolean, button can wake-up the system.
+
+Example nodes:
+
+        gpio_keys_polled {
+                        compatible = "gpio-keys-polled";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        poll-interval = <100>;
+                        autorepeat;
+                        button@21 {
+                                label = "GPIO Key UP";
+                                linux,code = <103>;
+                                gpios = <&gpio1 0 1>;
+                        };
+                        ...
diff --git a/Documentation/devicetree/bindings/input/rotary-encoder.txt b/Documentation/devicetree/bindings/input/rotary-encoder.txt
new file mode 100644
index 000000000000..331549593ed5
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/rotary-encoder.txt
@@ -0,0 +1,36 @@
+Rotary encoder DT bindings
+
+Required properties:
+- gpios: a spec for two GPIOs to be used
+
+Optional properties:
+- linux,axis: the input subsystem axis to map to this rotary encoder.
+  Defaults to 0 (ABS_X / REL_X)
+- rotary-encoder,steps: Number of steps in a full turnaround of the
+  encoder. Only relevant for absolute axis. Defaults to 24 which is a
+  typical value for such devices.
+- rotary-encoder,relative-axis: register a relative axis rather than an
+  absolute one. Relative axis will only generate +1/-1 events on the input
+  device, hence no steps need to be passed.
+- rotary-encoder,rollover: Automatic rollove when the rotary value becomes
+  greater than the specified steps or smaller than 0. For absolute axis only.
+- rotary-encoder,half-period: Makes the driver work on half-period mode.
+
+See Documentation/input/rotary-encoder.txt for more information.
+
+Example:
+
+                rotary@0 {
+                        compatible = "rotary-encoder";
+                        gpios = <&gpio 19 1>, <&gpio 20 0>; /* GPIO19 is inverted */
+                        linux,axis = <0>; /* REL_X */
+                        rotary-encoder,relative-axis;
+                };
+
+                rotary@1 {
+                        compatible = "rotary-encoder";
+                        gpios = <&gpio 21 0>, <&gpio 22 0>;
+                        linux,axis = <1>; /* ABS_Y */
+                        rotary-encoder,steps = <24>;
+                        rotary-encoder,rollover;
+                };
diff --git a/drivers/input/apm-power.c b/drivers/input/apm-power.c
index e90ee3d30613..650177a3c858 100644
--- a/drivers/input/apm-power.c
+++ b/drivers/input/apm-power.c
@@ -33,7 +33,7 @@ static void system_power_event(unsigned int keycode)
 }
 
 static void apmpower_event(struct input_handle *handle, unsigned int type,
-                        unsigned int code, int value)
+                           unsigned int code, int value)
 {
         /* only react on key down events */
         if (value != 1)
diff --git a/drivers/input/ff-core.c b/drivers/input/ff-core.c
index 480eb9d9876a..f50f6dd92274 100644
--- a/drivers/input/ff-core.c
+++ b/drivers/input/ff-core.c
@@ -138,8 +138,8 @@ int input_ff_upload(struct input_dev *dev, struct ff_effect *effect,
 
         if (effect->id == -1) {
                 for (id = 0; id < ff->max_effects; id++)
-                     if (!ff->effect_owners[id])
-                        break;
+                        if (!ff->effect_owners[id])
+                                break;
 
                 if (id >= ff->max_effects) {
                         ret = -ENOSPC;
diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c
index b107922514fb..74c0d8c6002a 100644
--- a/drivers/input/ff-memless.c
+++ b/drivers/input/ff-memless.c
@@ -72,12 +72,14 @@ static const struct ff_envelope *get_envelope(const struct ff_effect *effect)
         static const struct ff_envelope empty_envelope;
 
         switch (effect->type) {
-                case FF_PERIODIC:
-                        return &effect->u.periodic.envelope;
-                case FF_CONSTANT:
-                        return &effect->u.constant.envelope;
-                default:
-                        return &empty_envelope;
+        case FF_PERIODIC:
+                return &effect->u.periodic.envelope;
+
+        case FF_CONSTANT:
+                return &effect->u.constant.envelope;
+
+        default:
+                return &empty_envelope;
         }
 }
 
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 5244f3d05b12..ace3f7c4226d 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -918,18 +918,10 @@ int input_set_keycode(struct input_dev *dev,
 }
 EXPORT_SYMBOL(input_set_keycode);
 
-#define MATCH_BIT(bit, max) \
-                for (i = 0; i < BITS_TO_LONGS(max); i++) \
-                        if ((id->bit[i] & dev->bit[i]) != id->bit[i]) \
-                                break; \
-                if (i != BITS_TO_LONGS(max)) \
-                        continue;
-
 static const struct input_device_id *input_match_device(struct input_handler *handler,
                                                         struct input_dev *dev)
 {
         const struct input_device_id *id;
-        int i;
 
         for (id = handler->id_table; id->flags || id->driver_info; id++) {