diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-sx1.c')
-rw-r--r-- | arch/arm/mach-omap1/board-sx1.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c index 7bcd82ab0fd..f34cb74a9f4 100644 --- a/arch/arm/mach-omap1/board-sx1.c +++ b/arch/arm/mach-omap1/board-sx1.c | |||
@@ -27,8 +27,8 @@ | |||
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 <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
33 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
34 | #include <asm/mach/map.h> | 34 | #include <asm/mach/map.h> |
@@ -40,10 +40,13 @@ | |||
40 | #include <plat/usb.h> | 40 | #include <plat/usb.h> |
41 | #include <plat/tc.h> | 41 | #include <plat/tc.h> |
42 | #include <plat/board.h> | 42 | #include <plat/board.h> |
43 | #include "common.h" | ||
44 | #include <plat/keypad.h> | 43 | #include <plat/keypad.h> |
45 | #include <plat/board-sx1.h> | 44 | #include <plat/board-sx1.h> |
46 | 45 | ||
46 | #include <mach/hardware.h> | ||
47 | |||
48 | #include "common.h" | ||
49 | |||
47 | /* Write to I2C device */ | 50 | /* Write to I2C device */ |
48 | int sx1_i2c_write_byte(u8 devaddr, u8 regoffset, u8 value) | 51 | int sx1_i2c_write_byte(u8 devaddr, u8 regoffset, u8 value) |
49 | { | 52 | { |
@@ -355,11 +358,6 @@ static struct omap_usb_config sx1_usb_config __initdata = { | |||
355 | 358 | ||
356 | /*----------- LCD -------------------------*/ | 359 | /*----------- LCD -------------------------*/ |
357 | 360 | ||
358 | static struct platform_device sx1_lcd_device = { | ||
359 | .name = "lcd_sx1", | ||
360 | .id = -1, | ||
361 | }; | ||
362 | |||
363 | static struct omap_lcd_config sx1_lcd_config __initdata = { | 361 | static struct omap_lcd_config sx1_lcd_config __initdata = { |
364 | .ctrl_name = "internal", | 362 | .ctrl_name = "internal", |
365 | }; | 363 | }; |
@@ -368,14 +366,8 @@ static struct omap_lcd_config sx1_lcd_config __initdata = { | |||
368 | static struct platform_device *sx1_devices[] __initdata = { | 366 | static struct platform_device *sx1_devices[] __initdata = { |
369 | &sx1_flash_device, | 367 | &sx1_flash_device, |
370 | &sx1_kp_device, | 368 | &sx1_kp_device, |
371 | &sx1_lcd_device, | ||
372 | &sx1_irda_device, | 369 | &sx1_irda_device, |
373 | }; | 370 | }; |
374 | /*-----------------------------------------*/ | ||
375 | |||
376 | static struct omap_board_config_kernel sx1_config[] __initdata = { | ||
377 | { OMAP_TAG_LCD, &sx1_lcd_config }, | ||
378 | }; | ||
379 | 371 | ||
380 | /*-----------------------------------------*/ | 372 | /*-----------------------------------------*/ |
381 | 373 | ||
@@ -391,8 +383,6 @@ static void __init omap_sx1_init(void) | |||
391 | 383 | ||
392 | platform_add_devices(sx1_devices, ARRAY_SIZE(sx1_devices)); | 384 | platform_add_devices(sx1_devices, ARRAY_SIZE(sx1_devices)); |
393 | 385 | ||
394 | omap_board_config = sx1_config; | ||
395 | omap_board_config_size = ARRAY_SIZE(sx1_config); | ||
396 | omap_serial_init(); | 386 | omap_serial_init(); |
397 | omap_register_i2c_bus(1, 100, NULL, 0); | 387 | omap_register_i2c_bus(1, 100, NULL, 0); |
398 | omap1_usb_init(&sx1_usb_config); | 388 | omap1_usb_init(&sx1_usb_config); |
@@ -406,6 +396,8 @@ static void __init omap_sx1_init(void) | |||
406 | gpio_direction_output(1, 1); /*A_IRDA_OFF = 1 */ | 396 | gpio_direction_output(1, 1); /*A_IRDA_OFF = 1 */ |
407 | gpio_direction_output(11, 0); /*A_SWITCH = 0 */ | 397 | gpio_direction_output(11, 0); /*A_SWITCH = 0 */ |
408 | gpio_direction_output(15, 0); /*A_USB_ON = 0 */ | 398 | gpio_direction_output(15, 0); /*A_USB_ON = 0 */ |
399 | |||
400 | omapfb_set_lcd_config(&sx1_lcd_config); | ||
409 | } | 401 | } |
410 | 402 | ||
411 | MACHINE_START(SX1, "OMAP310 based Siemens SX1") | 403 | MACHINE_START(SX1, "OMAP310 based Siemens SX1") |