linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
  • * Re: [PATCH] PXA27x keyboard support
       [not found]   ` <200611240109.22900.dtor@insightbb.com>
       [not found]     ` <20061124143534.GI11606@enneenne.com>
@ 2007-02-22 22:47     ` Rodolfo Giometti
  2007-02-23 12:21       ` Milind Dere
  2007-03-02 16:05       ` [PATCH] INPUT/keyboard: " Rodolfo Giometti
  1 sibling, 2 replies; 5+ messages in thread
From: Rodolfo Giometti @ 2007-02-22 22:47 UTC (permalink / raw)
  To: Dmitry Torokhov; +Cc: linux-input, linux-arm-kernel, Nicolas Pitre

[-- Attachment #1: Type: text/plain, Size: 2674 bytes --]

On Fri, Nov 24, 2006 at 01:09:22AM -0500, Dmitry Torokhov wrote:

> I was about to apply the patch below from Nicolas Pitre when I saw your
> post. I like your idea of defining keyboard data at machine level and
> have driver adapt to the hardware, however Nicolas driver seems to have
> more features. If I could ask you to work out how both your and Nicolas
> drivers can be merged together taht woudl be great.

Hello, here my last patch for the PXA27x keyboard support updated to
linux-2.6.21-rc1.

As already written I tried to add as mush possible from the Nicolas'
patch but since I haven't a mainstone I can't fully test the keyboard
hardware.

I know that this is not the best but I think it could be a good
starting point for further improvements. :)

Machines should call the driver with the following code:

static struct pxa27x_keyboard_platform_data wwpc1100_kbd = {
        .nr_rows = 4,
        .nr_cols = 4,
        .keycodes = {
                {
                        /* row 0 */
                        KEY_ESC,
                        KEY_ENTER,
                        KEY_F1,
                        -1,
                }, {    /* row 1 */
                        KEY_F2,
                        KEY_F3,
                        KEY_F4,
                        -1,
                }, {    /* row 2 */
                        KEY_UP,
                        KEY_LEFT,
                        KEY_RIGHT,
                        -1,
                }, {    /* row 3 */
                        KEY_DOWN,
                        -1,
                        -1,
                        -1,
                },
        },
        .gpio_modes = {
                 GPIO100_KP_MKIN0,
                 GPIO101_KP_MKIN1,
                 GPIO102_KP_MKIN2,
                 GPIO97_KP_MKIN3,
                 GPIO103_KP_MKOUT0,
                 GPIO104_KP_MKOUT1,
                 GPIO105_KP_MKOUT2,
                 GPIO106_KP_MKOUT3,
         },
};

static struct platform_device wwpc1100_keyboard = {
        .name   = "pxa27x-keyboard",
        .id     = -1,
        .dev    =  {
                .platform_data  = &wwpc1100_kbd,
        },
};

static struct platform_device *platform_devices[] __initdata = {
        &wwpc1100_audio_device,
        &wwpc1100_keyboard,
        &wwpc1100_lcd_bl_device,
        &wwpc1100_keyb_bl_device,
};


Signed-off-by: Rodolfo Giometti <giometti@enneenne.com>

-- 

GNU/Linux Solutions                  e-mail:    giometti@enneenne.com
Linux Device Driver                             giometti@gnudd.com
Embedded Systems                     		giometti@linux.it
UNIX programming                     phone:     +39 349 2432127

[-- Attachment #2: pxa27x-keyboard-support --]
[-- Type: text/plain, Size: 7380 bytes --]

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 6450968..18ce7b1 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -203,6 +203,12 @@ config KEYBOARD_OMAP
 	  To compile this driver as a module, choose M here: the
 	  module will be called omap-keypad.
 
+config KEYBOARD_PXA27x
+	tristate "PXA27x keyboard support"
+	depends on PXA27x
+	help
+	  Enable support for PXA27x matrix keyboard controller
+
 config KEYBOARD_AAED2000
 	tristate "AAED-2000 keyboard"
 	depends on MACH_AAED2000
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index 586a0fe..fc1d1f2 100644
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_KEYBOARD_SPITZ)		+= spitzkbd.o
 obj-$(CONFIG_KEYBOARD_HIL)		+= hil_kbd.o
 obj-$(CONFIG_KEYBOARD_HIL_OLD)		+= hilkbd.o
 obj-$(CONFIG_KEYBOARD_OMAP)		+= omap-keypad.o
+obj-$(CONFIG_KEYBOARD_PXA27x)		+= pxa27x_keyboard.o
 obj-$(CONFIG_KEYBOARD_AAED2000)		+= aaed2000_kbd.o
 obj-$(CONFIG_KEYBOARD_GPIO)		+= gpio_keys.o
 
diff --git a/drivers/input/keyboard/pxa27x_keyboard.c b/drivers/input/keyboard/pxa27x_keyboard.c
new file mode 100644
index 0000000..58ce556
--- /dev/null
+++ b/drivers/input/keyboard/pxa27x_keyboard.c
@@ -0,0 +1,225 @@
+/*
+ * linux/drivers/input/keyboard/pxa27x_keyboard.c
+ *
+ * Driver for the pxa27x matrix keyboard controller.
+ *
+ * Created:	Feb 22, 2007 
+ * Author:	Rodolfo Giometti <giometti@linux.it>
+ *
+ * Based on a previous implementations by Kevin O'Connor
+ * <kevin_at_koconnor.net> and Alex Osborne <bobofdoom@gmail.com> and
+ * on some suggestions by Nicolas Pitre <nico@cam.org>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/input.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+
+#include <asm/arch/hardware.h>
+#include <asm/arch/pxa-regs.h>
+#include <asm/arch/irqs.h>
+#include <asm/arch/pxa27x_keyboard.h>
+
+#define DRIVER_NAME		"pxa27x-keyboard"
+
+#define KPASMKP(col)		(col/2 == 0 ? KPASMKP0 : \
+				 col/2 == 1 ? KPASMKP1 : \
+				 col/2 == 2 ? KPASMKP2 : KPASMKP3)
+#define KPASMKPx_MKC(row, col)	(1<<(row+16*(col%2)))
+
+static irqreturn_t pxakbd_irq_handler(int irq, void *dev_id)
+{
+	struct device *dev = dev_id;
+	struct pxa27x_keyboard_platform_data *pdev = dev->platform_data;
+	struct input_dev *button_dev = dev->driver_data;
+	unsigned long kpc = KPC;
+	int p, row, col, rel;
+
+	if (kpc & KPC_DI) {
+		unsigned long kpdk = KPDK;
+
+		if (!(kpdk & KPDK_DKP)) {
+			/* better luck next time */
+		} else if (kpc & KPC_REE0) {
+			unsigned long kprec = KPREC;
+			KPREC = 0x7f;
+
+			if (kprec & KPREC_OF0)
+				rel = (kprec & 0xff) + 0x7f;
+			else if (kprec & KPREC_UF0)
+				rel = (kprec & 0xff) - 0x7f - 0xff;
+			else
+				rel = (kprec & 0xff) - 0x7f;
+
+			if (rel)
+				input_report_rel(button_dev, REL_WHEEL, rel);
+		}
+	}
+
+	if (kpc & KPC_MI) {
+		/* report the status of every button */
+		for (row = 0; row < pdev->nr_rows; row++) {
+			for (col = 0; col < pdev->nr_cols; col++) {
+				p = KPASMKP(col) & KPASMKPx_MKC(row, col) ?
+					1 : 0;
+				pr_debug("keycode %x - pressed %x\n",
+						pdev->keycodes[row][col], p);
+				input_report_key(button_dev,
+						pdev->keycodes[row][col], p);
+			}
+		}
+		input_sync(button_dev);
+	}
+
+	return IRQ_HANDLED;
+}
+
+static int pxakbd_open(struct input_dev *dev)
+{
+	/* Set keypad control register */
+	KPC |= (KPC_ASACT |
+		KPC_MS_ALL |
+		(2<<6) | KPC_REE0 | KPC_DK_DEB_SEL |
+		KPC_ME | KPC_MIE | KPC_DE | KPC_DIE);
+
+	KPC &= ~KPC_AS;         /* disable automatic scan */
+	KPC &= ~KPC_IMKP;       /* do not ignore multiple keypresses */
+
+	/* Set rotary count to mid-point value */
+	KPREC = 0x7F;
+
+	/* Enable unit clock */
+	pxa_set_cken(CKEN19_KEYPAD, 1);
+
+	return 0;
+}
+
+static void pxakbd_close(struct input_dev *dev)
+{
+	/* Disable clock unit */
+	pxa_set_cken(CKEN19_KEYPAD, 0);
+}
+
+static int pxakbd_probe(struct platform_device *pdev)
+{
+	struct pxa27x_keyboard_platform_data *pdata = pdev->dev.platform_data;
+	struct device *dev = &pdev->dev;
+	struct input_dev *button_dev;
+	int i, row, col, err;
+
+	/* Create and register the input driver. */
+	button_dev = input_allocate_device();
+	if (!button_dev) {
+		printk(KERN_ERR "Cannot request keypad device\n");
+		return -1;
+	}
+
+	set_bit(EV_KEY, button_dev->evbit);
+	set_bit(EV_REP, button_dev->evbit);
+	set_bit(EV_REL, button_dev->evbit);
+	set_bit(REL_WHEEL, button_dev->evbit);
+	for (row = 0; row < pdata->nr_rows; row++) {
+		for (col = 0; col < pdata->nr_cols; col++) {
+			int code = pdata->keycodes[row][col];
+			if (code <= 0)
+				continue;
+			set_bit(code, button_dev->keybit);
+		}
+	}
+
+        err = request_irq(IRQ_KEYPAD, pxakbd_irq_handler, SA_INTERRUPT,
+			  DRIVER_NAME, dev);
+	if (err) {
+		printk(KERN_ERR "Cannot request keypad IRQ\n");
+		pxa_set_cken(CKEN19_KEYPAD, 0);
+		return -1;
+	}
+
+	/* Register the input device */
+	button_dev->name = DRIVER_NAME;
+	button_dev->id.bustype = BUS_HOST;
+	button_dev->open = pxakbd_open;
+	button_dev->close = pxakbd_close;
+
+	err = input_register_device(button_dev);
+	if (err)
+		goto input_register_device_error;
+
+	platform_set_drvdata(pdev, button_dev);
+
+	/* Setup GPIOs. */
+	for (i = 0; i < pdata->nr_rows + pdata->nr_cols; i++)
+		pxa_gpio_mode(pdata->gpio_modes[i]);
+
+	/*
+	 * Store rows/cols info into keyboard registers.
+	 */
+
+	KPC |= (pdata->nr_rows-1) << 26;
+	KPC |= (pdata->nr_cols-1) << 23;
+
+	for (col = 0; col < pdata->nr_cols; col++)
+		KPC |= KPC_MS0<<col;
+
+	printk(KERN_INFO "PXA27x keyboard controller enabled\n");
+
+	return 0;
+
+input_register_device_error :
+	free_irq(IRQ_KEYPAD, button_dev);
+	input_free_device(button_dev);
+
+	return -ENOMEM;
+}
+
+static int __devexit pxakbd_remove(struct platform_device *pdev)
+{
+	struct input_dev *button_dev = platform_get_drvdata(pdev);
+	struct device *dev = &pdev->dev;
+
+	free_irq(IRQ_KEYPAD, dev);
+
+	input_unregister_device(button_dev);
+	input_free_device(button_dev);
+
+	platform_set_drvdata(pdev, NULL);
+
+	return 0;
+}
+
+static struct platform_driver pxakbd_driver = {
+	.probe  = pxakbd_probe,
+	.remove = __devexit_p(pxakbd_remove),
+	.driver	= {
+		.name	= DRIVER_NAME,
+	},
+};
+
+static int __init pxakbd_init(void)
+{
+	return platform_driver_register(&pxakbd_driver);
+}
+
+static void __exit pxakbd_exit(void)
+{
+	platform_driver_unregister(&pxakbd_driver);
+}
+
+module_init(pxakbd_init);
+module_exit(pxakbd_exit);
+
+MODULE_DESCRIPTION("PXA27x Matrix Keyboard Driver");
+MODULE_LICENSE("GPL");
diff --git a/include/asm-arm/arch-pxa/pxa27x_keyboard.h b/include/asm-arm/arch-pxa/pxa27x_keyboard.h
new file mode 100644
index 0000000..f83cf33
--- /dev/null
+++ b/include/asm-arm/arch-pxa/pxa27x_keyboard.h
@@ -0,0 +1,8 @@
+#define PXAKBD_MAXROW		8
+#define PXAKBD_MAXCOL		8
+
+struct pxa27x_keyboard_platform_data {
+	int nr_rows, nr_cols;
+	int keycodes[PXAKBD_MAXROW][PXAKBD_MAXCOL];
+	int gpio_modes[PXAKBD_MAXROW + PXAKBD_MAXCOL];
+};

^ permalink raw reply related	[flat|nested] 5+ messages in thread
    • end of thread, other threads:[~2007-03-07  5:35 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20061120155518.GA6910@enneenne.com>
     [not found] ` <20061120160516.GC6910@enneenne.com>
     [not found]   ` <200611240109.22900.dtor@insightbb.com>
     [not found]     ` <20061124143534.GI11606@enneenne.com>
     [not found]       ` <Pine.LNX.4.64.0611241030440.9647@xanadu.home>
2007-02-21 14:07         ` [PATCH] PXA27x keyboard support Rodolfo Giometti
2007-02-22 22:47     ` Rodolfo Giometti
2007-02-23 12:21       ` Milind Dere
2007-03-02 16:05       ` [PATCH] INPUT/keyboard: " Rodolfo Giometti
2007-03-07  5:35         ` Dmitry Torokhov

    This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).