Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1589f09 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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:

a98f77bb (ARM: omap: fix section mismatch warning for sdp3430_twl_gpio_setup())
8930b4e3 (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: default avatarTony Lindgren <tony@atomide.com>
parent 3b972bf0

arch/arm/mach-omap2/board-flash.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ unmap: 
 *

 * @return - void.

 */

void board_flash_init(struct flash_partitions partition_info[],

void __init board_flash_init(struct flash_partitions partition_info[],

			char chip_sel_board[][GPMC_CS_NUM], int nand_type)

{

	u8		cs = 0;

arch/arm/mach-omap2/board-omap3beagle.c

+4 −2
Original line number Diff line number Diff line
@@ -273,8 +273,6 @@ static int beagle_twl_gpio_setup(struct device *dev, 
{

	int r;



	if (beagle_config.mmc1_gpio_wp != -EINVAL)

		omap_mux_init_gpio(beagle_config.mmc1_gpio_wp, OMAP_PIN_INPUT);

	mmc[0].gpio_wp = beagle_config.mmc1_gpio_wp;

	/* gpio + 0 is "mmc0_cd" (input/IRQ) */

	mmc[0].gpio_cd = gpio + 0;
@@ -522,7 +520,11 @@ static void __init omap3_beagle_init(void) 
{

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	omap3_beagle_init_rev();



	if (beagle_config.mmc1_gpio_wp != -EINVAL)

		omap_mux_init_gpio(beagle_config.mmc1_gpio_wp, OMAP_PIN_INPUT);

	omap_hsmmc_init(mmc);



	omap3_beagle_i2c_init();



	gpio_buttons[0].gpio = beagle_config.usr_button_gpio;

arch/arm/mach-omap2/board-omap3evm.c

+2 −1
Original line number Diff line number Diff line
@@ -362,7 +362,6 @@ static int omap3evm_twl_gpio_setup(struct device *dev, 
	int r, lcd_bl_en;



	/* gpio + 0 is "mmc0_cd" (input/IRQ) */

	omap_mux_init_gpio(63, OMAP_PIN_INPUT);

	mmc[0].gpio_cd = gpio + 0;

	omap_hsmmc_late_init(mmc);
@@ -645,7 +644,9 @@ static void __init omap3_evm_init(void) 
	omap_board_config = omap3_evm_config;

	omap_board_config_size = ARRAY_SIZE(omap3_evm_config);



	omap_mux_init_gpio(63, OMAP_PIN_INPUT);

	omap_hsmmc_init(mmc);



	omap3_evm_i2c_init();



	omap_display_init(&omap3_evm_dss_data);

arch/arm/mach-omap2/board-omap3stalker.c

+2 −1
Original line number Diff line number Diff line
@@ -283,7 +283,6 @@ omap3stalker_twl_gpio_setup(struct device *dev, 
			    unsigned gpio, unsigned ngpio)

{

	/* gpio + 0 is "mmc0_cd" (input/IRQ) */

	omap_mux_init_gpio(23, OMAP_PIN_INPUT);

	mmc[0].gpio_cd = gpio + 0;

	omap_hsmmc_late_init(mmc);
@@ -426,7 +425,9 @@ static void __init omap3_stalker_init(void) 
	omap_board_config = omap3_stalker_config;

	omap_board_config_size = ARRAY_SIZE(omap3_stalker_config);



	omap_mux_init_gpio(23, OMAP_PIN_INPUT);

	omap_hsmmc_init(mmc);



	omap3_stalker_i2c_init();



	platform_add_devices(omap3_stalker_devices,

arch/arm/mach-omap2/board-omap3touchbook.c

+7 −6
Original line number Diff line number Diff line
@@ -118,12 +118,6 @@ static struct gpio_led gpio_leds[]; 
static int touchbook_twl_gpio_setup(struct device *dev,

		unsigned gpio, unsigned ngpio)

{

	if (system_rev >= 0x20 && system_rev <= 0x34301000) {

		omap_mux_init_gpio(23, OMAP_PIN_INPUT);

		mmc[0].gpio_wp = 23;

	} else {

		omap_mux_init_gpio(29, OMAP_PIN_INPUT);

	}

	/* gpio + 0 is "mmc0_cd" (input/IRQ) */

	mmc[0].gpio_cd = gpio + 0;

	omap_hsmmc_late_init(mmc);
@@ -352,7 +346,14 @@ static void __init omap3_touchbook_init(void) 


	pm_power_off = omap3_touchbook_poweroff;



	if (system_rev >= 0x20 && system_rev <= 0x34301000) {

		omap_mux_init_gpio(23, OMAP_PIN_INPUT);

		mmc[0].gpio_wp = 23;

	} else {

		omap_mux_init_gpio(29, OMAP_PIN_INPUT);

	}

	omap_hsmmc_init(mmc);



	omap3_touchbook_i2c_init();

	platform_add_devices(omap3_touchbook_devices,

			ARRAY_SIZE(omap3_touchbook_devices));