input: matrix-keymap: Add function to read the new DT binding

We now have a binding which adds two parameters to the matrix keypad DT
node. This is separate from the GPIO-driven matrix keypad binding, and
unfortunately incompatible, since that uses row-gpios/col-gpios for the
row and column counts.

So the easiest option here is to provide a function for non-GPIO drivers
to use to decode the binding.

Note: We could in fact create an entirely separate structure to hold
these two fields, but it does not seem worth it, yet. If we have more
parameters then we can add this, and then refactor each driver to hold
such a structure.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Tested-by: Sourav Poddar <sourav.poddar@ti.com> (v2)
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

1 files changed, 5 insertions, 11 deletions

diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
index e25b022692cd..1b289092f4e3 100644
--- a/drivers/input/keyboard/omap4-keypad.c
+++ b/drivers/input/keyboard/omap4-keypad.c
@@ -215,18 +215,12 @@ static int omap4_keypad_parse_dt(struct device *dev,
                                  struct omap4_keypad *keypad_data)
 {
         struct device_node *np = dev->of_node;
+        int err;
 
-        if (!np) {
-                dev_err(dev, "missing DT data");
-                return -EINVAL;
-        }
-
-        of_property_read_u32(np, "keypad,num-rows", &keypad_data->rows);
-        of_property_read_u32(np, "keypad,num-columns", &keypad_data->cols);
-        if (!keypad_data->rows || !keypad_data->cols) {
-                dev_err(dev, "number of keypad rows/columns not specified\n");
-                return -EINVAL;
-        }
+        err = matrix_keypad_parse_of_params(dev, &keypad_data->rows,
+                                            &keypad_data->cols);
+        if (err)
+                return err;
 
         if (of_get_property(np, "linux,input-no-autorepeat", NULL))
                 keypad_data->no_autorepeat = true;