diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-sx1.c')
-rw-r--r-- | arch/arm/mach-omap1/board-sx1.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c index 7bcd82ab0fd..0c880be1127 100644 --- a/arch/arm/mach-omap1/board-sx1.c +++ b/arch/arm/mach-omap1/board-sx1.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/i2c.h> | 27 | #include <linux/i2c.h> |
28 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
29 | #include <linux/export.h> | 29 | #include <linux/export.h> |
30 | #include <linux/omapfb.h> | ||
30 | 31 | ||
31 | #include <mach/hardware.h> | 32 | #include <mach/hardware.h> |
32 | #include <asm/mach-types.h> | 33 | #include <asm/mach-types.h> |
@@ -371,11 +372,6 @@ static struct platform_device *sx1_devices[] __initdata = { | |||
371 | &sx1_lcd_device, | 372 | &sx1_lcd_device, |
372 | &sx1_irda_device, | 373 | &sx1_irda_device, |
373 | }; | 374 | }; |
374 | /*-----------------------------------------*/ | ||
375 | |||
376 | static struct omap_board_config_kernel sx1_config[] __initdata = { | ||
377 | { OMAP_TAG_LCD, &sx1_lcd_config }, | ||
378 | }; | ||
379 | 375 | ||
380 | /*-----------------------------------------*/ | 376 | /*-----------------------------------------*/ |
381 | 377 | ||
@@ -391,8 +387,6 @@ static void __init omap_sx1_init(void) | |||
391 | 387 | ||
392 | platform_add_devices(sx1_devices, ARRAY_SIZE(sx1_devices)); | 388 | platform_add_devices(sx1_devices, ARRAY_SIZE(sx1_devices)); |
393 | 389 | ||
394 | omap_board_config = sx1_config; | ||
395 | omap_board_config_size = ARRAY_SIZE(sx1_config); | ||
396 | omap_serial_init(); | 390 | omap_serial_init(); |
397 | omap_register_i2c_bus(1, 100, NULL, 0); | 391 | omap_register_i2c_bus(1, 100, NULL, 0); |
398 | omap1_usb_init(&sx1_usb_config); | 392 | omap1_usb_init(&sx1_usb_config); |
@@ -406,6 +400,8 @@ static void __init omap_sx1_init(void) | |||
406 | gpio_direction_output(1, 1); /*A_IRDA_OFF = 1 */ | 400 | gpio_direction_output(1, 1); /*A_IRDA_OFF = 1 */ |
407 | gpio_direction_output(11, 0); /*A_SWITCH = 0 */ | 401 | gpio_direction_output(11, 0); /*A_SWITCH = 0 */ |
408 | gpio_direction_output(15, 0); /*A_USB_ON = 0 */ | 402 | gpio_direction_output(15, 0); /*A_USB_ON = 0 */ |
403 | |||
404 | omapfb_set_lcd_config(&sx1_lcd_config); | ||
409 | } | 405 | } |
410 | 406 | ||
411 | MACHINE_START(SX1, "OMAP310 based Siemens SX1") | 407 | MACHINE_START(SX1, "OMAP310 based Siemens SX1") |