diff options
author | Tony Lindgren <tony@atomide.com> | 2009-11-13 18:35:00 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-11-17 09:30:09 -0800 |
commit | a426d89bb506ae4e436e806f84c53fe15d4ca7d5 (patch) | |
tree | c897e776bfca7f903b3fc9b9a89eaef515e64a4d /arch | |
parent | ee923754cd94dfce77f0db171ce44467c40eda44 (diff) |
omap: Clean up changes done to avoid merge conflicts with MFD tree
These are no longer needed.
NOTE: Needs to be refreshed to remove all madc entries
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-zoom2.c | 25 |
2 files changed, 2 insertions, 32 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index 7b56e3aef95e..b2786edc9ca3 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -308,6 +308,8 @@ static struct twl4030_platform_data omap3evm_twldata = { .usb = &omap3evm_usb_data, .gpio = &omap3evm_gpio_data, .codec = &omap3evm_codec_data, + .vmmc1 = &omap3evm_vmmc1, + .vsim = &omap3evm_vsim, }; static struct i2c_board_info __initdata omap3evm_i2c_boardinfo[] = { @@ -321,13 +323,6 @@ static struct i2c_board_info __initdata omap3evm_i2c_boardinfo[] = { static int __init omap3_evm_i2c_init(void) { - /* - * REVISIT: These entries can be set in omap3evm_twl_data - * after a merge with MFD tree - */ - omap3evm_twldata.vmmc1 = &omap3evm_vmmc1; - omap3evm_twldata.vsim = &omap3evm_vsim; - omap_register_i2c_bus(1, 2600, omap3evm_i2c_boardinfo, ARRAY_SIZE(omap3evm_i2c_boardinfo)); omap_register_i2c_bus(2, 400, NULL, 0); diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c index 2f980e36ebfd..a29b9a134e00 100644 --- a/arch/arm/mach-omap2/board-zoom2.c +++ b/arch/arm/mach-omap2/board-zoom2.c @@ -33,31 +33,6 @@ static void __init omap_zoom2_init_irq(void) omap_gpio_init(); } -/* REVISIT: These audio entries can be removed once MFD code is merged */ -#if 0 - -static struct twl4030_madc_platform_data zoom2_madc_data = { - .irq_line = 1, -}; - -static struct twl4030_platform_data zoom2_twldata = { - .irq_base = TWL4030_IRQ_BASE, - .irq_end = TWL4030_IRQ_END, - - /* platform_data for children goes here */ - .bci = &zoom2_bci_data, - .madc = &zoom2_madc_data, - .usb = &zoom2_usb_data, - .gpio = &zoom2_gpio_data, - .keypad = &zoom2_kp_twl4030_data, - .vmmc1 = &zoom2_vmmc1, - .vmmc2 = &zoom2_vmmc2, - .vsim = &zoom2_vsim, - -}; - -#endif - static void __init omap_zoom2_init(void) { zoom_peripherals_init(); |