aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-omap3evm.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-02-23 15:06:28 -0500
committerTony Lindgren <tony@atomide.com>2011-02-23 15:06:28 -0500
commit7cab8713b1ed0dab08ad6458f92a40b7ff4be619 (patch)
tree8c95691ac2b5bdfc85efe417427b5903fa80450c /arch/arm/mach-omap2/board-omap3evm.c
parentc3bbcf5dc3a0bee9db8f82cd7d10eedf02a3b5f5 (diff)
parentd5e13227c32f12de3afb2e26a86bc9f3e5aaf7b6 (diff)
Merge branch 'for-tony' of git://gitorious.org/linux-omap-dss2/linux into omap-for-linus
Conflicts: arch/arm/mach-omap2/board-3430sdp.c
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3evm.c')
-rw-r--r--arch/arm/mach-omap2/board-omap3evm.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index d4a115712290..5364147892c1 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -363,14 +363,6 @@ static struct omap_dss_board_info omap3_evm_dss_data = {
363 .default_device = &omap3_evm_lcd_device, 363 .default_device = &omap3_evm_lcd_device,
364}; 364};
365 365
366static struct platform_device omap3_evm_dss_device = {
367 .name = "omapdss",
368 .id = -1,
369 .dev = {
370 .platform_data = &omap3_evm_dss_data,
371 },
372};
373
374static struct regulator_consumer_supply omap3evm_vmmc1_supply = { 366static struct regulator_consumer_supply omap3evm_vmmc1_supply = {
375 .supply = "vmmc", 367 .supply = "vmmc",
376}; 368};
@@ -551,10 +543,8 @@ static struct twl4030_codec_data omap3evm_codec_data = {
551 .audio = &omap3evm_audio_data, 543 .audio = &omap3evm_audio_data,
552}; 544};
553 545
554static struct regulator_consumer_supply omap3_evm_vdda_dac_supply = { 546static struct regulator_consumer_supply omap3_evm_vdda_dac_supply =
555 .supply = "vdda_dac", 547 REGULATOR_SUPPLY("vdda_dac", "omapdss");
556 .dev = &omap3_evm_dss_device.dev,
557};
558 548
559/* VDAC for DSS driving S-Video */ 549/* VDAC for DSS driving S-Video */
560static struct regulator_init_data omap3_evm_vdac = { 550static struct regulator_init_data omap3_evm_vdac = {
@@ -748,10 +738,6 @@ static void __init omap3_evm_init_early(void)
748 omap2_init_common_devices(mt46h32m32lf6_sdrc_params, NULL); 738 omap2_init_common_devices(mt46h32m32lf6_sdrc_params, NULL);
749} 739}
750 740
751static struct platform_device *omap3_evm_devices[] __initdata = {
752 &omap3_evm_dss_device,
753};
754
755static struct ehci_hcd_omap_platform_data ehci_pdata __initdata = { 741static struct ehci_hcd_omap_platform_data ehci_pdata __initdata = {
756 742
757 .port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN, 743 .port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,
@@ -840,7 +826,7 @@ static void __init omap3_evm_init(void)
840 826
841 omap3_evm_i2c_init(); 827 omap3_evm_i2c_init();
842 828
843 platform_add_devices(omap3_evm_devices, ARRAY_SIZE(omap3_evm_devices)); 829 omap_display_init(&omap3_evm_dss_data);
844 830
845 spi_register_board_info(omap3evm_spi_board_info, 831 spi_register_board_info(omap3evm_spi_board_info,
846 ARRAY_SIZE(omap3evm_spi_board_info)); 832 ARRAY_SIZE(omap3evm_spi_board_info));