diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom2.c')
-rw-r--r-- | arch/arm/mach-omap2/board-zoom2.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c index dabba2720a9b..324009edbd53 100644 --- a/arch/arm/mach-omap2/board-zoom2.c +++ b/arch/arm/mach-omap2/board-zoom2.c | |||
@@ -90,13 +90,6 @@ static struct twl4030_keypad_data zoom2_kp_twl4030_data = { | |||
90 | .rep = 1, | 90 | .rep = 1, |
91 | }; | 91 | }; |
92 | 92 | ||
93 | static void __init omap_zoom2_init_irq(void) | ||
94 | { | ||
95 | omap2_init_common_hw(NULL, NULL); | ||
96 | omap_init_irq(); | ||
97 | omap_gpio_init(); | ||
98 | } | ||
99 | |||
100 | static struct omap_board_config_kernel zoom2_config[] __initdata = { | 93 | static struct omap_board_config_kernel zoom2_config[] __initdata = { |
101 | }; | 94 | }; |
102 | 95 | ||
@@ -212,6 +205,15 @@ static struct twl4030_usb_data zoom2_usb_data = { | |||
212 | .usb_mode = T2_USB_MODE_ULPI, | 205 | .usb_mode = T2_USB_MODE_ULPI, |
213 | }; | 206 | }; |
214 | 207 | ||
208 | static void __init omap_zoom2_init_irq(void) | ||
209 | { | ||
210 | omap_board_config = zoom2_config; | ||
211 | omap_board_config_size = ARRAY_SIZE(zoom2_config); | ||
212 | omap2_init_common_hw(NULL, NULL); | ||
213 | omap_init_irq(); | ||
214 | omap_gpio_init(); | ||
215 | } | ||
216 | |||
215 | static struct twl4030_gpio_platform_data zoom2_gpio_data = { | 217 | static struct twl4030_gpio_platform_data zoom2_gpio_data = { |
216 | .gpio_base = OMAP_MAX_GPIO_LINES, | 218 | .gpio_base = OMAP_MAX_GPIO_LINES, |
217 | .irq_base = TWL4030_GPIO_IRQ_BASE, | 219 | .irq_base = TWL4030_GPIO_IRQ_BASE, |
@@ -262,8 +264,6 @@ extern int __init omap_zoom2_debugboard_init(void); | |||
262 | static void __init omap_zoom2_init(void) | 264 | static void __init omap_zoom2_init(void) |
263 | { | 265 | { |
264 | omap_i2c_init(); | 266 | omap_i2c_init(); |
265 | omap_board_config = zoom2_config; | ||
266 | omap_board_config_size = ARRAY_SIZE(zoom2_config); | ||
267 | omap_serial_init(); | 267 | omap_serial_init(); |
268 | omap_zoom2_debugboard_init(); | 268 | omap_zoom2_debugboard_init(); |
269 | usb_musb_init(); | 269 | usb_musb_init(); |