Input: pmic8xxx-keypad - migrate to DT

The driver is only supported on DT enabled platforms. Convert the
driver to DT so that it can probe properly.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

3 files changed, 175 insertions, 116 deletions

diff --git a/Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt b/Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt
new file mode 100644
index 000000000000..7d8cb92831d7
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt
@@ -0,0 +1,89 @@
+Qualcomm PM8xxx PMIC Keypad
+
+PROPERTIES
+
+- compatible:
+        Usage: required
+        Value type: <string>
+        Definition: must be one of:
+                    "qcom,pm8058-keypad"
+                    "qcom,pm8921-keypad"
+
+- reg:
+        Usage: required
+        Value type: <prop-encoded-array>
+        Definition: address of keypad control register
+
+- interrupts:
+        Usage: required
+        Value type: <prop-encoded-array>
+        Definition: the first interrupt specifies the key sense interrupt
+                    and the second interrupt specifies the key stuck interrupt.
+                    The format of the specifier is defined by the binding
+                    document describing the node's interrupt parent.
+
+- linux,keymap:
+        Usage: required
+        Value type: <prop-encoded-array>
+        Definition: the linux keymap. More information can be found in
+                    input/matrix-keymap.txt.
+
+- linux,keypad-no-autorepeat:
+        Usage: optional
+        Value type: <bool>
+        Definition: don't enable autorepeat feature.
+
+- linux,keypad-wakeup:
+        Usage: optional
+        Value type: <bool>
+        Definition: use any event on keypad as wakeup event.
+
+- keypad,num-rows:
+        Usage: required
+        Value type: <u32>
+        Definition: number of rows in the keymap. More information can be found
+                    in input/matrix-keymap.txt.
+
+- keypad,num-columns:
+        Usage: required
+        Value type: <u32>
+        Definition: number of columns in the keymap. More information can be
+                    found in input/matrix-keymap.txt.
+
+- debounce:
+        Usage: optional
+        Value type: <u32>
+        Definition: time in microseconds that key must be pressed or release
+                    for key sense interrupt to trigger.
+
+- scan-delay:
+        Usage: optional
+        Value type: <u32>
+        Definition: time in microseconds to pause between successive scans
+                    of the matrix array.
+
+- row-hold:
+        Usage: optional
+        Value type: <u32>
+        Definition: time in nanoseconds to pause between scans of each row in
+                    the matrix array.
+
+EXAMPLE
+
+        keypad@148 {
+                compatible = "qcom,pm8921-keypad";
+                reg = <0x148>;
+                interrupt-parent = <&pmicintc>;
+                interrupts = <74 1>, <75 1>;
+                linux,keymap = <
+                        MATRIX_KEY(0, 0, KEY_VOLUMEUP)
+                        MATRIX_KEY(0, 1, KEY_VOLUMEDOWN)
+                        MATRIX_KEY(0, 2, KEY_CAMERA_FOCUS)
+                        MATRIX_KEY(0, 3, KEY_CAMERA)
+                        >;
+                keypad,num-rows = <1>;
+                keypad,num-columns = <5>;
+                debounce = <15>;
+                scan-delay = <32>;
+                row-hold = <91500>;
+        };
diff --git a/drivers/input/keyboard/pmic8xxx-keypad.c b/drivers/input/keyboard/pmic8xxx-keypad.c
index 0efd11e16b7e..80c6b0ef3fc8 100644
--- a/drivers/input/keyboard/pmic8xxx-keypad.c
+++ b/drivers/input/keyboard/pmic8xxx-keypad.c
@@ -20,8 +20,8 @@
 #include <linux/delay.h>
 #include <linux/mutex.h>
 #include <linux/regmap.h>
-
-#include <linux/input/pmic8xxx-keypad.h>
+#include <linux/of.h>
+#include <linux/input/matrix_keypad.h>
 
 #define PM8XXX_MAX_ROWS         18
 #define PM8XXX_MAX_COLS         8
@@ -84,7 +84,8 @@
 
 /**
  * struct pmic8xxx_kp - internal keypad data structure
- * @pdata - keypad platform data pointer
+ * @num_cols - number of columns of keypad
+ * @num_rows - number of row of keypad
  * @input - input device pointer for keypad
  * @regmap - regmap handle
  * @key_sense_irq - key press/release irq number
@@ -96,7 +97,8 @@
  * @ctrl_reg - control register value
  */
 struct pmic8xxx_kp {
-        const struct pm8xxx_keypad_platform_data *pdata;
+        unsigned int num_rows;
+        unsigned int num_cols;
         struct input_dev *input;
         struct regmap *regmap;
         int key_sense_irq;
@@ -115,9 +117,9 @@ static u8 pmic8xxx_col_state(struct pmic8xxx_kp *kp, u8 col)
 {
         /* all keys pressed on that particular row? */
         if (col == 0x00)
-                return 1 << kp->pdata->num_cols;
+                return 1 << kp->num_cols;
         else
-                return col & ((1 << kp->pdata->num_cols) - 1);
+                return col & ((1 << kp->num_cols) - 1);
 }
 
 /*
@@ -180,10 +182,10 @@ static int pmic8xxx_kp_read_matrix(struct pmic8xxx_kp *kp, u16 *new_state,
         int rc, read_rows;
         unsigned int scan_val;
 
-        if (kp->pdata->num_rows < PM8XXX_MIN_ROWS)
+        if (kp->num_rows < PM8XXX_MIN_ROWS)
                 read_rows = PM8XXX_MIN_ROWS;
         else
-                read_rows = kp->pdata->num_rows;
+                read_rows = kp->num_rows;
 
         pmic8xxx_chk_sync_read(kp);
 
@@ -227,13 +229,13 @@ static void __pmic8xxx_kp_scan_matrix(struct pmic8xxx_kp *kp, u16 *new_state,
 {
         int row, col, code;
 
-        for (row = 0; row < kp->pdata->num_rows; row++) {
+        for (row = 0; row < kp->num_rows; row++) {
                 int bits_changed = new_state[row] ^ old_state[row];
 
                 if (!bits_changed)
                         continue;
 
-                for (col = 0; col < kp->pdata->num_cols; col++) {
+                for (col = 0; col < kp->num_cols; col++) {