4 files changed, 389 insertions, 0 deletions

diff --git a/arch/arm/mach-davinci/include/mach/keyscan.h b/arch/arm/mach-davinci/include/mach/keyscan.h
new file mode 100644
index 000000000000..b4e21a2976d1
--- /dev/null
+++ b/arch/arm/mach-davinci/include/mach/keyscan.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2009 Texas Instruments, Inc
+ *
+ * Author: Miguel Aguilar <miguel.aguilar@ridgerun.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef DAVINCI_KEYSCAN_H
+#define DAVINCI_KEYSCAN_H
+
+#include <linux/io.h>
+
+enum davinci_matrix_types {
+        DAVINCI_KEYSCAN_MATRIX_4X4,
+        DAVINCI_KEYSCAN_MATRIX_5X3,
+};
+
+struct davinci_ks_platform_data {
+        unsigned short  *keymap;
+        u32             keymapsize;
+        u8              rep:1;
+        u8              strobe;
+        u8              interval;
+        u8              matrix_type;
+};
+
+#endif
+
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index ee98b1bc5d89..203b88a82b56 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -361,6 +361,16 @@ config KEYBOARD_SH_KEYSC
           To compile this driver as a module, choose M here: the
           module will be called sh_keysc.
 
+config KEYBOARD_DAVINCI
+        tristate "TI DaVinci Key Scan"
+        depends on ARCH_DAVINCI_DM365
+        help
+          Say Y to enable keypad module support for the TI DaVinci
+          platforms (DM365).
+
+          To compile this driver as a module, choose M here: the
+          module will be called davinci_keyscan.
+
 config KEYBOARD_OMAP
         tristate "TI OMAP keypad support"
         depends on (ARCH_OMAP1 || ARCH_OMAP2)
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index babad5e58b77..68c017235ce9 100644
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_KEYBOARD_ATARI)		+= atakbd.o
 obj-$(CONFIG_KEYBOARD_ATKBD)            += atkbd.o
 obj-$(CONFIG_KEYBOARD_BFIN)             += bf54x-keys.o
 obj-$(CONFIG_KEYBOARD_CORGI)            += corgikbd.o
+obj-$(CONFIG_KEYBOARD_DAVINCI)          += davinci_keyscan.o
 obj-$(CONFIG_KEYBOARD_EP93XX)           += ep93xx_keypad.o
 obj-$(CONFIG_KEYBOARD_GPIO)             += gpio_keys.o
 obj-$(CONFIG_KEYBOARD_HIL)              += hil_kbd.o
diff --git a/drivers/input/keyboard/davinci_keyscan.c b/drivers/input/keyboard/davinci_keyscan.c
new file mode 100644
index 000000000000..6e52d855f637
--- /dev/null
+++ b/drivers/input/keyboard/davinci_keyscan.c
@@ -0,0 +1,337 @@
+/*
+ * DaVinci Key Scan Driver for TI platforms
+ *
+ * Copyright (C) 2009 Texas Instruments, Inc
+ *
+ * Author: Miguel Aguilar <miguel.aguilar@ridgerun.com>
+ *
+ * Intial Code: Sandeep Paulraj <s-paulraj@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/types.h>
+#include <linux/input.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+#include <linux/errno.h>
+
+#include <asm/irq.h>
+
+#include <mach/hardware.h>
+#include <mach/irqs.h>
+#include <mach/keyscan.h>
+
+/* Key scan registers */
+#define DAVINCI_KEYSCAN_KEYCTRL         0x0000
+#define DAVINCI_KEYSCAN_INTENA          0x0004
+#define DAVINCI_KEYSCAN_INTFLAG         0x0008
+#define DAVINCI_KEYSCAN_INTCLR          0x000c
+#define DAVINCI_KEYSCAN_STRBWIDTH       0x0010
+#define DAVINCI_KEYSCAN_INTERVAL        0x0014
+#define DAVINCI_KEYSCAN_CONTTIME        0x0018
+#define DAVINCI_KEYSCAN_CURRENTST       0x001c
+#define DAVINCI_KEYSCAN_PREVSTATE       0x0020
+#define DAVINCI_KEYSCAN_EMUCTRL         0x0024
+#define DAVINCI_KEYSCAN_IODFTCTRL       0x002c
+
+/* Key Control Register (KEYCTRL) */
+#define DAVINCI_KEYSCAN_KEYEN           0x00000001
+#define DAVINCI_KEYSCAN_PREVMODE        0x00000002
+#define DAVINCI_KEYSCAN_CHATOFF         0x00000004
+#define DAVINCI_KEYSCAN_AUTODET         0x00000008
+#define DAVINCI_KEYSCAN_SCANMODE        0x00000010
+#define DAVINCI_KEYSCAN_OUTTYPE         0x00000020
+
+/* Masks for the interrupts */
+#define DAVINCI_KEYSCAN_INT_CONT        0x00000008
+#define DAVINCI_KEYSCAN_INT_OFF         0x00000004
+#define DAVINCI_KEYSCAN_INT_ON          0x00000002
+#define DAVINCI_KEYSCAN_INT_CHANGE      0x00000001
+#define DAVINCI_KEYSCAN_INT_ALL         0x0000000f
+
+struct davinci_ks {
+        struct input_dev                *input;
+        struct davinci_ks_platform_data *pdata;
+        int                             irq;
+        void __iomem                    *base;
+        resource_size_t                 pbase;
+        size_t                          base_size;
+        unsigned short                  keymap[];
+};
+
+/* Initializing the kp Module */
+static int __init davinci_ks_initialize(struct davinci_ks *davinci_ks)
+{
+        struct device *dev = &davinci_ks->input->dev;
+        struct davinci_ks_platform_data *pdata = davinci_ks->pdata;
+        u32 matrix_ctrl;
+
+        /* Enable all interrupts */
+        __raw_writel(DAVINCI_KEYSCAN_INT_ALL,
+                     davinci_ks->base + DAVINCI_KEYSCAN_INTENA);
+
+        /* Clear interrupts if any */
+        __raw_writel(DAVINCI_KEYSCAN_INT_ALL,
+                     davinci_ks->base + DAVINCI_KEYSCAN_INTCLR);
+
+        /* Setup the scan period = strobe + interval */
+        __raw_writel(pdata->strobe,
+                     davinci_ks->base + DAVINCI_KEYSCAN_STRBWIDTH);
+        __raw_writel(pdata->interval,
+                     davinci_ks->base + DAVINCI_KEYSCAN_INTERVAL);
+        __raw_writel(0x01,
+                     davinci_ks->base + DAVINCI_KEYSCAN_CONTTIME);
+
+        /* Define matrix type */
+        switch (pdata->matrix_type) {
+        case DAVINCI_KEYSCAN_MATRIX_4X4:
+                matrix_ctrl = 0;
+                break;
+        case DAVINCI_KEYSCAN_MATRIX_5X3:
+                matrix_ctrl = (1 << 6);
+                break;
+        default: