diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-02-23 12:06:28 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-23 12:06:28 -0800 |
| commit | 7cab8713b1ed0dab08ad6458f92a40b7ff4be619 (patch) | |
| tree | 8c95691ac2b5bdfc85efe417427b5903fa80450c /arch/arm/mach-omap2/board-3430sdp.c | |
| parent | c3bbcf5dc3a0bee9db8f82cd7d10eedf02a3b5f5 (diff) | |
| parent | d5e13227c32f12de3afb2e26a86bc9f3e5aaf7b6 (diff) | |
| download | blackbird-op-linux-7cab8713b1ed0dab08ad6458f92a40b7ff4be619.tar.gz blackbird-op-linux-7cab8713b1ed0dab08ad6458f92a40b7ff4be619.zip | |
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-3430sdp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-3430sdp.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index 76a260f7c00e..8950ecc9b940 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c @@ -307,17 +307,8 @@ static struct omap_dss_board_info sdp3430_dss_data = { .default_device = &sdp3430_lcd_device, }; -static struct platform_device sdp3430_dss_device = { - .name = "omapdss", - .id = -1, - .dev = { - .platform_data = &sdp3430_dss_data, - }, -}; - -static struct platform_device *sdp3430_devices[] __initdata = { - &sdp3430_dss_device, -}; +static struct regulator_consumer_supply sdp3430_vdda_dac_supply = + REGULATOR_SUPPLY("vdda_dac", "omapdss"); static struct omap_board_config_kernel sdp3430_config[] __initdata = { }; @@ -798,7 +789,7 @@ static void __init omap_3430sdp_init(void) { omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); omap3430_i2c_init(); - platform_add_devices(sdp3430_devices, ARRAY_SIZE(sdp3430_devices)); + omap_display_init(&sdp3430_dss_data); if (omap_rev() > OMAP3430_REV_ES1_0) ts_gpio = SDP3430_TS_GPIO_IRQ_SDPV2; else |
