diff options
| author | Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de> | 2012-07-21 23:04:45 +0200 |
|---|---|---|
| committer | Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de> | 2012-07-21 23:04:45 +0200 |
| commit | 0a1182796f6475b8cb2ff1781dad873a744b3197 (patch) | |
| tree | e15b5256dac226c49a25b5e24594cd638e2fec2c /drivers/mmc/host | |
| parent | 633018c13fe06461d9c60692fbb114734aa37802 (diff) | |
| download | kernel_samsung_smdk4412-0a1182796f6475b8cb2ff1781dad873a744b3197.zip kernel_samsung_smdk4412-0a1182796f6475b8cb2ff1781dad873a744b3197.tar.gz kernel_samsung_smdk4412-0a1182796f6475b8cb2ff1781dad873a744b3197.tar.bz2 | |
samsung opensource update3
Diffstat (limited to 'drivers/mmc/host')
| -rw-r--r-- | drivers/mmc/host/mshci-s3c.c | 7 | ||||
| -rw-r--r-- | drivers/mmc/host/mshci.c | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/drivers/mmc/host/mshci-s3c.c b/drivers/mmc/host/mshci-s3c.c index 323f115..5023d10 100644 --- a/drivers/mmc/host/mshci-s3c.c +++ b/drivers/mmc/host/mshci-s3c.c @@ -487,6 +487,13 @@ static int __devinit mshci_s3c_probe(struct platform_device *pdev) if (pdata->cd_type == S3C_MSHCI_CD_PERMANENT) { host->quirks |= MSHCI_QUIRK_BROKEN_PRESENT_BIT; host->mmc->caps |= MMC_CAP_NONREMOVABLE; + if (pdata->int_power_gpio) { + gpio_set_value(pdata->int_power_gpio, 1); + s3c_gpio_cfgpin(pdata->int_power_gpio, + S3C_GPIO_OUTPUT); + s3c_gpio_setpull(pdata->int_power_gpio, + S3C_GPIO_PULL_NONE); + } } /* IF SD controller's WP pin donsn't connected with SD card and there diff --git a/drivers/mmc/host/mshci.c b/drivers/mmc/host/mshci.c index 73de297..9431405 100644 --- a/drivers/mmc/host/mshci.c +++ b/drivers/mmc/host/mshci.c @@ -1620,7 +1620,6 @@ static void mshci_cmd_irq(struct mshci_host *host, u32 intmask) host->error_state = 1; #if defined(CONFIG_MACH_M0) || defined(CONFIG_MACH_P4NOTE) || \ defined(CONFIG_MACH_C1_USA_ATT) - /* dh0421.hwang */ if (host->mmc && host->mmc->card) mshci_dumpregs(host); #endif @@ -1662,11 +1661,8 @@ static void mshci_data_irq(struct mshci_host *host, u32 intmask, u8 intr_src) printk(KERN_ERR "%s: Host timeout error\n", mmc_hostname(host->mmc)); host->data->error = -ETIMEDOUT; -#if 1 /* debugging for Host timeout error */ + /* debugging for Host timeout error */ mshci_dumpregs(host); - panic("[TEST] %s: HTO error interrupt occured\n", - mmc_hostname(host->mmc)); -#endif } else if (intmask & INTMSK_DRTO) { printk(KERN_ERR "%s: Data read timeout error\n", mmc_hostname(host->mmc)); @@ -1709,7 +1705,6 @@ static void mshci_data_irq(struct mshci_host *host, u32 intmask, u8 intr_src) host->error_state = 1; #if defined(CONFIG_MACH_M0) || defined(CONFIG_MACH_P4NOTE) || \ defined(CONFIG_MACH_C1_USA_ATT) - /* dh0421.hwang */ if (host->mmc && host->mmc->card) mshci_dumpregs(host); #endif |