[PATCH V2 09/16] OMAP: hsmmc: Do not mux the slot if non default muxing is already done
From: Adrian Hunter <hidden>
Date: 2011-05-06 09:14:08
Also in:
linux-mmc, linux-omap
Subsystem:
arm port, omap2+ support, the rest · Maintainers:
Russell King, Aaro Koskinen, Andreas Kemnade, Kevin Hilman, Roger Quadros, Tony Lindgren, Linus Torvalds
From: Jarkko Lavinen <redacted> Allow the bootloader do all the muxing. Signed-off-by: Jarkko Lavinen <redacted> Signed-off-by: Adrian Hunter <redacted> --- arch/arm/mach-omap2/hsmmc.c | 3 ++- arch/arm/mach-omap2/hsmmc.h | 1 + 2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index b2f30be..6b97fae 100644
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c@@ -440,7 +440,8 @@ void __init omap_init_hsmmc(struct omap2_hsmmc_info *hsmmcinfo, int ctrl_nr) pr_err("%s fails!\n", __func__); goto done; } - omap_hsmmc_mux(mmc_data, (ctrl_nr - 1)); + if (!hsmmcinfo->nomux) + omap_hsmmc_mux(mmc_data, (ctrl_nr - 1)); name = "omap_hsmmc"; ohl = omap_hsmmc_latency;
diff --git a/arch/arm/mach-omap2/hsmmc.h b/arch/arm/mach-omap2/hsmmc.h
index f119348..0f2a87e 100644
--- a/arch/arm/mach-omap2/hsmmc.h
+++ b/arch/arm/mach-omap2/hsmmc.h@@ -19,6 +19,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.7.0.4