ahci: Use sizeof(fis) instead of hardcoding '20'

[karo-tx-uboot.git] / drivers / input / tegra-kbc.c

diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c
index f164791bee6128fcf0b3bce5ec55cfb1db916ee6..ab7a9e33ee0bf86e1539bc8e90a2b250d13c8f36 100644 (file)
--- a/drivers/input/tegra-kbc.c
+++ b/drivers/input/tegra-kbc.c
@@ -30,7 +30,7 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
-#include <asm/arch/timer.h>
+#include <asm/arch-tegra/timer.h>
 #include <linux/input.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -321,9 +321,11 @@ static int init_tegra_keyboard(void)
                debug("%s: No keyboard register found\n", __func__);
                return -1;
        }
+       input_set_delays(&config.input, KBC_REPEAT_DELAY_MS,
+                       KBC_REPEAT_RATE_MS);
 
        /* Decode the keyboard matrix information (16 rows, 8 columns) */
-       if (key_matrix_init(&config.matrix, 16, 8)) {
+       if (key_matrix_init(&config.matrix, 16, 8, 1)) {
                debug("%s: Could not init key matrix\n", __func__);
                return -1;
        }
@@ -356,8 +358,7 @@ int drv_keyboard_init(void)
 {
        struct stdio_dev dev;
 
-       if (input_init(&config.input, 0, KBC_REPEAT_DELAY_MS,
-                       KBC_REPEAT_RATE_MS)) {
+       if (input_init(&config.input, 0)) {
                debug("%s: Cannot set up input\n", __func__);
                return -1;
        }