diff options
| author | Silesh C V <silesh@ti.com> | 2011-07-04 04:10:00 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-07-04 04:11:08 -0700 |
| commit | 5e4698fc4406b8603913a2eff44b7c44c5924ea4 (patch) | |
| tree | ab4c2554682e5347be47808b9191a2dafc43940f /arch/arm/mach-omap2/hsmmc.c | |
| parent | ba50348434a933bc4494b3dcd1aed5b0397ab49b (diff) | |
| download | linux-stable-5e4698fc4406b8603913a2eff44b7c44c5924ea4.tar.gz linux-stable-5e4698fc4406b8603913a2eff44b7c44c5924ea4.tar.bz2 linux-stable-5e4698fc4406b8603913a2eff44b7c44c5924ea4.zip | |
omap: HSMMC: Fix GPIO muxing
Use generic gpio call to check the validity of the gpio. Note that
this includes gpio 0 also which was missing before.
Signed-off-by: Silesh C V <silesh@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/hsmmc.c')
| -rw-r--r-- | arch/arm/mach-omap2/hsmmc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index 66868c5d5a29..a9b45c76e1d3 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -13,6 +13,7 @@ #include <linux/slab.h> #include <linux/string.h> #include <linux/delay.h> +#include <linux/gpio.h> #include <mach/hardware.h> #include <plat/mmc.h> #include <plat/omap-pm.h> @@ -213,12 +214,10 @@ static int nop_mmc_set_power(struct device *dev, int slot, int power_on, static inline void omap_hsmmc_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)) + if (gpio_is_valid(mmc_controller->slots[0].switch_pin)) 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)) + if (gpio_is_valid(mmc_controller->slots[0].gpio_wp)) omap_mux_init_gpio(mmc_controller->slots[0].gpio_wp, OMAP_PIN_INPUT_PULLUP); if (cpu_is_omap34xx()) { |