Commit e08016d0 authored by Anand Gadiyar's avatar Anand Gadiyar Committed by Tony Lindgren
Browse files

omap: mmc: split out init for 2420 



The MMC controller on the OMAP2420 is different from those
on the OMAP2430, OMAP3 and OMAP4 families - all of the latter
are identical. The one on the OMAP2420 is closer to that
on OMAP1 chips.

Currently, the n8x0 is the only OMAP2420 platform supported
in mainline which registers the MMC controller. Upcoming
changes to register the controllers using hwmod data are
potentially invasive. To reduce the risk, separate out the
2420 controller registration from the common init function
and update its only user. Also seperating out mux settings
for OMAP2420.

Signed-off-by: default avatarAnand Gadiyar <gadiyar@ti.com>
Signed-off-by: default avatarKishore Kadiyala <kishore.kadiyala@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Madhusudhan Chikkature <madhu.cr@ti.com>
Cc: Chris Ball <cjb@laptop.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent aca6ad07

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

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ static void __init n8x0_mmc_init(void) 
	}



	mmc_data[0] = &mmc1_data;

	omap2_init_mmc(mmc_data, OMAP24XX_NR_MMC);

	omap242x_init_mmc(mmc_data);

}

#else

arch/arm/mach-omap2/devices.c

+56 −32
Original line number Diff line number Diff line
@@ -650,11 +650,10 @@ err1: 
static inline void omap_hsmmc_reset(void) {}

#endif



#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \

	defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)

#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)



static inline void omap2_mmc_mux(struct omap_mmc_platform_data *mmc_controller,

			int controller_nr)

static inline void omap242x_mmc_mux(struct omap_mmc_platform_data

							*mmc_controller)

{

	if ((mmc_controller->slots[0].switch_pin > 0) && \

		(mmc_controller->slots[0].switch_pin < OMAP_MAX_GPIO_LINES))
@@ -665,7 +664,6 @@ static inline void omap2_mmc_mux(struct omap_mmc_platform_data *mmc_controller, 
		omap_mux_init_gpio(mmc_controller->slots[0].gpio_wp,

					OMAP_PIN_INPUT_PULLUP);



	if (cpu_is_omap2420() && controller_nr == 0) {

	omap_mux_init_signal("sdmmc_cmd", 0);

	omap_mux_init_signal("sdmmc_clki", 0);

	omap_mux_init_signal("sdmmc_clko", 0);
@@ -692,6 +690,35 @@ static inline void omap2_mmc_mux(struct omap_mmc_platform_data *mmc_controller, 
	}

}



void __init omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data)

{

	char *name = "mmci-omap";



	if (!mmc_data[0]) {

		pr_err("%s fails: Incomplete platform data\n", __func__);

		return;

	}



	omap242x_mmc_mux(mmc_data[0]);

	omap_mmc_add(name, 0, OMAP2_MMC1_BASE, OMAP2420_MMC_SIZE,

					INT_24XX_MMC_IRQ, mmc_data[0]);

}



#endif



#if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)



static inline void omap2_mmc_mux(struct omap_mmc_platform_data *mmc_controller,

			int controller_nr)

{

	if ((mmc_controller->slots[0].switch_pin > 0) && \

		(mmc_controller->slots[0].switch_pin < OMAP_MAX_GPIO_LINES))

		omap_mux_init_gpio(mmc_controller->slots[0].switch_pin,

					OMAP_PIN_INPUT_PULLUP);

	if ((mmc_controller->slots[0].gpio_wp > 0) && \

		(mmc_controller->slots[0].gpio_wp < OMAP_MAX_GPIO_LINES))

		omap_mux_init_gpio(mmc_controller->slots[0].gpio_wp,

					OMAP_PIN_INPUT_PULLUP);

	if (cpu_is_omap34xx()) {

		if (controller_nr == 0) {

			omap_mux_init_signal("sdmmc1_clk",
@@ -808,10 +835,7 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, 
			continue;

		}



		if (cpu_is_omap2420()) {

			size = OMAP2420_MMC_SIZE;

			name = "mmci-omap";

		} else if (cpu_is_omap44xx()) {

		if (cpu_is_omap44xx()) {

			if (i < 3)

				irq += OMAP44XX_IRQ_GIC_START;

			size = OMAP4_HSMMC_SIZE;

arch/arm/plat-omap/include/plat/mmc.h

+4 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ extern void omap_mmc_notify_cover_event(struct device *dev, int slot, 
	defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)

void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,

				int nr_controllers);

void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data);

void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,

				int nr_controllers);

int omap_mmc_add(const char *name, int id, unsigned long base,
@@ -169,6 +170,9 @@ static inline void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, 
				int nr_controllers)

{

}

static inline void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data)

{

}

static inline void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,

				int nr_controllers)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE