diff options
author | Tony Lindgren <tony@atomide.com> | 2012-02-20 12:43:30 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-02-24 16:04:10 -0500 |
commit | d1589f0912533e6cb2ac8fd6f1feb3d5989fe8cb (patch) | |
tree | 5dea58c939bcf51d8188a0e488d033807e4758a3 /arch/arm/mach-omap2/board-omap3stalker.c | |
parent | 3b972bf06c22f5abfa6586a8baf50321cd825965 (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-omap3stalker.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3stalker.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index 8eee9930ee5f..641004380795 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c | |||
@@ -283,7 +283,6 @@ omap3stalker_twl_gpio_setup(struct device *dev, | |||
283 | unsigned gpio, unsigned ngpio) | 283 | unsigned gpio, unsigned ngpio) |
284 | { | 284 | { |
285 | /* gpio + 0 is "mmc0_cd" (input/IRQ) */ | 285 | /* gpio + 0 is "mmc0_cd" (input/IRQ) */ |
286 | omap_mux_init_gpio(23, OMAP_PIN_INPUT); | ||
287 | mmc[0].gpio_cd = gpio + 0; | 286 | mmc[0].gpio_cd = gpio + 0; |
288 | omap_hsmmc_late_init(mmc); | 287 | omap_hsmmc_late_init(mmc); |
289 | 288 | ||
@@ -426,7 +425,9 @@ static void __init omap3_stalker_init(void) | |||
426 | omap_board_config = omap3_stalker_config; | 425 | omap_board_config = omap3_stalker_config; |
427 | omap_board_config_size = ARRAY_SIZE(omap3_stalker_config); | 426 | omap_board_config_size = ARRAY_SIZE(omap3_stalker_config); |
428 | 427 | ||
428 | omap_mux_init_gpio(23, OMAP_PIN_INPUT); | ||
429 | omap_hsmmc_init(mmc); | 429 | omap_hsmmc_init(mmc); |
430 | |||
430 | omap3_stalker_i2c_init(); | 431 | omap3_stalker_i2c_init(); |
431 | 432 | ||
432 | platform_add_devices(omap3_stalker_devices, | 433 | platform_add_devices(omap3_stalker_devices, |