Merge branch 'torvalds/master'
[firefly-linux-kernel-4.4.55.git] / drivers / input / keyboard / tc3589x-keypad.c
index 208de7cbb7fae2460dac5576c69f5847165ac3c9..e92dfd8889c2d337545997f788a55881e8e8b94f 100644 (file)
@@ -10,7 +10,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/input.h>
 #include <linux/platform_device.h>
@@ -18,6 +17,7 @@
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/mfd/tc3589x.h>
+#include <linux/device.h>
 
 /* Maximum supported keypad matrix row/columns size */
 #define TC3589x_MAX_KPROW               8
 #define TC3589x_EVT_INT_CLR    0x2
 #define TC3589x_KBD_INT_CLR    0x1
 
+/**
+ * struct tc35893_keypad_platform_data - platform specific keypad data
+ * @keymap_data:        matrix scan code table for keycodes
+ * @krow:               mask for available rows, value is 0xFF
+ * @kcol:               mask for available columns, value is 0xFF
+ * @debounce_period:    platform specific debounce time
+ * @settle_time:        platform specific settle down time
+ * @irqtype:            type of interrupt, falling or rising edge
+ * @enable_wakeup:      specifies if keypad event can wake up system from sleep
+ * @no_autorepeat:      flag for auto repetition
+ */
+struct tc3589x_keypad_platform_data {
+       const struct matrix_keymap_data *keymap_data;
+       u8                      krow;
+       u8                      kcol;
+       u8                      debounce_period;
+       u8                      settle_time;
+       unsigned long           irqtype;
+       bool                    enable_wakeup;
+       bool                    no_autorepeat;
+};
+
 /**
  * struct tc_keypad - data structure used by keypad driver
  * @tc3589x:    pointer to tc35893
@@ -297,6 +319,59 @@ static void tc3589x_keypad_close(struct input_dev *input)
        tc3589x_keypad_disable(keypad);
 }
 
+static const struct tc3589x_keypad_platform_data *
+tc3589x_keypad_of_probe(struct device *dev)
+{
+       struct device_node *np = dev->of_node;
+       struct tc3589x_keypad_platform_data *plat;
+       u32 cols, rows;
+       u32 debounce_ms;
+       int proplen;
+
+       if (!np)
+               return ERR_PTR(-ENODEV);
+
+       plat = devm_kzalloc(dev, sizeof(*plat), GFP_KERNEL);
+       if (!plat)
+               return ERR_PTR(-ENOMEM);
+
+       of_property_read_u32(np, "keypad,num-columns", &cols);
+       of_property_read_u32(np, "keypad,num-rows", &rows);
+       plat->kcol = (u8) cols;
+       plat->krow = (u8) rows;
+       if (!plat->krow || !plat->kcol ||
+            plat->krow > TC_KPD_ROWS || plat->kcol > TC_KPD_COLUMNS) {
+               dev_err(dev,
+                       "keypad columns/rows not properly specified (%ux%u)\n",
+                       plat->kcol, plat->krow);
+               return ERR_PTR(-EINVAL);
+       }
+
+       if (!of_get_property(np, "linux,keymap", &proplen)) {
+               dev_err(dev, "property linux,keymap not found\n");
+               return ERR_PTR(-ENOENT);
+       }
+
+       plat->no_autorepeat = of_property_read_bool(np, "linux,no-autorepeat");
+
+       plat->enable_wakeup = of_property_read_bool(np, "wakeup-source") ||
+                             /* legacy name */
+                             of_property_read_bool(np, "linux,wakeup");
+
+       /* The custom delay format is ms/16 */
+       of_property_read_u32(np, "debounce-delay-ms", &debounce_ms);
+       if (debounce_ms)
+               plat->debounce_period = debounce_ms * 16;
+       else
+               plat->debounce_period = TC_KPD_DEBOUNCE_PERIOD;
+
+       plat->settle_time = TC_KPD_SETTLE_TIME;
+       /* FIXME: should be property of the IRQ resource? */
+       plat->irqtype = IRQF_TRIGGER_FALLING;
+
+       return plat;
+}
+
 static int tc3589x_keypad_probe(struct platform_device *pdev)
 {
        struct tc3589x *tc3589x = dev_get_drvdata(pdev->dev.parent);
@@ -305,22 +380,25 @@ static int tc3589x_keypad_probe(struct platform_device *pdev)
        const struct tc3589x_keypad_platform_data *plat;
        int error, irq;
 
-       plat = tc3589x->pdata->keypad;
-       if (!plat) {
+       plat = tc3589x_keypad_of_probe(&pdev->dev);
+       if (IS_ERR(plat)) {
                dev_err(&pdev->dev, "invalid keypad platform data\n");
-               return -EINVAL;
+               return PTR_ERR(plat);
        }
 
        irq = platform_get_irq(pdev, 0);
        if (irq < 0)
                return irq;
 
-       keypad = kzalloc(sizeof(struct tc_keypad), GFP_KERNEL);
-       input = input_allocate_device();
-       if (!keypad || !input) {
-               dev_err(&pdev->dev, "failed to allocate keypad memory\n");
-               error = -ENOMEM;
-               goto err_free_mem;
+       keypad = devm_kzalloc(&pdev->dev, sizeof(struct tc_keypad),
+                             GFP_KERNEL);
+       if (!keypad)
+               return -ENOMEM;
+
+       input = devm_input_allocate_device(&pdev->dev);
+       if (!input) {
+               dev_err(&pdev->dev, "failed to allocate input device\n");
+               return -ENOMEM;
        }
 
        keypad->board = plat;
@@ -339,7 +417,7 @@ static int tc3589x_keypad_probe(struct platform_device *pdev)
                                           NULL, input);
        if (error) {
                dev_err(&pdev->dev, "Failed to build keymap\n");
-               goto err_free_mem;
+               return error;
        }
 
        keypad->keymap = input->keycode;
@@ -350,20 +428,23 @@ static int tc3589x_keypad_probe(struct platform_device *pdev)
 
        input_set_drvdata(input, keypad);
 
-       error = request_threaded_irq(irq, NULL,
-                       tc3589x_keypad_irq, plat->irqtype,
-                       "tc3589x-keypad", keypad);
-       if (error < 0) {
+       tc3589x_keypad_disable(keypad);
+
+       error = devm_request_threaded_irq(&pdev->dev, irq,
+                                         NULL, tc3589x_keypad_irq,
+                                         plat->irqtype | IRQF_ONESHOT,
+                                         "tc3589x-keypad", keypad);
+       if (error) {
                dev_err(&pdev->dev,
                                "Could not allocate irq %d,error %d\n",
                                irq, error);
-               goto err_free_mem;
+               return error;
        }
 
        error = input_register_device(input);
        if (error) {
                dev_err(&pdev->dev, "Could not register input device\n");
-               goto err_free_irq;
+               return error;
        }
 
        /* let platform decide if keypad is a wakeup source or not */
@@ -372,30 +453,6 @@ static int tc3589x_keypad_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, keypad);
 
-       return 0;
-
-err_free_irq:
-       free_irq(irq, keypad);
-err_free_mem:
-       input_free_device(input);
-       kfree(keypad);
-       return error;
-}
-
-static int tc3589x_keypad_remove(struct platform_device *pdev)
-{
-       struct tc_keypad *keypad = platform_get_drvdata(pdev);
-       int irq = platform_get_irq(pdev, 0);
-
-       if (!keypad->keypad_stopped)
-               tc3589x_keypad_disable(keypad);
-
-       free_irq(irq, keypad);
-
-       input_unregister_device(keypad->input);
-
-       kfree(keypad);
-
        return 0;
 }
 
@@ -444,11 +501,9 @@ static SIMPLE_DEV_PM_OPS(tc3589x_keypad_dev_pm_ops,
 static struct platform_driver tc3589x_keypad_driver = {
        .driver = {
                .name   = "tc3589x-keypad",
-               .owner  = THIS_MODULE,
                .pm     = &tc3589x_keypad_dev_pm_ops,
        },
        .probe  = tc3589x_keypad_probe,
-       .remove = tc3589x_keypad_remove,
 };
 module_platform_driver(tc3589x_keypad_driver);