diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/board-3430sdp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-cm-t35.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-devkit8000.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-omap3stalker.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-zoom-peripherals.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index 9a6552271445..9ba2ee246a75 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c | |||
@@ -76,7 +76,7 @@ static struct cpuidle_params omap3_cpuidle_params_table[] = { | |||
76 | {1, 10000, 30000, 300000}, | 76 | {1, 10000, 30000, 300000}, |
77 | }; | 77 | }; |
78 | 78 | ||
79 | static int board_keymap[] = { | 79 | static uint32_t board_keymap[] = { |
80 | KEY(0, 0, KEY_LEFT), | 80 | KEY(0, 0, KEY_LEFT), |
81 | KEY(0, 1, KEY_RIGHT), | 81 | KEY(0, 1, KEY_RIGHT), |
82 | KEY(0, 2, KEY_A), | 82 | KEY(0, 2, KEY_A), |
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index b72009a50f01..2b328b9b8e0a 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c | |||
@@ -559,7 +559,7 @@ static struct twl4030_usb_data cm_t35_usb_data = { | |||
559 | .usb_mode = T2_USB_MODE_ULPI, | 559 | .usb_mode = T2_USB_MODE_ULPI, |
560 | }; | 560 | }; |
561 | 561 | ||
562 | static int cm_t35_keymap[] = { | 562 | static uint32_t cm_t35_keymap[] = { |
563 | KEY(0, 0, KEY_A), KEY(0, 1, KEY_B), KEY(0, 2, KEY_LEFT), | 563 | KEY(0, 0, KEY_A), KEY(0, 1, KEY_B), KEY(0, 2, KEY_LEFT), |
564 | KEY(1, 0, KEY_UP), KEY(1, 1, KEY_ENTER), KEY(1, 2, KEY_DOWN), | 564 | KEY(1, 0, KEY_UP), KEY(1, 1, KEY_ENTER), KEY(1, 2, KEY_DOWN), |
565 | KEY(2, 0, KEY_RIGHT), KEY(2, 1, KEY_C), KEY(2, 2, KEY_D), | 565 | KEY(2, 0, KEY_RIGHT), KEY(2, 1, KEY_C), KEY(2, 2, KEY_D), |
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 1aff79e43d8e..ad9ad956dd11 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c | |||
@@ -199,7 +199,7 @@ static struct platform_device devkit8000_dss_device = { | |||
199 | static struct regulator_consumer_supply devkit8000_vdda_dac_supply = | 199 | static struct regulator_consumer_supply devkit8000_vdda_dac_supply = |
200 | REGULATOR_SUPPLY("vdda_dac", "omapdss"); | 200 | REGULATOR_SUPPLY("vdda_dac", "omapdss"); |
201 | 201 | ||
202 | static int board_keymap[] = { | 202 | static uint32_t board_keymap[] = { |
203 | KEY(0, 0, KEY_1), | 203 | KEY(0, 0, KEY_1), |
204 | KEY(1, 0, KEY_2), | 204 | KEY(1, 0, KEY_2), |
205 | KEY(2, 0, KEY_3), | 205 | KEY(2, 0, KEY_3), |
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 38c445188839..7c1e6ad3972e 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c | |||
@@ -84,7 +84,7 @@ static struct platform_device ldp_smsc911x_device = { | |||
84 | }, | 84 | }, |
85 | }; | 85 | }; |
86 | 86 | ||
87 | static int board_keymap[] = { | 87 | static uint32_t board_keymap[] = { |
88 | KEY(0, 0, KEY_1), | 88 | KEY(0, 0, KEY_1), |
89 | KEY(1, 0, KEY_2), | 89 | KEY(1, 0, KEY_2), |
90 | KEY(2, 0, KEY_3), | 90 | KEY(2, 0, KEY_3), |
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index c8267d22569a..6339927f07b2 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
@@ -447,7 +447,7 @@ static struct twl4030_usb_data omap3evm_usb_data = { | |||
447 | .usb_mode = T2_USB_MODE_ULPI, | 447 | .usb_mode = T2_USB_MODE_ULPI, |
448 | }; | 448 | }; |
449 | 449 | ||
450 | static int board_keymap[] = { | 450 | static uint32_t board_keymap[] = { |
451 | KEY(0, 0, KEY_LEFT), | 451 | KEY(0, 0, KEY_LEFT), |
452 | KEY(0, 1, KEY_DOWN), | 452 | KEY(0, 1, KEY_DOWN), |
453 | KEY(0, 2, KEY_ENTER), | 453 | KEY(0, 2, KEY_ENTER), |
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index c5bd764f1a07..db644c1e9d62 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c | |||
@@ -390,7 +390,7 @@ static struct twl4030_usb_data omap3stalker_usb_data = { | |||
390 | .usb_mode = T2_USB_MODE_ULPI, | 390 | .usb_mode = T2_USB_MODE_ULPI, |
391 | }; | 391 | }; |
392 | 392 | ||
393 | static int board_keymap[] = { | 393 | static uint32_t board_keymap[] = { |
394 | KEY(0, 0, KEY_LEFT), | 394 | KEY(0, 0, KEY_LEFT), |
395 | KEY(0, 1, KEY_DOWN), | 395 | KEY(0, 1, KEY_DOWN), |
396 | KEY(0, 2, KEY_ENTER), | 396 | KEY(0, 2, KEY_ENTER), |
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index cf6f12ed1d87..25a273dfb9cd 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
@@ -186,7 +186,7 @@ static void __init rx51_add_gpio_keys(void) | |||
186 | } | 186 | } |
187 | #endif /* CONFIG_KEYBOARD_GPIO || CONFIG_KEYBOARD_GPIO_MODULE */ | 187 | #endif /* CONFIG_KEYBOARD_GPIO || CONFIG_KEYBOARD_GPIO_MODULE */ |
188 | 188 | ||
189 | static int board_keymap[] = { | 189 | static uint32_t board_keymap[] = { |
190 | /* | 190 | /* |
191 | * Note that KEY(x, 8, KEY_XXX) entries represent "entrire row | 191 | * Note that KEY(x, 8, KEY_XXX) entries represent "entrire row |
192 | * connected to the ground" matrix state. | 192 | * connected to the ground" matrix state. |
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index b8dee5e90175..073fd9b4c36d 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include "hsmmc.h" | 31 | #include "hsmmc.h" |
32 | 32 | ||
33 | /* Zoom2 has Qwerty keyboard*/ | 33 | /* Zoom2 has Qwerty keyboard*/ |
34 | static int board_keymap[] = { | 34 | static uint32_t board_keymap[] = { |
35 | KEY(0, 0, KEY_E), | 35 | KEY(0, 0, KEY_E), |
36 | KEY(0, 1, KEY_R), | 36 | KEY(0, 1, KEY_R), |
37 | KEY(0, 2, KEY_T), | 37 | KEY(0, 2, KEY_T), |