diff options
| author | Simon Glass <sjg@chromium.org> | 2013-02-25 14:08:40 -0800 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-04-05 11:20:13 +0200 |
| commit | 43840415339f1600f281211cfb5400fab696536e (patch) | |
| tree | 8626b6b605073a39004fa932d2065c36d53f5731 /drivers/input/keyboard/tca8418_keypad.c | |
| parent | a17d94f0b6e1581391378dcb11c18ddebf6dcf8e (diff) | |
| download | linux-43840415339f1600f281211cfb5400fab696536e.tar.bz2 | |
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>
Diffstat (limited to 'drivers/input/keyboard/tca8418_keypad.c')
| -rw-r--r-- | drivers/input/keyboard/tca8418_keypad.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/input/keyboard/tca8418_keypad.c b/drivers/input/keyboard/tca8418_keypad.c index a34cc6714e5b..55c15304ddbc 100644 --- a/drivers/input/keyboard/tca8418_keypad.c +++ b/drivers/input/keyboard/tca8418_keypad.c @@ -288,8 +288,11 @@ static int tca8418_keypad_probe(struct i2c_client *client, irq_is_gpio = pdata->irq_is_gpio; } else { struct device_node *np = dev->of_node; - of_property_read_u32(np, "keypad,num-rows", &rows); - of_property_read_u32(np, "keypad,num-columns", &cols); + int err; + + err = matrix_keypad_parse_of_params(dev, &rows, &cols); + if (err) + return err; rep = of_property_read_bool(np, "keypad,autorepeat"); } |