[PATCH] OMAP: HSMMC: Fix GPIO muxing
From: S, Venkatraman <hidden>
Date: 2011-06-28 11:37:05
Also in:
linux-omap
On Tue, Jun 28, 2011 at 2:15 PM, Silesh C V [off-list ref] wrote:
quoted hunk ↗ jump to hunk
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 <redacted> --- ?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 66868c5..a9b45c7 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()) { -- 1.7.1
Looks good to me. Reviewed-by: Venkatraman S <redacted>