summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-01-30 16:37:40 -0700
committerTom Warren <twarren@nvidia.com>2016-02-16 09:17:49 -0700
commit732484799b60c22c71f6ac0f1ff2db39bcd0c7d8 (patch)
treeea07679c61b3a027b98abce4a0e69f1528ccc1bb /drivers/input
parent727a25b2418031e1b94ba603e0eb61657024091b (diff)
downloadblackbird-obmc-uboot-732484799b60c22c71f6ac0f1ff2db39bcd0c7d8.tar.gz
blackbird-obmc-uboot-732484799b60c22c71f6ac0f1ff2db39bcd0c7d8.zip
tegra: keyboard: Fix the init order
We need to add the base tables before adding the function tables. Fix the init order so the keyboard scans keys correctly. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/tegra-kbc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c
index 951cbb4481..c77f610769 100644
--- a/drivers/input/tegra-kbc.c
+++ b/drivers/input/tegra-kbc.c
@@ -312,6 +312,7 @@ static int tegra_kbd_probe(struct udevice *dev)
__func__, ret);
return ret;
}
+ input_add_tables(input, false);
if (priv->matrix.fn_keycode) {
ret = input_add_table(input, KEY_FN, -1,
priv->matrix.fn_keycode,
@@ -326,7 +327,6 @@ static int tegra_kbd_probe(struct udevice *dev)
priv->input = input;
input->dev = dev;
input->read_keys = tegra_kbc_check;
- input_add_tables(input, false);
strcpy(sdev->name, "tegra-kbc");
ret = input_stdio_register(sdev);
if (ret) {
OpenPOWER on IntegriCloud