|
@@ -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()) {
|