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

Commit a15164f1 authored by Thomas Weber's avatar Thomas Weber Committed by Tony Lindgren
Browse files

ARM: OMAP: hsmmc: Add support for non-OMAP pins 



The Devkit8000 uses a TWL4030 pin for card detection.
Thats why the error:
_omap_mux_init_gpio: Could not set gpio192
occurs.

This patch checks that the pin is on OMAP before
calling omap_mux_init_gpio.

Signed-off-by: default avatarThomas Weber <weber@corscience.de>
[tony@atomide.com: updated comments]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent e62245ba

arch/arm/mach-omap2/hsmmc.c

+4 −2
Original line number Diff line number Diff line
@@ -214,10 +214,12 @@ 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 (gpio_is_valid(mmc_controller->slots[0].switch_pin))

	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_PIN_INPUT_PULLUP);

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

	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_PIN_INPUT_PULLUP);

	if (cpu_is_omap34xx()) {