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-omap3beagle.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-omap3beagle.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 78bfcd5d5a7..7be8d659d91 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
@@ -273,8 +273,6 @@ static int beagle_twl_gpio_setup(struct device *dev, | |||
273 | { | 273 | { |
274 | int r; | 274 | int r; |
275 | 275 | ||
276 | if (beagle_config.mmc1_gpio_wp != -EINVAL) | ||
277 | omap_mux_init_gpio(beagle_config.mmc1_gpio_wp, OMAP_PIN_INPUT); | ||
278 | mmc[0].gpio_wp = beagle_config.mmc1_gpio_wp; | 276 | mmc[0].gpio_wp = beagle_config.mmc1_gpio_wp; |
279 | /* gpio + 0 is "mmc0_cd" (input/IRQ) */ | 277 | /* gpio + 0 is "mmc0_cd" (input/IRQ) */ |
280 | mmc[0].gpio_cd = gpio + 0; | 278 | mmc[0].gpio_cd = gpio + 0; |
@@ -522,7 +520,11 @@ static void __init omap3_beagle_init(void) | |||
522 | { | 520 | { |
523 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); | 521 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); |
524 | omap3_beagle_init_rev(); | 522 | omap3_beagle_init_rev(); |
523 | |||
524 | if (beagle_config.mmc1_gpio_wp != -EINVAL) | ||
525 | omap_mux_init_gpio(beagle_config.mmc1_gpio_wp, OMAP_PIN_INPUT); | ||
525 | omap_hsmmc_init(mmc); | 526 | omap_hsmmc_init(mmc); |
527 | |||
526 | omap3_beagle_i2c_init(); | 528 | omap3_beagle_i2c_init(); |
527 | 529 | ||
528 | gpio_buttons[0].gpio = beagle_config.usr_button_gpio; | 530 | gpio_buttons[0].gpio = beagle_config.usr_button_gpio; |