diff options
| author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-05-13 12:24:25 -0500 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-05-13 12:24:25 -0500 |
| commit | 3cef9baafdd8c0fd8b6200efa5395e5365ac40a7 (patch) | |
| tree | 14ae7ab95343adcba0a024db14932da01d59103c | |
| parent | f53c310fe6c62df99688ebda27c7da603a4e33e7 (diff) | |
| parent | e95f3d8ed80731ce4d6fcaeedc9c5e8c85d3ea6b (diff) | |
Merge branch 'omap4_next' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into L24x6P3
| -rw-r--r-- | arch/arm/mach-omap2/mmc-twl4030.c | 22 | ||||
| -rw-r--r-- | drivers/serial/omap-serial.c | 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..0ca2876c9a2c 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,8 +671,6 @@ 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; @@ -666,6 +678,12 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) mmc->slots[0].ocr_mask = MMC_VDD_165_195; #endif 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; + break; default: pr_err("MMC%d configuration not supported!\n", c->mmc); kfree(mmc); diff --git a/drivers/serial/omap-serial.c b/drivers/serial/omap-serial.c index b229d6bab9c6..b08a7e6e67f9 100644 --- a/drivers/serial/omap-serial.c +++ b/drivers/serial/omap-serial.c @@ -813,8 +813,8 @@ serial_omap_pm(struct uart_port *port, unsigned int state, unsigned char efr; dev_dbg(up->port.dev, "serial_omap_pm+%d\n", up->pdev->id); - efr = serial_in(up, UART_EFR); serial_out(up, UART_LCR, OMAP_UART_LCR_CONF_MDB); + efr = serial_in(up, UART_EFR); serial_out(up, UART_EFR, efr | UART_EFR_ECB); serial_out(up, UART_LCR, 0); |