diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-13 11:44:57 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-13 16:28:07 +0100 |
| commit | 5ac4b013a31197b001d07590a79064747959bbd9 (patch) | |
| tree | e20ea10c14adc29bd530dbed08ed1dc393067d49 /drivers/input/imx_keypad.c | |
| parent | b187e4784acd08830008ac83eb3c821a8cdf5cd9 (diff) | |
| download | barebox-5ac4b013a31197b001d07590a79064747959bbd9.tar.gz barebox-5ac4b013a31197b001d07590a79064747959bbd9.tar.xz | |
input: Add device tree parsing support for matrix keymap
Add support for parsing the "linux,keymap" property.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/input/imx_keypad.c')
| -rw-r--r-- | drivers/input/imx_keypad.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/imx_keypad.c b/drivers/input/imx_keypad.c index bc74d7dee6..d3b5a8509e 100644 --- a/drivers/input/imx_keypad.c +++ b/drivers/input/imx_keypad.c @@ -396,8 +396,10 @@ static int __init imx_keypad_probe(struct device_d *dev) dev_dbg(dev, "enabled rows mask: %x\n", keypad->rows_en_mask); dev_dbg(dev, "enabled cols mask: %x\n", keypad->cols_en_mask); - matrix_keypad_build_keymap(keymap_data, MATRIX_ROW_SHIFT, + ret = matrix_keypad_build_keymap(dev, keymap_data, MATRIX_ROW_SHIFT, keypad->keycodes); + if (ret) + return ret; imx_keypad_config(keypad); |