Input: twl4030-keypad - add device tree support

Add device tree support for twl4030 keypad driver.

Tested on Nokia N900.

Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/Documentation/devicetree/bindings/input/twl4030-keypad.txt b/Documentation/devicetree/bindings/input/twl4030-keypad.txt
new file mode 100644 (file)
index 0000000..e4be2f7
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/twl4030-keypad.txt
@@ -0,0 +1,27 @@
+* TWL4030's Keypad Controller device tree bindings
+
+TWL4030's Keypad controller is used to interface a SoC with a matrix-type
+keypad device. The keypad controller supports multiple row and column lines.
+A key can be placed at each intersection of a unique row and a unique column.
+The keypad controller can sense a key-press and key-release and report the
+event using a interrupt to the cpu.
+
+This binding is based on the matrix-keymap binding with the following
+changes:
+
+ * keypad,num-rows and keypad,num-columns are required.
+
+Required SoC Specific Properties:
+- compatible: should be one of the following
+   - "ti,twl4030-keypad": For controllers compatible with twl4030 keypad
+      controller.
+- interrupt: should be one of the following
+   - <1>: For controllers compatible with twl4030 keypad controller.
+
+Example:
+       twl_keypad: keypad {
+               compatible = "ti,twl4030-keypad";
+               interrupts = <1>;
+               keypad,num-rows = <8>;
+               keypad,num-columns = <8>;
+       };

diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c
index 8bc2879b4c876627c9e81db0f3c94120c4453130..f663c1953badb675b62d8ee847ef553ec4710a39 100644 (file)
--- a/drivers/input/keyboard/twl4030_keypad.c
+++ b/drivers/input/keyboard/twl4030_keypad.c
@@ -33,6 +33,7 @@
 #include <linux/platform_device.h>
 #include <linux/i2c/twl.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 
 /*
  * The TWL4030 family chips include a keypad controller that supports
@@ -60,6 +61,7 @@
 struct twl4030_keypad {
        unsigned short  keymap[TWL4030_KEYMAP_SIZE];
        u16             kp_state[TWL4030_MAX_ROWS];
+       bool            autorepeat;
        unsigned        n_rows;
        unsigned        n_cols;
        unsigned        irq;
@@ -331,20 +333,12 @@ static int twl4030_kp_program(struct twl4030_keypad *kp)
 static int twl4030_kp_probe(struct platform_device *pdev)
 {
        struct twl4030_keypad_data *pdata = dev_get_platdata(&pdev->dev);
-       const struct matrix_keymap_data *keymap_data;
+       const struct matrix_keymap_data *keymap_data = NULL;
        struct twl4030_keypad *kp;
        struct input_dev *input;
        u8 reg;
        int error;
 
-       if (!pdata || !pdata->rows || !pdata->cols || !pdata->keymap_data ||
-           pdata->rows > TWL4030_MAX_ROWS || pdata->cols > TWL4030_MAX_COLS) {
-               dev_err(&pdev->dev, "Invalid platform_data\n");
-               return -EINVAL;
-       }
-
-       keymap_data = pdata->keymap_data;
-
        kp = kzalloc(sizeof(*kp), GFP_KERNEL);
        input = input_allocate_device();
        if (!kp || !input) {
@@ -352,13 +346,9 @@ static int twl4030_kp_probe(struct platform_device *pdev)
                goto err1;
        }
 
-       /* Get the debug Device */
-       kp->dbg_dev = &pdev->dev;
-       kp->input = input;
-
-       kp->n_rows = pdata->rows;
-       kp->n_cols = pdata->cols;
-       kp->irq = platform_get_irq(pdev, 0);
+       /* get the debug device */
+       kp->dbg_dev             = &pdev->dev;
+       kp->input               = input;
 
        /* setup input device */
        input->name             = "TWL4030 Keypad";
@@ -370,6 +360,40 @@ static int twl4030_kp_probe(struct platform_device *pdev)
        input->id.product       = 0x0001;
        input->id.version       = 0x0003;
 
+       if (pdata) {
+               if (!pdata->rows || !pdata->cols || !pdata->keymap_data) {
+                       dev_err(&pdev->dev, "Missing platform_data\n");
+                       error = -EINVAL;
+                       goto err1;
+               }
+
+               kp->n_rows = pdata->rows;
+               kp->n_cols = pdata->cols;
+               kp->autorepeat = pdata->rep;
+               keymap_data = pdata->keymap_data;
+       } else {
+               error = matrix_keypad_parse_of_params(&pdev->dev, &kp->n_rows,
+                                                     &kp->n_cols);
+               if (error)
+                       goto err1;
+
+               kp->autorepeat = true;
+       }
+
+       if (kp->n_rows > TWL4030_MAX_ROWS || kp->n_cols > TWL4030_MAX_COLS) {
+               dev_err(&pdev->dev,
+                       "Invalid rows/cols amount specified in platform/devicetree data\n");
+               error = -EINVAL;
+               goto err1;
+       }
+
+       kp->irq = platform_get_irq(pdev, 0);
+       if (!kp->irq) {
+               dev_err(&pdev->dev, "no keyboard irq assigned\n");
+               error = -EINVAL;
+               goto err1;
+       }
+
        error = matrix_keypad_build_keymap(keymap_data, NULL,
                                           TWL4030_MAX_ROWS,
                                           1 << TWL4030_ROW_SHIFT,
@@ -381,7 +405,7 @@ static int twl4030_kp_probe(struct platform_device *pdev)
 
        input_set_capability(input, EV_MSC, MSC_SCAN);
        /* Enable auto repeat feature of Linux input subsystem */
-       if (pdata->rep)
+       if (kp->autorepeat)
                __set_bit(EV_REP, input->evbit);
 
        error = input_register_device(input);
@@ -443,6 +467,14 @@ static int twl4030_kp_remove(struct platform_device *pdev)
        return 0;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id twl4030_keypad_dt_match_table[] = {
+       { .compatible = "ti,twl4030-keypad" },
+       {},
+};
+MODULE_DEVICE_TABLE(of, twl4030_keypad_dt_match_table);
+#endif
+
 /*
  * NOTE: twl4030 are multi-function devices connected via I2C.
  * So this device is a child of an I2C parent, thus it needs to
@@ -455,6 +487,7 @@ static struct platform_driver twl4030_kp_driver = {
        .driver         = {
                .name   = "twl4030_keypad",
                .owner  = THIS_MODULE,
+               .of_match_table = of_match_ptr(twl4030_keypad_dt_match_table),
        },
 };
 module_platform_driver(twl4030_kp_driver);