Input: rename cap1106 driver to cap11xx

There are several devices in cap11xx family besides cap1106. The driver can
be made to support all of them, so let's give it more generic name.

Signed-off-by: Matt Ranostay <mranostay@gmail.com>
Reviewed-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/Documentation/devicetree/bindings/input/cap1106.txt b/Documentation/devicetree/bindings/input/cap11xx.txt
similarity index 74%
rename from Documentation/devicetree/bindings/input/cap1106.txt
rename to Documentation/devicetree/bindings/input/cap11xx.txt
index 4b46390..5164920 100644 (file)
--- a/Documentation/devicetree/bindings/input/cap1106.txt
+++ b/Documentation/devicetree/bindings/input/cap11xx.txt
@@ -1,11 +1,12 @@
-Device tree bindings for Microchip CAP1106, 6 channel capacitive touch sensor
+Device tree bindings for Microchip CAP11xx based capacitive touch sensors
 
-The node for this driver must be a child of a I2C controller node, as the
+The node for this device must be a child of a I2C controller node, as the
 device communication via I2C only.
 
 Required properties:
 
-       compatible:             Must be "microchip,cap1106"
+       compatible:             Must contain one of:
+                                       "microchip,cap1106"
 
        reg:                    The I2C slave address of the device.
                                Only 0x28 is valid.
@@ -43,11 +44,11 @@ i2c_controller {
                autorepeat;
                microchip,sensor-gain = <2>;
 
-               linux,keycodes = <103           /* KEY_UP */
-                                 106           /* KEY_RIGHT */
-                                 108           /* KEY_DOWN */
-                                 105           /* KEY_LEFT */
-                                 109           /* KEY_PAGEDOWN */
-                                 104>;         /* KEY_PAGEUP */
+               linux,keycodes = <103>,         /* KEY_UP */
+                                <106>,         /* KEY_RIGHT */
+                                <108>,         /* KEY_DOWN */
+                                <105>,         /* KEY_LEFT */
+                                <109>,         /* KEY_PAGEDOWN */
+                                <104>;         /* KEY_PAGEUP */
        };
 }

diff --cc drivers/input/keyboard/Kconfig
Simple merge

diff --cc drivers/input/keyboard/Makefile
Simple merge

diff --cc drivers/input/keyboard/cap1106.c
Simple merge

diff --cc drivers/input/keyboard/cap11xx.c
Simple merge