1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/input/keyboard/spear-keyboard.c b/drivers/input/keyboard/spear-keyboard.c
index c88bd63dc9cc..933fb019b967 100644
--- a/drivers/input/keyboard/spear-keyboard.c
+++ b/drivers/input/keyboard/spear-keyboard.c
@@ -50,6 +50,7 @@
 #define ROW_MASK        0xF0
 #define COLUMN_MASK     0x0F
 #define ROW_SHIFT       4
+#define KEY_MATRIX_SHIFT        6
 
 struct spear_kbd {
         struct input_dev *input;
@@ -57,6 +58,7 @@ struct spear_kbd {
         void __iomem *io_base;
         struct clk *clk;
         unsigned int irq;
+        unsigned int mode;
         unsigned short last_key;
         unsigned short keycodes[256];
 };
@@ -106,7 +108,8 @@ static int spear_kbd_open(struct input_dev *dev)
                 return error;
 
         /* program keyboard */
-        val = SCAN_RATE_80 | MODE_KEYBOARD | PCLK_FREQ_MSK;
+        val = SCAN_RATE_80 | MODE_KEYBOARD | PCLK_FREQ_MSK |
+                (kbd->mode << KEY_MATRIX_SHIFT);
         writew(val, kbd->io_base + MODE_REG);
         writeb(1, kbd->io_base + STATUS_REG);
 
@@ -176,6 +179,8 @@ static int __devinit spear_kbd_probe(struct platform_device *pdev)
 
         kbd->input = input_dev;
         kbd->irq = irq;
+        kbd->mode = pdata->mode;
+
         kbd->res = request_mem_region(res->start, resource_size(res),
                                       pdev->name);
         if (!kbd->res) {