Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5abd95c authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Dmitry Torokhov
Browse files

Input: ep93xx_keypad - cleanup and use matrix_keypad helpers 



Use struct matrix_keymap_data to supply the keymap from the platform code
and matrix_keypad_build_keymap() to initialize the keymap.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 3920ab0a

arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h

+7 −7
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
#ifndef __ASM_ARCH_EP93XX_KEYPAD_H

#define __ASM_ARCH_EP93XX_KEYPAD_H



struct matrix_keymap_data;



/* flags for the ep93xx_keypad driver */

#define EP93XX_KEYPAD_DISABLE_3_KEY	(1<<0)	/* disable 3-key reset */

#define EP93XX_KEYPAD_DIAG_MODE		(1<<1)	/* diagnostic mode */
@@ -15,15 +17,13 @@ 


/**

 * struct ep93xx_keypad_platform_data - platform specific device structure

 * @matrix_key_map:		array of keycodes defining the keypad matrix

 * @matrix_key_map_size:	ARRAY_SIZE(matrix_key_map)

 * @keymap_data:	pointer to &matrix_keymap_data

 * @debounce:		debounce start count; terminal count is 0xff

 * @prescale:		row/column counter pre-scaler load value

 * @flags:		see above

 */

struct ep93xx_keypad_platform_data {

	unsigned int	*matrix_key_map;

	int		matrix_key_map_size;

	struct matrix_keymap_data *keymap_data;

	unsigned int	debounce;

	unsigned int	prescale;

	unsigned int	flags;

drivers/input/keyboard/ep93xx_keypad.c

+15 −25
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ struct ep93xx_keypad { 


	void __iomem *mmio_base;



	unsigned int matrix_keycodes[EP93XX_MATRIX_SIZE];

	unsigned short keycodes[EP93XX_MATRIX_SIZE];



	int key1;

	int key2;
@@ -79,24 +79,6 @@ struct ep93xx_keypad { 
	bool enabled;

};



static void ep93xx_keypad_build_keycode(struct ep93xx_keypad *keypad)

{

	struct ep93xx_keypad_platform_data *pdata = keypad->pdata;

	struct input_dev *input_dev = keypad->input_dev;

	unsigned int *key;

	int i;



	key = &pdata->matrix_key_map[0];

	for (i = 0; i < pdata->matrix_key_map_size; i++, key++) {

		int row = KEY_ROW(*key);

		int col = KEY_COL(*key);

		int code = KEY_VAL(*key);



		keypad->matrix_keycodes[(row << 3) + col] = code;

		__set_bit(code, input_dev->keybit);

	}

}



static irqreturn_t ep93xx_keypad_irq_handler(int irq, void *dev_id)

{

	struct ep93xx_keypad *keypad = dev_id;
@@ -107,10 +89,10 @@ static irqreturn_t ep93xx_keypad_irq_handler(int irq, void *dev_id) 
	status = __raw_readl(keypad->mmio_base + KEY_REG);



	keycode = (status & KEY_REG_KEY1_MASK) >> KEY_REG_KEY1_SHIFT;

	key1 = keypad->matrix_keycodes[keycode];

	key1 = keypad->keycodes[keycode];



	keycode = (status & KEY_REG_KEY2_MASK) >> KEY_REG_KEY2_SHIFT;

	key2 = keypad->matrix_keycodes[keycode];

	key2 = keypad->keycodes[keycode];



	if (status & KEY_REG_2KEYS) {

		if (keypad->key1 && key1 != keypad->key1 && key2 != keypad->key1)
@@ -256,6 +238,7 @@ static int ep93xx_keypad_resume(struct platform_device *pdev) 
static int __devinit ep93xx_keypad_probe(struct platform_device *pdev)

{

	struct ep93xx_keypad *keypad;

	const struct matrix_keymap_data *keymap_data;

	struct input_dev *input_dev;

	struct resource *res;

	int err;
@@ -270,6 +253,12 @@ static int __devinit ep93xx_keypad_probe(struct platform_device *pdev) 
		goto failed_free;

	}



	keymap_data = keypad->pdata->keymap_data;

	if (!keymap_data) {

		err = -EINVAL;

		goto failed_free;

	}



	keypad->irq = platform_get_irq(pdev, 0);

	if (!keypad->irq) {

		err = -ENXIO;
@@ -317,9 +306,9 @@ static int __devinit ep93xx_keypad_probe(struct platform_device *pdev) 
	input_dev->open = ep93xx_keypad_open;

	input_dev->close = ep93xx_keypad_close;

	input_dev->dev.parent = &pdev->dev;

	input_dev->keycode = keypad->matrix_keycodes;

	input_dev->keycodesize = sizeof(keypad->matrix_keycodes[0]);

	input_dev->keycodemax = ARRAY_SIZE(keypad->matrix_keycodes);

	input_dev->keycode = keypad->keycodes;

	input_dev->keycodesize = sizeof(keypad->keycodes[0]);

	input_dev->keycodemax = ARRAY_SIZE(keypad->keycodes);



	input_set_drvdata(input_dev, keypad);
@@ -327,7 +316,8 @@ static int __devinit ep93xx_keypad_probe(struct platform_device *pdev) 
	if (keypad->pdata->flags & EP93XX_KEYPAD_AUTOREPEAT)

		input_dev->evbit[0] |= BIT_MASK(EV_REP);



	ep93xx_keypad_build_keycode(keypad);

	matrix_keypad_build_keymap(keymap_data, 3,

				   input_dev->keycode, input_dev->keybit);

	platform_set_drvdata(pdev, keypad);



	err = request_irq(keypad->irq, ep93xx_keypad_irq_handler,