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

Commit 875ad696 authored by Illia Smyrnov's avatar Illia Smyrnov Committed by Dmitry Torokhov
Browse files

Input: omap-keypad - use bitfiled instead of hardcoded values 



Use bitfiled instead of hardcoded values to set KBD_CTRL, use BIT macro,
remove unused defines.

Signed-off-by: default avatarIllia Smyrnov <illia.smyrnov@ti.com>
Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent e87ca424

drivers/input/keyboard/omap4-keypad.c

+11 −14
Original line number Diff line number Diff line
@@ -53,21 +53,17 @@ 
#define OMAP4_KBD_FULLCODE63_32		0x48



/* OMAP4 bit definitions */

#define OMAP4_DEF_IRQENABLE_EVENTEN	(1 << 0)

#define OMAP4_DEF_IRQENABLE_LONGKEY	(1 << 1)

#define OMAP4_DEF_IRQENABLE_TIMEOUTEN	(1 << 2)

#define OMAP4_DEF_WUP_EVENT_ENA		(1 << 0)

#define OMAP4_DEF_WUP_LONG_KEY_ENA	(1 << 1)

#define OMAP4_DEF_CTRL_NOSOFTMODE	(1 << 1)

#define OMAP4_DEF_CTRLPTVVALUE		(1 << 2)

#define OMAP4_DEF_CTRLPTV		(1 << 1)

#define OMAP4_DEF_IRQENABLE_EVENTEN	BIT(0)

#define OMAP4_DEF_IRQENABLE_LONGKEY	BIT(1)

#define OMAP4_DEF_WUP_EVENT_ENA		BIT(0)

#define OMAP4_DEF_WUP_LONG_KEY_ENA	BIT(1)

#define OMAP4_DEF_CTRL_NOSOFTMODE	BIT(1)

#define OMAP4_DEF_CTRL_PTV_SHIFT	2



/* OMAP4 values */

#define OMAP4_VAL_IRQDISABLE		0x00

#define OMAP4_VAL_DEBOUNCINGTIME	0x07

#define OMAP4_VAL_FUNCTIONALCFG		0x1E



#define OMAP4_MASK_IRQSTATUSDISABLE	0xFFFF

#define OMAP4_VAL_IRQDISABLE		0x0

#define OMAP4_VAL_DEBOUNCINGTIME	0x7

#define OMAP4_VAL_PVT			0x7



enum {

	KBD_REVISION_OMAP4 = 0,
@@ -175,7 +171,8 @@ static int omap4_keypad_open(struct input_dev *input) 
	disable_irq(keypad_data->irq);



	kbd_writel(keypad_data, OMAP4_KBD_CTRL,

			OMAP4_VAL_FUNCTIONALCFG);

			OMAP4_DEF_CTRL_NOSOFTMODE |

			(OMAP4_VAL_PVT << OMAP4_DEF_CTRL_PTV_SHIFT));

	kbd_writel(keypad_data, OMAP4_KBD_DEBOUNCINGTIME,

			OMAP4_VAL_DEBOUNCINGTIME);

	kbd_write_irqreg(keypad_data, OMAP4_KBD_IRQSTATUS,