diff options
| -rw-r--r-- | arch/arm/mach-omap2/mmc-twl4030.c | 22 | ||||
| -rw-r--r-- | include/asm-generic/int-ll64.h | 2 |
2 files changed, 21 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c index 3a119aa09c83..21de7929d1a7 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.c +++ b/arch/arm/mach-omap2/mmc-twl4030.c @@ -483,6 +483,20 @@ static int twl_mmc23_set_sleep(struct device *dev, int slot, int sleep, int vdd, return regulator_set_mode(c->vcc_aux, mode); } +/* TODO: Regulator Settings for MMC5 */ +static int twl_mmc5_set_power(struct device *dev, int slot, int power_on, + int vdd) +{ + return 0; +} + +/* TODO: Needs to Update for MMC5 */ +static int twl_mmc5_set_sleep(struct device *dev, int slot, int sleep, int vdd, + int cardsleep) +{ + return 0; +} + static struct omap_mmc_platform_data *hsmmc_data[OMAP44XX_NR_MMC] __initdata; #ifdef CONFIG_TIWLAN_SDIO @@ -657,11 +671,15 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) c->wires = 4; /* FALLTHROUGH */ case 3: - case 4: - case 5: /* off-chip level shifting, or none */ mmc->slots[0].set_power = twl_mmc23_set_power; mmc->slots[0].set_sleep = twl_mmc23_set_sleep; + break; + case 4: + case 5: + /* FIXME :Adding dummy functions */ + mmc->slots[0].set_power = twl_mmc5_set_power; + mmc->slots[0].set_sleep = twl_mmc5_set_sleep; #ifdef CONFIG_TIWLAN_SDIO mmc->slots[0].ocr_mask = MMC_VDD_165_195; #endif diff --git a/include/asm-generic/int-ll64.h b/include/asm-generic/int-ll64.h index f394147c0739..0d806774a6ec 100644 --- a/include/asm-generic/int-ll64.h +++ b/include/asm-generic/int-ll64.h @@ -8,7 +8,7 @@ #ifndef _ASM_GENERIC_INT_LL64_H #define _ASM_GENERIC_INT_LL64_H -#include <asm/bitsperlong.h> +#include <asm-generic/bitsperlong.h> #ifndef __ASSEMBLY__ /* |