Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e4698fc authored by Silesh C V's avatar Silesh C V Committed by Tony Lindgren
Browse files

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: default avatarSilesh C V <silesh@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent ba503484

arch/arm/mach-omap2/hsmmc.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <linux/string.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/gpio.h>

#include <mach/hardware.h>

#include <mach/hardware.h>

#include <plat/mmc.h>

#include <plat/mmc.h>

#include <plat/omap-pm.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,

static inline void omap_hsmmc_mux(struct omap_mmc_platform_data *mmc_controller,

			int controller_nr)

			int controller_nr)

{

{

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

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

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

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

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

					OMAP_PIN_INPUT_PULLUP);

					OMAP_PIN_INPUT_PULLUP);

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

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

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

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

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

					OMAP_PIN_INPUT_PULLUP);

					OMAP_PIN_INPUT_PULLUP);

	if (cpu_is_omap34xx()) {

	if (cpu_is_omap34xx()) {