aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-omap3evm.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-02-20 12:43:30 -0500
committerTony Lindgren <tony@atomide.com>2012-02-24 16:04:10 -0500
commitd1589f0912533e6cb2ac8fd6f1feb3d5989fe8cb (patch)
tree5dea58c939bcf51d8188a0e488d033807e4758a3 /arch/arm/mach-omap2/board-omap3evm.c
parent3b972bf06c22f5abfa6586a8baf50321cd825965 (diff)
ARM: OMAP2+: Mark omap_hsmmc_init and omap_mux related functions as __init
Now that omap hsmmc init is split into two functions, it's safe to mark omap_hsmmc_init and omap_mux related functions to __init. This basically reverts the following fixes for the case where TWL was compiled as a module: a98f77b (ARM: omap: fix section mismatch warning for sdp3430_twl_gpio_setup()) 8930b4e (ARM: omap: fix section mismatch warnings in mux.c caused by hsmmc.c) Additionally it fixes up the remaining section warnings for all callers of omap_mux functions. Cc: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3evm.c')
-rw-r--r--arch/arm/mach-omap2/board-omap3evm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 3d585b81669a..6b77ad95981d 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -362,7 +362,6 @@ static int omap3evm_twl_gpio_setup(struct device *dev,
362 int r, lcd_bl_en; 362 int r, lcd_bl_en;
363 363
364 /* gpio + 0 is "mmc0_cd" (input/IRQ) */ 364 /* gpio + 0 is "mmc0_cd" (input/IRQ) */
365 omap_mux_init_gpio(63, OMAP_PIN_INPUT);
366 mmc[0].gpio_cd = gpio + 0; 365 mmc[0].gpio_cd = gpio + 0;
367 omap_hsmmc_late_init(mmc); 366 omap_hsmmc_late_init(mmc);
368 367
@@ -645,7 +644,9 @@ static void __init omap3_evm_init(void)
645 omap_board_config = omap3_evm_config; 644 omap_board_config = omap3_evm_config;
646 omap_board_config_size = ARRAY_SIZE(omap3_evm_config); 645 omap_board_config_size = ARRAY_SIZE(omap3_evm_config);
647 646
647 omap_mux_init_gpio(63, OMAP_PIN_INPUT);
648 omap_hsmmc_init(mmc); 648 omap_hsmmc_init(mmc);
649
649 omap3_evm_i2c_init(); 650 omap3_evm_i2c_init();
650 651
651 omap_display_init(&omap3_evm_dss_data); 652 omap_display_init(&omap3_evm_dss_data);