diff options
Diffstat (limited to 'drivers/mmc/host/mshci-s3c.c')
| -rw-r--r-- | drivers/mmc/host/mshci-s3c.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/mmc/host/mshci-s3c.c b/drivers/mmc/host/mshci-s3c.c index 58670ca..2c890c9 100644 --- a/drivers/mmc/host/mshci-s3c.c +++ b/drivers/mmc/host/mshci-s3c.c @@ -488,6 +488,7 @@ 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; +#ifndef CONFIG_WIMAX_CMC if (pdata->int_power_gpio) { gpio_set_value(pdata->int_power_gpio, 1); s3c_gpio_cfgpin(pdata->int_power_gpio, @@ -495,6 +496,7 @@ static int __devinit mshci_s3c_probe(struct platform_device *pdev) s3c_gpio_setpull(pdata->int_power_gpio, S3C_GPIO_PULL_NONE); } +#endif } /* IF SD controller's WP pin donsn't connected with SD card and there @@ -511,12 +513,15 @@ static int __devinit mshci_s3c_probe(struct platform_device *pdev) if (pdata->cd_type == S3C_MSHCI_CD_GPIO && gpio_is_valid(pdata->ext_cd_gpio)) { +#ifdef CONFIG_WIMAX_CMC + gpio_request(pdata->ext_cd_gpio, "SDHCI EXT CD"); +#else ret = gpio_request(pdata->ext_cd_gpio, "MSHCI EXT CD"); if (ret) { dev_err(&pdev->dev, "cannot request gpio for card detect\n"); goto err_add_host; } - +#endif sc->ext_cd_gpio = pdata->ext_cd_gpio; sc->ext_cd_irq = gpio_to_irq(pdata->ext_cd_gpio); @@ -537,7 +542,9 @@ static int __devinit mshci_s3c_probe(struct platform_device *pdev) goto err_add_host; } +#ifndef CONFIG_WIMAX_CMC device_enable_async_suspend(dev); +#endif return 0; |