diff options
author | Senthilvadivu Guruswamy <svadivu@ti.com> | 2011-02-22 04:24:50 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-02-23 02:34:25 -0500 |
commit | d5e13227c32f12de3afb2e26a86bc9f3e5aaf7b6 (patch) | |
tree | 209fdc2805cff6082667ee839e5d88e597af0414 /arch/arm/mach-omap2/board-omap3evm.c | |
parent | b7ee79abcc1bd549eadf5a9852657058e6ecca47 (diff) |
OMAP2, 3: DSS2: board files: replace platform_device_register with omap_display_init()
This patch updated board files to replace platform_device_register or
platform_add_devices of DSS with omap_display_init(). This moves away
registration of DSS from board files into a common place.
Reviewed-by: Kevin Hilman <khilman@ti.com>
Tested-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Sumit Semwal <sumit.semwal@ti.com>
Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3evm.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index 5e38da97decc..8afafddadfb6 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
@@ -328,14 +328,6 @@ static struct omap_dss_board_info omap3_evm_dss_data = { | |||
328 | .default_device = &omap3_evm_lcd_device, | 328 | .default_device = &omap3_evm_lcd_device, |
329 | }; | 329 | }; |
330 | 330 | ||
331 | static struct platform_device omap3_evm_dss_device = { | ||
332 | .name = "omapdss", | ||
333 | .id = -1, | ||
334 | .dev = { | ||
335 | .platform_data = &omap3_evm_dss_data, | ||
336 | }, | ||
337 | }; | ||
338 | |||
339 | static struct regulator_consumer_supply omap3evm_vmmc1_supply = { | 331 | static struct regulator_consumer_supply omap3evm_vmmc1_supply = { |
340 | .supply = "vmmc", | 332 | .supply = "vmmc", |
341 | }; | 333 | }; |
@@ -631,10 +623,6 @@ static void __init omap3_evm_init_early(void) | |||
631 | omap2_init_common_devices(mt46h32m32lf6_sdrc_params, NULL); | 623 | omap2_init_common_devices(mt46h32m32lf6_sdrc_params, NULL); |
632 | } | 624 | } |
633 | 625 | ||
634 | static struct platform_device *omap3_evm_devices[] __initdata = { | ||
635 | &omap3_evm_dss_device, | ||
636 | }; | ||
637 | |||
638 | static struct ehci_hcd_omap_platform_data ehci_pdata __initdata = { | 626 | static struct ehci_hcd_omap_platform_data ehci_pdata __initdata = { |
639 | 627 | ||
640 | .port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN, | 628 | .port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN, |
@@ -672,7 +660,7 @@ static void __init omap3_evm_init(void) | |||
672 | 660 | ||
673 | omap3_evm_i2c_init(); | 661 | omap3_evm_i2c_init(); |
674 | 662 | ||
675 | platform_add_devices(omap3_evm_devices, ARRAY_SIZE(omap3_evm_devices)); | 663 | omap_display_init(&omap3_evm_dss_data); |
676 | 664 | ||
677 | spi_register_board_info(omap3evm_spi_board_info, | 665 | spi_register_board_info(omap3evm_spi_board_info, |
678 | ARRAY_SIZE(omap3evm_spi_board_info)); | 666 | ARRAY_SIZE(omap3evm_spi_board_info)); |