intel_mid: Keypad Driver
Subsystems (2)
PATCH 1/1 intel_mid: Keypad Driver
From: Zheng Ba <[email protected]>
This patch adds the keypad support for the MID platform keypad interfaces.
(some tidying Alan Cox)
---
drivers/input/keyboard/Kconfig | 7 drivers/input/keyboard/Makefile | 1 drivers/input/keyboard/intel_mid_keypad.c | 781 +++++++++++++++++++++++++++++ 3 files changed, 789 insertions(+), 0 deletions(-) create mode 100644 drivers/input/keyboard/intel_mid_keypad.c
drivers/input/keyboard/Kconfig +7 -0
@@ -318,6 +318,13 @@ config KEYBOARD_IMX To compile this driver as a module, choose M here: the module will be called imx_keypad. +config KEYBOARD_INTEL_MID + tristate "Intel MID keypad support" + depends on GPIO_LANGWELL + help + Say Y if you want support for Intel MID keypad devices + depends on GPIO_LANGWELL + config KEYBOARD_NEWTON tristate "Newton keyboard" select SERIO
drivers/input/keyboard/Makefile +1 -0
@@ -13,6 +13,7 @@ obj-$(CONFIG_KEYBOARD_ATKBD) += atkbd.o obj-$(CONFIG_KEYBOARD_BFIN) += bf54x-keys.o obj-$(CONFIG_KEYBOARD_DAVINCI) += davinci_keyscan.o obj-$(CONFIG_KEYBOARD_EP93XX) += ep93xx_keypad.o +obj-$(CONFIG_KEYBOARD_INTEL_MID) += intel_mid_keypad.o obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o obj-$(CONFIG_KEYBOARD_TCA6416) += tca6416-keypad.o obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o
drivers/input/keyboard/intel_mid_keypad.c new file +781 -0
781 lines not on this page · raw message
Dmitry Torokhov
maintainerHi Alan,
Quoted 23 lines · Alan Cox
From: Zheng Ba <[email protected]>
This patch adds the keypad support for the MID platform keypad interfaces.
(some tidying Alan Cox)
Signed-off-by Zheng Ba <[email protected]>Signed-off-by Alan Cox <[email protected]>---
drivers/input/keyboard/Kconfig | 7 drivers/input/keyboard/Makefile | 1 drivers/input/keyboard/intel_mid_keypad.c | 781 +++++++++++++++++++++++++++++ 3 files changed, 789 insertions(+), 0 deletions(-) create mode 100644 drivers/input/keyboard/intel_mid_keypad.cdrivers/input/keyboard/Kconfig +0
-0
drivers/input/keyboard/Kconfig config KEYBOARD_IMX · line 326
Quoted 9 lines
drivers/input/keyboard/Kconfig +6
-0@@ -318,6 +318,13 @@ config KEYBOARD_IMX To compile this driver as a module, choose M here: the module will be called imx_keypad. +config KEYBOARD_INTEL_MID + tristate "Intel MID keypad support" + depends on GPIO_LANGWELL + help + Say Y if you want support for Intel MID keypad devices + depends on GPIO_LANGWELL
Add period at the end please. Also aplease add "To compile this adriver as a module...".
drivers/input/keyboard/Makefile obj-$(CONFIG_KEYBOARD_ATKBD) += atkbd.o · line 16
Quoted 12 lines
drivers/input/keyboard/Kconfig +0
-0config KEYBOARD_NEWTON tristate "Newton keyboard" select SERIOdrivers/input/keyboard/Makefile +1
-0@@ -13,6 +13,7 @@ obj-$(CONFIG_KEYBOARD_ATKBD) += atkbd.o obj-$(CONFIG_KEYBOARD_BFIN) += bf54x-keys.o obj-$(CONFIG_KEYBOARD_DAVINCI) += davinci_keyscan.o obj-$(CONFIG_KEYBOARD_EP93XX) += ep93xx_keypad.o +obj-$(CONFIG_KEYBOARD_INTEL_MID) += intel_mid_keypad.o
I am tempted to rename it to mid_keypad...
drivers/input/keyboard/intel_mid_keypad.c line 2
Quoted 11 lines
drivers/input/keyboard/Makefile +0
-0obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o obj-$(CONFIG_KEYBOARD_TCA6416) += tca6416-keypad.o obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.odrivers/input/keyboard/intel_mid_keypad.c new file +2
-0@@ -0,0 +1,781 @@ +/* +* linux/drivers/input/keyboard/intel_mid_keypad.c
No file names (and especially paths) in comment blocks please - makes harder to move stuff around.
Quoted 148 lines
drivers/input/keyboard/intel_mid_keypad.c new file +148
-0+* +* Driver for the matrix keypad controller on MID platform. +* +* Copyright (c) 2009 Intel Corporation. +* Created: Sep 18, 2008 +* Updated: May 14, 2010 +* +* Based on pxa27x_keypad.c by Rodolfo Giometti <[email protected]> +* pxa27x_keypad.c is based on a previous implementation by Kevin O'Connor +* <kevin_at_keconnor.net> and Alex Osborne <[email protected]> and +* on some suggestions by Nicolas Pitre <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2, as published by the Free Software Foundation. +* +* This program is distributed in the hope 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., +* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. +* +*/ + +#define DRV_NAME "mrst_keypad" +#define DRV_VERSION "0.0.1" +#define MRST_KEYPAD_DRIVER_NAME DRV_NAME " " DRV_VERSION + +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/pci.h> +#include <linux/init.h> +#include <linux/interrupt.h> +#include <linux/input.h> +#include <linux/device.h> +#include <linux/err.h> +#include <linux/gpio.h> + +/* +* Keypad Controller registers +*/ +#define KPC 0x0000/* Keypad Control register */ +#define KPDK 0x0004/* Keypad Direct Key register */ +#define KPREC 0x0008/* Keypad Rotary Encoder register */ +#define KPMK 0x000C/* Keypad Matrix Key register */ +#define KPAS 0x0010/* Keypad Automatic Scan register */ + +/* Keypad Automatic Scan Multiple Key Presser register 0-3 */ +#define KPASMKP0 0x0014 +#define KPASMKP1 0x0018 +#define KPASMKP2 0x001C +#define KPASMKP3 0x0020 +#define KPKDI 0x0024 + +/* bit definitions */ +#define KPC_MKRN (n) ((((n) - 1) & 0x7) << 26)/* matrix key row number */ +#define KPC_MKCN (n) ((((n) - 1) & 0x7) << 23)/* matrix key col number */ +#define KPC_DKN (n) ((((n) - 1) & 0x7) << 6)/* direct key number */ + +#define KPC_AS (0x1 << 30)/* Automatic Scan bit */ +#define KPC_ASACT (0x1 << 29)/* Automatic Scan on Activity */ +#define KPC_MI (0x1 << 22)/* Matrix interrupt bit */ +#define KPC_IMKP (0x1 << 21)/* Ignore Multiple Key Press */ + +#define KPC_MS (n) (0x1 << (13 + (n)))/* Matrix scan line 'n' */ +#define KPC_MS_ALL (0xff << 13) + +#define KPC_ME (0x1 << 12)/* Matrix Keypad Enable */ +#define KPC_MIE (0x1 << 11)/* Matrix Interrupt Enable */ +#define KPC_DK_DEB_SEL (0x1 << 9)/* Direct Keypad Debounce Select */ +#define KPC_DI (0x1 << 5)/* Direct key interrupt bit */ +#define KPC_RE_ZERO_DEB (0x1 << 4)/* Rotary Encoder Zero Debounce */ +#define KPC_REE1 (0x1 << 3)/* Rotary Encoder1 Enable */ +#define KPC_REE0 (0x1 << 2)/* Rotary Encoder0 Enable */ +#define KPC_DE (0x1 << 1)/* Direct Keypad Enable */ +#define KPC_DIE (0x1 << 0)/* Direct Keypad interrupt Enable */ + +#define KPDK_DKP (0x1 << 31) +#define KPDK_DK (n) ((n) & 0xff) + +#define KPREC_OF1 (0x1 << 31) +#define kPREC_UF1 (0x1 << 30) +#define KPREC_OF0 (0x1 << 15) +#define KPREC_UF0 (0x1 << 14) + +#define KPREC_RECOUNT0 (n) ((n) & 0xff) +#define KPREC_RECOUNT1 (n) (((n) >> 16) & 0xff) + +#define KPMK_MKP (0x1 << 31) +#define KPAS_SO (0x1 << 31) +#define KPASMKPx_SO (0x1 << 31) + +#define KPAS_MUKP (n) (((n) >> 26) & 0x1f) +#define KPAS_RP (n) (((n) >> 4) & 0xf) +#define KPAS_CP (n) ((n) & 0xf) + +#define KPASMKP_MKC_MASK (0xff) + +#define KEYPAD_MATRIX_GPIO_IN_PIN 24 +#define KEYPAD_MATRIX_GPIO_OUT_PIN 32 +#define KEYPAD_DIRECT_GPIO_IN_PIN 40 + + +#define keypad_readl (off) readl(keypad->mmio_base + (off)) +#define keypad_writel (off, v) writel((v), keypad->mmio_base + (off)) + +#define MAX_MATRIX_KEY_NUM (8 * 8) +#define MAX_DIRECT_KEY_NUM (4) + +#define MAX_MATRIX_KEY_ROWS (8) +#define MAX_MATRIX_KEY_COLS (8) +#define DEBOUNCE_INTERVAL 100 + +#define KEY_HALFSHUTTER KEY_PROG1 +#define KEY_FULLSHUTTER KEY_CAMERA + +static unsigned int mrst_keycode[MAX_MATRIX_KEY_NUM ] = { +KEY_F ,KEY_D ,KEY_E ,KEY_GRAVE ,KEY_C ,KEY_R ,KEY_4 ,KEY_V , +KEY_NUMLOCK ,KEY_LEFTCTRL ,KEY_Z ,KEY_W ,KEY_2 ,KEY_X ,KEY_S ,KEY_3 , +KEY_EQUAL ,KEY_N ,KEY_H ,KEY_U ,KEY_7 ,KEY_M ,KEY_J ,KEY_8 , +KEY_6 ,KEY_5 ,KEY_APOSTROPHE ,KEY_G ,KEY_T ,KEY_SPACE ,KEY_B ,KEY_Y , +KEY_MINUS ,KEY_0 ,KEY_LEFT ,KEY_SEMICOLON ,KEY_P ,KEY_DOWN ,KEY_UP , +KEY_BACKSPACE , +KEY_L ,KEY_K ,KEY_I ,KEY_SLASH ,KEY_COMMA ,KEY_O ,KEY_9 ,KEY_DOT , +KEY_Q ,KEY_TAB ,KEY_ESC ,KEY_LEFTSHIFT ,KEY_CAPSLOCK ,KEY_1 ,KEY_FN , +KEY_A , +0 ,KEY_RIGHTSHIFT ,KEY_ENTER ,0 ,KEY_RIGHT ,0 ,0 ,0 , +}; + +/* NumLk key mapping */ +static unsigned int mrst_keycode_numlck[MAX_MATRIX_KEY_NUM ] = { +KEY_F ,KEY_D ,KEY_E ,KEY_GRAVE ,KEY_C ,KEY_R ,KEY_4 ,KEY_V , +KEY_NUMLOCK ,KEY_LEFTCTRL ,KEY_Z ,KEY_W ,KEY_2 ,KEY_X ,KEY_S ,KEY_3 , +KEY_EQUAL ,KEY_N ,KEY_H ,KEY_KP4 ,KEY_KP7 ,KEY_KP0 ,KEY_KP1 ,KEY_KP8 , +KEY_6 ,KEY_5 ,KEY_APOSTROPHE ,KEY_G ,KEY_T ,KEY_SPACE ,KEY_B ,KEY_Y , +KEY_MINUS ,KEY_KPSLASH ,KEY_LEFT ,KEY_KPMINUS ,KEY_KPASTERISK , +KEY_DOWN ,KEY_UP ,KEY_BACKSPACE , +KEY_KP3 ,KEY_KP2 ,KEY_KP5 ,KEY_SLASH ,KEY_KPDOT ,KEY_KP6 ,KEY_KP9 , +KEY_KPPLUS , +KEY_Q ,KEY_TAB ,KEY_ESC ,KEY_LEFTSHIFT ,KEY_CAPSLOCK ,KEY_1 ,KEY_FN , +KEY_A , +0 ,KEY_RIGHTSHIFT ,KEY_ENTER ,0 ,KEY_RIGHT ,0 ,0 ,0 , +}; + +/* Fn key mapping */
drivers/input/keyboard/intel_mid_keypad.c line 160
Quoted 10 lines
drivers/input/keyboard/intel_mid_keypad.c new file +10
-0+static unsigned int mrst_keycode_fn[MAX_MATRIX_KEY_NUM ] = { +0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , +0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , +KEY_LEFTBRACE ,0 ,0 ,0 ,0 ,0 ,0 ,0 , +0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , +0 ,0 ,KEY_HOME ,0 ,0 ,KEY_PAGEDOWN ,KEY_PAGEUP ,0 , +0 ,0 ,0 ,KEY_RIGHTBRACE ,KEY_LEFTBRACE ,0 ,0 ,KEY_RIGHTBRACE , +0 ,0 ,0 ,KEY_LEFTSHIFT ,0 ,0 ,KEY_FN ,0 , +0 ,KEY_RIGHTSHIFT ,0 ,0 ,KEY_END ,0 ,0 ,0 , +};
Again, needs to be handled by userspace as modifiers. If absolutely requred that NumLk and Fn be handled in kernel please merge all 3 maps together and user normal/Numlk/Fn state to select appropriate chunk of combined keymap. Then EVIOCSKEYCODE and EVIOCGKEYCODE will work nicely and without surprises.
Also the initial keymaps should be const and copied into per-device structure (which can be modified).
Quoted 111 lines
drivers/input/keyboard/intel_mid_keypad.c new file +111
-0+ +/* direct key map */ +static unsigned int mrst_direct_keycode[MAX_DIRECT_KEY_NUM ] = { +KEY_VOLUMEUP ,KEY_VOLUMEDOWN ,KEY_HALFSHUTTER ,KEY_FULLSHUTTER , +}; + +struct mrst_keypad { + +struct input_dev *input_dev; +void __iomem *mmio_base; + +unsigned int matrix_key_rows; +unsigned int matrix_key_cols; +int matrix_key_map_size; + +/* key debounce interval */ +unsigned int debounce_interval; + +/* matrix key code map */ +unsigned int matrix_keycodes[MAX_MATRIX_KEY_NUM ]; + +/* state row bits of each column scan */ +uint32_t matrix_key_state[MAX_MATRIX_KEY_COLS ]; +uint32_t direct_key_state; + +unsigned int direct_key_mask; + +int direct_key_num; + +unsigned int direct_key_map[MAX_DIRECT_KEY_NUM ]; + +/* rotary encoders 0 */ +int enable_rotary0; +int rotary0_rel_code; +int rotary0_up_key; +int rotary0_down_key; + +/* rotary encoders 1 */ +int enable_rotary1; +int rotary1_rel_code; +int rotary1_up_key; +int rotary1_down_key; + +int rotary_rel_code[2 ]; +int rotary_up_key[2 ]; +int rotary_down_key[2 ]; + +/* Fn key */ +int fn; + +/* Number Lock key */ +int numlck; + +/* FIXME: +* Keypad controller likely issues fake interrupts +* when direct key status registers were first initialized +* This value assures this interrupt will not be proceeded. +*/ +int count; +}; + +static void mrst_keypad_build_keycode (struct mrst_keypad *keypad) +{ +struct input_dev *input_dev = keypad->input_dev; +unsigned int *key; +int i, code; + + keypad->matrix_key_rows =MAX_MATRIX_KEY_ROWS ; + keypad->matrix_key_cols =MAX_MATRIX_KEY_COLS ; + keypad->matrix_key_map_size =MAX_MATRIX_KEY_NUM ; + keypad->debounce_interval =DEBOUNCE_INTERVAL ; + +/* three sets of keycode here */ +if (keypad->fn) +memcpy (keypad->matrix_keycodes, mrst_keycode_fn, +sizeof (keypad->matrix_keycodes)); +else if (keypad->numlck) +memcpy (keypad->matrix_keycodes, mrst_keycode_numlck, +sizeof (keypad->matrix_keycodes)); +else +memcpy (keypad->matrix_keycodes, mrst_keycode, +sizeof (keypad->matrix_keycodes)); + +memcpy (keypad->direct_key_map, mrst_direct_keycode, +sizeof (keypad->direct_key_map)); + + key = &keypad->matrix_keycodes[0 ]; +for (i =0 ; i <MAX_MATRIX_KEY_NUM ; i++, key++) { + code = (*key) &0xffffff ; +set_bit (code, input_dev->keybit); + } + + key = &keypad->direct_key_map[0 ]; +for (i =0 ; i <MAX_DIRECT_KEY_NUM ; i++, key++) { + code = (*key) &0xffffff ; +set_bit (code, input_dev->keybit); + } + + keypad->direct_key_num =MAX_DIRECT_KEY_NUM ; + keypad->enable_rotary0 =0 ; + keypad->enable_rotary1 =0 ; + +} + +static inline unsigned int lookup_matrix_keycode ( +struct mrst_keypad *keypad,int row,int col) +{ +return keypad->matrix_keycodes[(row <<3 ) + col]; +} + +static void handle_constant_keypress(struct mrst_keypad *keypad,
drivers/input/keyboard/intel_mid_keypad.c line 281
Quoted 10 lines
drivers/input/keyboard/intel_mid_keypad.c new file +10
-0+ int num, int col, int row, + int state) +{ + struct input_dev *dev = keypad->input_dev; + +switch (num) { +case 0 : +if (keypad->fn) + keypad->fn =0 ; +/* Manually release special keys (Fn combinations) */
Why?
Quoted 9 lines
drivers/input/keyboard/intel_mid_keypad.c new file +9
-0+if (test_bit (KEY_LEFTBRACE , dev->key)) +input_report_key (dev,KEY_LEFTBRACE ,0 ); +if (test_bit (KEY_RIGHTBRACE , dev->key)) +input_report_key (dev,KEY_RIGHTBRACE ,0 ); +if (test_bit (KEY_HOME , dev->key)) +input_report_key (dev,KEY_RIGHTBRACE ,0 ); +if (test_bit (KEY_END , dev->key)) +input_report_key (dev,KEY_END ,0 ); +if (test_bit (KEY_PAGEUP , dev->key))
drivers/input/keyboard/intel_mid_keypad.c line 300
Quoted 10 lines
drivers/input/keyboard/intel_mid_keypad.c new file +10
-0+input_report_key (dev,KEY_RIGHTBRACE ,0 ); +if (test_bit (KEY_PAGEDOWN , dev->key)) +input_report_key (dev,KEY_RIGHTBRACE ,0 ); + +return ; + +case 1 : +/* if Fn pressed */ +if (col ==6 && row ==6 ) + keypad->fn =1 ;
What if I remap Fn?
drivers/input/keyboard/intel_mid_keypad.c line 305
Quoted 5 lines
drivers/input/keyboard/intel_mid_keypad.c new file +5
-0+/* key '[' */ + else if ((col == 0 && row == 2) && state) { + keypad->fn =0 ; +set_bit (KEY_EQUAL , dev->key); + dev->repeat_key =KEY_EQUAL ;
I really do not understand what is being done here.
Quoted 327 lines
drivers/input/keyboard/intel_mid_keypad.c new file +327
-0+ } +/* key ']' */ +else if ((col ==3 && row ==5 ) && state) { + keypad->fn =0 ; +set_bit (KEY_SLASH , dev->key); + dev->repeat_key =KEY_SLASH ; + } +/* key '{' */ +else if ((col ==4 && row ==5 ) && state) { + keypad->fn =0 ; +set_bit (KEY_COMMA , dev->key); + dev->repeat_key =KEY_COMMA ; + } +/* key '}' */ +else if ((col ==7 && row ==5 ) && state) { + keypad->fn =0 ; +set_bit (KEY_DOT , dev->key); + dev->repeat_key =KEY_DOT ; + } + +return ; +default : + ; + } +} + +static void mrst_keypad_scan_matrix (struct mrst_keypad *keypad) +{ +int row, col, num_keys_pressed =0 ; +uint32_t new_state[MAX_MATRIX_KEY_COLS ]; +uint32_t kpas =keypad_readl (KPAS ); +int status; + + num_keys_pressed =KPAS_MUKP (kpas); + +memset (new_state,0 ,sizeof (new_state)); + +if (num_keys_pressed ==0 ) { + status = keypad->matrix_key_state[0 ] & (1 <<0 ); +handle_constant_keypress (keypad, num_keys_pressed,0 ,0 , + status); + + goto scan; + } + +if (num_keys_pressed ==1 ) { + col =KPAS_CP (kpas); + row =KPAS_RP (kpas); + +/* if invalid row/col, treat as no key pressed */ +if (col <MAX_MATRIX_KEY_COLS && + row <MAX_MATRIX_KEY_ROWS ) { + +/* if NumLk pressed */ +if (col ==0 && row ==1 ) + keypad->numlck = !keypad->numlck; + + status = keypad->matrix_key_state[col] & (1 << row); +handle_constant_keypress (keypad, num_keys_pressed, col, + row, status); + + new_state[col] = (1 << row); + } + + goto scan; + } + +if (num_keys_pressed >1 ) { +uint32_t kpasmkp0 =keypad_readl (KPASMKP0 ); +uint32_t kpasmkp1 =keypad_readl (KPASMKP1 ); +uint32_t kpasmkp2 =keypad_readl (KPASMKP2 ); +uint32_t kpasmkp3 =keypad_readl (KPASMKP3 ); + + new_state[0 ] = kpasmkp0 &KPASMKP_MKC_MASK ; + new_state[1 ] = (kpasmkp0 >>16 ) &KPASMKP_MKC_MASK ; + new_state[2 ] = kpasmkp1 &KPASMKP_MKC_MASK ; + new_state[3 ] = (kpasmkp1 >>16 ) &KPASMKP_MKC_MASK ; + new_state[4 ] = kpasmkp2 &KPASMKP_MKC_MASK ; + new_state[5 ] = (kpasmkp2 >>16 ) &KPASMKP_MKC_MASK ; + new_state[6 ] = kpasmkp3 &KPASMKP_MKC_MASK ; + new_state[7 ] = (kpasmkp3 >>16 ) &KPASMKP_MKC_MASK ; + +/* if Fn is pressed, all SHIFT is ignored, except when { +* or } is pressed */ +if (new_state[6 ] &0x40 ) { + keypad->fn =1 ; + new_state[3 ] &= ~0x40 ; + new_state[1 ] &= ~0x80 ; + } + +if (keypad->fn ==1 ) { +/* if { or } pressed */ +if ((new_state[4 ] &0x20 ) || (new_state[7 ] &0x20 )) { +/* as if LEFTSHIFT is pressed */ + new_state[3 ] |=0x40 ; +/* as if Fn not pressed */ + new_state[6 ] &= ~0x40 ; + } +/* if [ or ] pressed */ +if ((new_state[0 ] &0x04 ) || (new_state[3 ] &0x20 )) +/* as if Fn not pressed */ + new_state[6 ] &= ~0x40 ; + } + } + + +scan: +/* re-build keycode */ +mrst_keypad_build_keycode (keypad); + +for (col =0 ; col < keypad->matrix_key_cols; col++) { +uint32_t bits_changed; + + bits_changed = keypad->matrix_key_state[col] ^ new_state[col]; +if (bits_changed ==0 ) +continue ; + +for (row =0 ; row < keypad->matrix_key_rows; row++) { +if ((bits_changed & (1 << row)) ==0 ) +continue ; + +input_report_key (keypad->input_dev, +lookup_matrix_keycode (keypad, row, col), + new_state[col] & (1 << row)); + } + } +input_sync (keypad->input_dev); +memcpy (keypad->matrix_key_state, new_state,sizeof (new_state)); +} + +#define DEFAULT_KPREC (0x007f007f) + +static inline int rotary_delta (uint32_t kprec) +{ +if (kprec &KPREC_OF0 ) +return (kprec &0xff ) +0x7f ; +else if (kprec &KPREC_UF0 ) +return (kprec &0xff ) -0x7f -0xff ; +else +return (kprec &0xff ) -0x7f ; +} + +static void report_rotary_event (struct mrst_keypad *keypad,int r,int delta) +{ +struct input_dev *dev = keypad->input_dev; + +if (delta ==0 ) +return ; + +if (keypad->rotary_up_key[r] && keypad->rotary_down_key[r]) { +int keycode = (delta >0 ) ? keypad->rotary_up_key[r] : + keypad->rotary_down_key[r]; + +/* simulate a press-n-release */ +input_report_key (dev, keycode,1 ); +input_sync (dev); +input_report_key (dev, keycode,0 ); +input_sync (dev); + }else { +input_report_rel (dev, keypad->rotary_rel_code[r], delta); +input_sync (dev); + } +} + +static void mrst_keypad_scan_rotary (struct mrst_keypad *keypad) +{ +unsigned int kprec; + +/* read and reset to default count value */ + kprec =keypad_readl (KPREC ); +keypad_writel (KPREC ,DEFAULT_KPREC ); + +if (keypad->enable_rotary0) +report_rotary_event (keypad,0 ,rotary_delta (kprec)); + +if (keypad->enable_rotary1) +report_rotary_event (keypad,1 ,rotary_delta (kprec >>16 )); +} + +static void mrst_keypad_scan_direct (struct mrst_keypad *keypad) +{ +unsigned int new_state; +uint32_t kpdk, bits_changed; +int i; + + kpdk =keypad_readl (KPDK ); + +if (keypad->enable_rotary0 || keypad->enable_rotary1) +mrst_keypad_scan_rotary (keypad); + +if ((keypad->direct_key_map ==NULL ) || (++keypad->count ==1 )) { + keypad->direct_key_state =0 ; +return ; + } + + new_state =KPDK_DK (kpdk) & keypad->direct_key_mask; + new_state = ~new_state; + bits_changed = keypad->direct_key_state ^ new_state; + +if (bits_changed ==0 ) +return ; + +for (i =0 ; i < keypad->direct_key_num; i++) { +if (bits_changed & (1 << i)) { +input_report_key (keypad->input_dev, + keypad->direct_key_map[i], + (new_state & (1 << i))); + } + } +input_sync (keypad->input_dev); + keypad->direct_key_state = new_state; + +} + +static irqreturn_t mrst_keypad_irq_handler (int irq,void *dev_id) +{ +struct mrst_keypad *keypad = dev_id; +unsigned long kpc =keypad_readl (KPC ); + +if (kpc &KPC_DI ) +mrst_keypad_scan_direct (keypad); + +if (kpc &KPC_MI ) +mrst_keypad_scan_matrix (keypad); + +return IRQ_HANDLED ; +} + +static int mrst_keypad_gpio_init (void ) +{ +int i, err, cnt =0 ; +int pins =KEYPAD_MATRIX_GPIO_IN_PIN +MAX_MATRIX_KEY_ROWS + +MAX_MATRIX_KEY_COLS +MAX_DIRECT_KEY_NUM ; + +/* explicitely tell which pins have been occupied... */ +for (i =KEYPAD_MATRIX_GPIO_IN_PIN ; i < pins; i++, cnt++) { + err =gpio_request (i,NULL ); +if (err) { +printk (KERN_ERR "GPIO pin %d failed to request.\n" , i); + goto err_request; + } + } + +for (i =0 ; i <MAX_MATRIX_KEY_ROWS ; i++) +gpio_direction_input (KEYPAD_MATRIX_GPIO_IN_PIN + i); + +for (i =0 ; i <MAX_MATRIX_KEY_COLS ; i++) +/* __gpio_set_value(KEYPAD_GPIO_OUT_PIN + i, 1); */ +/* set action is executed in gpio_direction_output() */ +gpio_direction_output (KEYPAD_MATRIX_GPIO_OUT_PIN + i,1 ); + +for (i =0 ; i <MAX_DIRECT_KEY_NUM ; i++) +gpio_direction_input (KEYPAD_DIRECT_GPIO_IN_PIN + i); + +return 0 ; + +err_request: +/* free requested pins... */ +for (i =KEYPAD_MATRIX_GPIO_IN_PIN + cnt -1 ; + i >=KEYPAD_MATRIX_GPIO_IN_PIN ; i--) +gpio_free (i); +return err; +} + +static void mrst_keypad_config (struct mrst_keypad *keypad) +{ +unsigned int mask =0 , direct_key_num =0 ; +unsigned long kpc =0 ; + +/* enable matrix keys with automatic scan */ +if (keypad->matrix_key_rows && keypad->matrix_key_cols) { + kpc |=KPC_ASACT |KPC_MIE |KPC_ME |KPC_MS_ALL ; + kpc |=KPC_MKRN (keypad->matrix_key_rows) | +KPC_MKCN (keypad->matrix_key_cols); + } + +/* enable rotary key, debounce interval same as direct keys */ +if (keypad->enable_rotary0) { + mask |=0x03 ; + direct_key_num =2 ; + kpc |=KPC_REE0 ; + } + +if (keypad->enable_rotary1) { + mask |=0x0c ; + direct_key_num =4 ; + kpc |=KPC_REE1 ; + } + +if (keypad->direct_key_num > direct_key_num) + direct_key_num = keypad->direct_key_num; + + keypad->direct_key_mask = ((2 << direct_key_num) -1 ) & ~mask; + +/* enable direct key */ +if (direct_key_num) + kpc |=KPC_DE |KPC_DIE |KPC_DKN (direct_key_num); + +keypad_writel (KPC , kpc); +keypad_writel (KPREC ,DEFAULT_KPREC ); +keypad_writel (KPKDI , keypad->debounce_interval); +} + +static int mrst_keypad_open (struct input_dev *dev) +{ +struct mrst_keypad *keypad =input_get_drvdata (dev); +int err; + + err =mrst_keypad_gpio_init (); +if (err) +return err; +mrst_keypad_config (keypad); + +return 0 ; +} + +static void mrst_keypad_close (struct input_dev *dev) +{ +int pins =KEYPAD_MATRIX_GPIO_IN_PIN +MAX_MATRIX_KEY_ROWS + +MAX_MATRIX_KEY_COLS +MAX_DIRECT_KEY_NUM ; + +int i; +/* free occupied pins */ +for (i =KEYPAD_MATRIX_GPIO_IN_PIN ; i < pins; i++) +gpio_free (i); +} +
drivers/input/keyboard/intel_mid_keypad.c line 642
Quoted 10 lines
drivers/input/keyboard/intel_mid_keypad.c new file +10
-0+static int __devinit mrst_keypad_probe (struct pci_dev *pdev, +const struct pci_device_id *ent) +{ +struct mrst_keypad *keypad; +struct input_dev *input_dev; +int error; + +#ifndef MODULE + printk(KERN_INFO MRST_KEYPAD_DRIVER_NAME "\n"); +#endif
Drop please.
Quoted 63 lines
drivers/input/keyboard/intel_mid_keypad.c new file +63
-0+ + keypad =kzalloc (sizeof (struct mrst_keypad ),GFP_KERNEL ); +if (keypad ==NULL ) { +dev_err (&pdev->dev,"failed to allocate driver data\n" ); +return -ENOMEM ; + } + + error =pci_enable_device (pdev); +if (error || (pdev->irq <0 )) { +dev_err (&pdev->dev,"failed to enable device/get irq\n" ); + error = -ENXIO ; + goto failed_free; + } + + error =pci_request_regions (pdev,DRV_NAME ); +if (error) { +dev_err (&pdev->dev,"failed to request I/O memory\n" ); + goto failed_free; + } + + keypad->mmio_base =ioremap (pci_resource_start (pdev,0 ), +pci_resource_len (pdev,0 )); +if (keypad->mmio_base ==NULL ) { +dev_err (&pdev->dev,"failed to remap I/O memory\n" ); + error = -ENXIO ; + goto failed_free_mem; + } + +/* Create and register the input driver. */ + input_dev =input_allocate_device (); +if (!input_dev) { +dev_err (&pdev->dev,"failed to allocate input device\n" ); + error = -ENOMEM ; + goto failed_free_io; + } + + input_dev->name =pci_name (pdev); + input_dev->id.bustype =BUS_PCI ; + input_dev->open = mrst_keypad_open; + input_dev->close = mrst_keypad_close; + input_dev->dev.parent = &pdev->dev; + + input_dev->keycode = keypad->matrix_keycodes; + input_dev->keycodesize =sizeof (unsigned int ); + input_dev->keycodemax =ARRAY_SIZE (mrst_keycode); + + keypad->input_dev = input_dev; + keypad->fn =0 ; + keypad->numlck =0 ; +/*FIXME*/ keypad->count =0 ; +input_set_drvdata (input_dev, keypad); + + input_dev->evbit[0 ] =BIT_MASK (EV_KEY ) |BIT_MASK (EV_REP ) | +BIT_MASK (EV_REL ); + +mrst_keypad_build_keycode (keypad); +pci_set_drvdata (pdev, keypad); + + error =request_irq (pdev->irq, mrst_keypad_irq_handler,IRQF_SHARED , +pci_name (pdev), keypad); +if (error) { +dev_err (&pdev->dev,"failed to request IRQ\n" ); + goto failed_free_dev;
drivers/input/keyboard/intel_mid_keypad.c line 715
Quoted 10 lines
drivers/input/keyboard/intel_mid_keypad.c new file +10
-0+ } + +/* Register the input device */ + error =input_register_device (input_dev); +if (error) { +dev_err (&pdev->dev,"failed to register input device\n" ); + goto failed_free_irq; + } + +printk (KERN_INFO "*** keypad driver load successfully ***\n" );
Drop please.
Quoted 16 lines
drivers/input/keyboard/intel_mid_keypad.c new file +16
-0+return 0 ; + +failed_free_irq: +free_irq (pdev->irq, keypad); +pci_set_drvdata (pdev,NULL ); +failed_free_dev: +input_free_device (input_dev); +failed_free_io: +iounmap (keypad->mmio_base); +failed_free_mem: +pci_release_regions (pdev); +failed_free: +kfree (keypad); +return error; +} +
drivers/input/keyboard/intel_mid_keypad.c line 741
Quoted 10 lines
drivers/input/keyboard/intel_mid_keypad.c new file +10
-0+static void __devexit mrst_keypad_remove(struct pci_dev *pdev) +{ +struct mrst_keypad *keypad =pci_get_drvdata (pdev); +int i; +int pins =KEYPAD_MATRIX_GPIO_IN_PIN +MAX_MATRIX_KEY_ROWS + +MAX_MATRIX_KEY_COLS +MAX_DIRECT_KEY_NUM ; + +for (i = pins -1 ; i >KEYPAD_MATRIX_GPIO_IN_PIN ; i--) +gpio_free (i); +
Hmm, didn't you do this in mrst_keypad_close? Also, if you do it here, don't you want to disable IRQ first?
Quoted 41 lines
drivers/input/keyboard/intel_mid_keypad.c new file +40
-0+free_irq (pdev->irq, keypad); +input_unregister_device (keypad->input_dev); +iounmap (keypad->mmio_base); +pci_release_regions (pdev); +pci_set_drvdata (pdev,NULL ); +kfree (keypad); +} + +static struct pci_device_id keypad_pci_tbl[] = { + {0x8086 ,0x0805 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + {0 ,} +}; +MODULE_DEVICE_TABLE (pci, keypad_pci_tbl); + +static struct pci_driver mrst_keypad_driver = { + .name =DRV_NAME , + .id_table = keypad_pci_tbl, + .probe = mrst_keypad_probe, + .remove =__devexit_p (mrst_keypad_remove), +#ifdef CONFIG_PM + .suspend =NULL , + .resume =NULL , +#endif /* CONFIG_PM */ +}; + +static int __init mrst_keypad_init (void ) +{ +return pci_register_driver (&mrst_keypad_driver); +} + +static void __exit mrst_keypad_exit(void) +{ +pci_unregister_driver (&mrst_keypad_driver); +} + +module_init (mrst_keypad_init); +module_exit (mrst_keypad_exit); + +MODULE_DESCRIPTION ("MRST Keypad Controller Driver" ); +MODULE_LICENSE ("GPL v2" );
Signature · 1 line
Dmitry