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

Commit 4f543332 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap: Fix matrix_keymap_data usage 



Otherwise we'll get compile errors like:

arch/arm/plat-omap/include/mach/keypad.h:38:1: warning: "KEY" redefined
arch/arm/plat-omap/include/mach/keypad.h:39:1: warning: "PERSISTENT_KEY" redefined
...

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 501e9bd5

arch/arm/mach-omap2/board-3430sdp.c

+7 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 


#define TWL4030_MSECURE_GPIO 22



static int sdp3430_keymap[] = {

static int board_keymap[] = {

	KEY(0, 0, KEY_LEFT),

	KEY(0, 1, KEY_RIGHT),

	KEY(0, 2, KEY_A),
@@ -88,11 +88,15 @@ static int sdp3430_keymap[] = { 
	0

};



static struct matrix_keymap_data board_map_data = {

	.keymap			= board_keymap,

	.keymap_size		= ARRAY_SIZE(board_keymap),

};



static struct twl4030_keypad_data sdp3430_kp_data = {

	.keymap_data	= &board_map_data,

	.rows		= 5,

	.cols		= 6,

	.keymap		= sdp3430_keymap,

	.keymapsize	= ARRAY_SIZE(sdp3430_keymap),

	.rep		= 1,

};

arch/arm/mach-omap2/board-ldp.c

+7 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static struct platform_device ldp_smsc911x_device = { 
	},

};



static int ldp_twl4030_keymap[] = {

static int board_keymap[] = {

	KEY(0, 0, KEY_1),

	KEY(1, 0, KEY_2),

	KEY(2, 0, KEY_3),
@@ -101,11 +101,15 @@ static int ldp_twl4030_keymap[] = { 
	0

};



static struct matrix_keymap_data board_map_data = {

	.keymap			= board_keymap,

	.keymap_size		= ARRAY_SIZE(board_keymap),

};



static struct twl4030_keypad_data ldp_kp_twl4030_data = {

	.keymap_data	= &board_map_data,

	.rows		= 6,

	.cols		= 6,

	.keymap		= ldp_twl4030_keymap,

	.keymapsize	= ARRAY_SIZE(ldp_twl4030_keymap),

	.rep		= 1,

};

arch/arm/mach-omap2/board-omap3evm.c

+7 −3
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static struct twl4030_usb_data omap3evm_usb_data = { 
	.usb_mode	= T2_USB_MODE_ULPI,

};



static int omap3evm_keymap[] = {

static int board_keymap[] = {

	KEY(0, 0, KEY_LEFT),

	KEY(0, 1, KEY_RIGHT),

	KEY(0, 2, KEY_A),
@@ -178,11 +178,15 @@ static int omap3evm_keymap[] = { 
	KEY(3, 3, KEY_P)

};



static struct matrix_keymap_data board_map_data = {

	.keymap			= board_keymap,

	.keymap_size		= ARRAY_SIZE(board_keymap),

};



static struct twl4030_keypad_data omap3evm_kp_data = {

	.keymap_data	= &board_map_data,

	.rows		= 4,

	.cols		= 4,

	.keymap		= omap3evm_keymap,

	.keymapsize	= ARRAY_SIZE(omap3evm_keymap),

	.rep		= 1,

};

arch/arm/mach-omap2/board-omap3pandora.c

+7 −3
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static void __init pandora_keys_gpio_init(void) 
	omap_set_gpio_debounce_time(32 * 5, GPIO_DEBOUNCE_TIME);

}



static int pandora_keypad_map[] = {

static int board_keymap[] = {

	/* col, row, code */

	KEY(0, 0, KEY_9),

	KEY(0, 1, KEY_0),
@@ -180,11 +180,15 @@ static int pandora_keypad_map[] = { 
	KEY(5, 2, KEY_FN),

};



static struct matrix_keymap_data board_map_data = {

	.keymap			= board_keymap,

	.keymap_size		= ARRAY_SIZE(board_keymap),

};



static struct twl4030_keypad_data pandora_kp_data = {

	.keymap_data	= &board_map_data,

	.rows		= 8,

	.cols		= 6,

	.keymap		= pandora_keypad_map,

	.keymapsize	= ARRAY_SIZE(pandora_keypad_map),

	.rep		= 1,

};

arch/arm/mach-omap2/board-rx51-peripherals.c

+7 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#define SYSTEM_REV_B_USES_VAUX3	0x1699

#define SYSTEM_REV_S_USES_VAUX3 0x8



static int rx51_keymap[] = {

static int board_keymap[] = {

	KEY(0, 0, KEY_Q),

	KEY(0, 1, KEY_W),

	KEY(0, 2, KEY_E),
@@ -83,11 +83,15 @@ static int rx51_keymap[] = { 
	KEY(0xff, 5, KEY_F10),

};



static struct matrix_keymap_data board_map_data = {

	.keymap			= board_keymap,

	.keymap_size		= ARRAY_SIZE(board_keymap),

};



static struct twl4030_keypad_data rx51_kp_data = {

	.keymap_data	= &board_map_data,

	.rows		= 8,

	.cols		= 8,

	.keymap		= rx51_keymap,

	.keymapsize	= ARRAY_SIZE(rx51_keymap),

	.rep		= 1,

};