omap: hsmmc: Do not mux the slot if non default muxing is already done

From: Jarkko Lavinen <[email protected]>
Date: Mon, 26 Apr 2010 16:30:07 +0300
Subject: [PATCH] omap: hsmmc: Do not mux the slot if non default muxing is already done

Add 'nomux' flag for hsmmc and skip mux'ing is it is set.

---

arch/arm/mach-omap2/devices.c |    3 +++
arch/arm/mach-omap2/hsmmc.c   |    1 +
arch/arm/mach-omap2/hsmmc.h   |    1 +
3 files changed, 5 insertions(+), 0 deletions(-)

index 2dbb265..c6329eb 100644
@@ -608,6 +608,9 @@ static inline void omap_hsmmc_reset(void) {}

static inline void omap2_mmc_mux(struct omap_mmc_platform_data *mmc_controller,
int controller_nr)
{
+ if (mmc_controller->slots[0].nomux)
+ return;
+

	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,

index 1ef54b0..e1ec467 100644
@@ -267,6 +267,7 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers)

		mmc->slots[0].switch_pin = c->gpio_cd;
		mmc->slots[0].gpio_wp = c->gpio_wp;

+		mmc->slots[0].nomux = c->nomux;
		mmc->slots[0].remux = c->remux;

		if (c->cover_only)

index 36f0ba8..56d65cc 100644
@@ -16,6 +16,7 @@ struct omap2_hsmmc_info {

bool power_saving; /* Try to sleep or power off when possible */
bool no_off; /* power_saving and power is not to go off */
bool vcc_aux_disable_is_sleep; /* Regulator off remapped to sleep */
+ bool nomux; /* No default muxing for this slot */

	int	gpio_cd;	/* or -EINVAL */
	int	gpio_wp;	/* or -EINVAL */
	char	*name;		/* or NULL for default */

1.6.3.3