1 files changed, 21 insertions, 129 deletions

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 7c71dcdcba8b..f84cfb01716d 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -36,6 +36,7 @@
 #include <linux/mmc/host.h>
 #include <linux/mmc/core.h>
 #include <linux/mmc/mmc.h>
+#include <linux/mmc/slot-gpio.h>
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/gpio.h>
@@ -251,55 +252,24 @@ static void omap_hsmmc_start_dma_transfer(struct omap_hsmmc_host *host);
 static int omap_hsmmc_card_detect(struct device *dev)
 {
         struct omap_hsmmc_host *host = dev_get_drvdata(dev);
-        struct omap_hsmmc_platform_data *mmc = host->pdata;
 
-        /* NOTE: assumes card detect signal is active-low */
-        return !gpio_get_value_cansleep(mmc->switch_pin);
+        return mmc_gpio_get_cd(host->mmc);
 }
 
 static int omap_hsmmc_get_wp(struct device *dev)
 {
         struct omap_hsmmc_host *host = dev_get_drvdata(dev);
-        struct omap_hsmmc_platform_data *mmc = host->pdata;
 
-        /* NOTE: assumes write protect signal is active-high */
-        return gpio_get_value_cansleep(mmc->gpio_wp);
+        return mmc_gpio_get_ro(host->mmc);
 }
 
 static int omap_hsmmc_get_cover_state(struct device *dev)
 {
         struct omap_hsmmc_host *host = dev_get_drvdata(dev);
-        struct omap_hsmmc_platform_data *mmc = host->pdata;
 
-        /* NOTE: assumes card detect signal is active-low */
-        return !gpio_get_value_cansleep(mmc->switch_pin);
+        return mmc_gpio_get_cd(host->mmc);
 }
 
-#ifdef CONFIG_PM
-
-static int omap_hsmmc_suspend_cdirq(struct device *dev)
-{
-        struct omap_hsmmc_host *host = dev_get_drvdata(dev);
-
-        disable_irq(host->card_detect_irq);
-        return 0;
-}
-
-static int omap_hsmmc_resume_cdirq(struct device *dev)
-{
-        struct omap_hsmmc_host *host = dev_get_drvdata(dev);
-
-        enable_irq(host->card_detect_irq);
-        return 0;
-}
-
-#else
-
-#define omap_hsmmc_suspend_cdirq        NULL
-#define omap_hsmmc_resume_cdirq         NULL
-
-#endif
-
 #ifdef CONFIG_REGULATOR
 
 static int omap_hsmmc_set_power(struct device *dev, int power_on, int vdd)
@@ -464,7 +434,10 @@ static inline int omap_hsmmc_have_reg(void)
 
 #endif
 
-static int omap_hsmmc_gpio_init(struct omap_hsmmc_host *host,
+static irqreturn_t omap_hsmmc_detect(int irq, void *dev_id);
+
+static int omap_hsmmc_gpio_init(struct mmc_host *mmc,
+                                struct omap_hsmmc_host *host,
                                 struct omap_hsmmc_platform_data *pdata)
 {
         int ret;
@@ -477,46 +450,24 @@ static int omap_hsmmc_gpio_init(struct omap_hsmmc_host *host,
                         host->card_detect = omap_hsmmc_card_detect;
                 host->card_detect_irq =
                                 gpio_to_irq(pdata->switch_pin);
-                ret = gpio_request(pdata->switch_pin, "mmc_cd");
+                mmc_gpio_set_cd_isr(mmc, omap_hsmmc_detect);
+                ret = mmc_gpio_request_cd(mmc, pdata->switch_pin, 0);
                 if (ret)
                         return ret;
-                ret = gpio_direction_input(pdata->switch_pin);
-                if (ret)
-                        goto err_free_sp;
         } else {
                 pdata->switch_pin = -EINVAL;
         }
 
         if (gpio_is_valid(pdata->gpio_wp)) {
                 host->get_ro = omap_hsmmc_get_wp;
-                ret = gpio_request(pdata->gpio_wp, "mmc_wp");
-                if (ret)
-                        goto err_free_cd;
-                ret = gpio_direction_input(pdata->gpio_wp);
+                ret = mmc_gpio_request_ro(mmc, pdata->gpio_wp);
                 if (ret)
-                        goto err_free_wp;
+                        return ret;
         } else {
                 pdata->gpio_wp = -EINVAL;
         }
 
         return 0;
-
-err_free_wp:
-        gpio_free(pdata->gpio_wp);
-err_free_cd:
-        if (gpio_is_valid(pdata->switch_pin))
-err_free_sp:
-                gpio_free(pdata->switch_pin);
-        return ret;
-}
-
-static void omap_hsmmc_gpio_free(struct omap_hsmmc_host *host,
-                                 struct omap_hsmmc_platform_data *pdata)
-{
-        if (gpio_is_valid(pdata->gpio_wp))
-                gpio_free(pdata->gpio_wp);
-        if (gpio_is_valid(pdata->switch_pin))
-                gpio_free(pdata->switch_pin);
 }
 
 /*
@@ -1978,13 +1929,6 @@ static struct omap_hsmmc_platform_data *of_get_hsmmc_pdata(struct device *dev)
 {
         struct omap_hsmmc_platform_data *pdata;
         struct device_node *np = dev->of_node;
-        u32 bus_width, max_freq;
-        int cd_gpio, wp_gpio;
-
-        cd_gpio = of_get_named_gpio(np, "cd-gpios", 0);
-        wp_gpio = of_get_named_gpio(np, "wp-gpios", 0);
-        if (cd_gpio == -EPROBE_DEFER || wp_gpio == -EPROBE_DEFER)
-                return ERR_PTR(-EPROBE_DEFER);
 
         pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
         if (!pdata)
@@ -1993,34 +1937,20 @@ static struct omap_hsmmc_platform_data *of_get_hsmmc_pdata(struct device *dev)
         if (of_find_property(np, "ti,dual-volt", NULL))
                 pdata->controller_flags |= OMAP_HSMMC_SUPPORTS_DUAL_VOLT;
 
-        pdata->switch_pin = cd_gpio;
-        pdata->gpio_wp = wp_gpio;
+        pdata->switch_pin = -EINVAL;
+        pdata->gpio_wp = -EINVAL;
 
         if (of_find_property(np, "ti,non-removable", NULL)) {
                 pdata->nonremovable = true;
                 pdata->no_regulator_off_init = true;
         }
-        of_property_read_u32(np, "bus-width", &bus_width);
-        if (bus_width == 4)
-                pdata->caps |= MMC_CAP_4_BIT_DATA;
-        else if (bus_width == 8)
-                pdata->caps |= MMC_CAP_8_BIT_DATA;
 
         if (of_find_property(np, "ti,needs-special-reset", NULL))
                 pdata->features |= HSMMC_HAS_UPDATED_RESET;
 
-        if (!of_property_read_u32(np, "max-frequency", &max_freq))
-                pdata->max_freq = max_freq;
-
         if (of_find_property(np, "ti,needs-special-hs-handling", NULL))
                 pdata->features |= HSMMC_HAS_HSPE_SUPPORT;
 
-        if (of_find_property(np, "keep-power-in-suspend", NULL))
-                pdata->pm_caps |= MMC_PM_KEEP_POWER;
-
-        if (of_find_property(np, "enable-sdio-wakeup", NULL))
-                pdata->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
-
         return pdata;
 }
 #else
@@ -2078,6 +2008,10 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
                 goto err;
         }
 
+        ret = mmc_of_parse(mmc);
+        if (ret)
+                goto err1;
+
         host            = mmc_priv(mmc);
         host->mmc       = mmc;
         host->pdata     = pdata;
@@ -2091,7 +2025,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
         host->next_data.cookie = 1;
         host->pbias_enabled = 0;
 
-        ret = omap_hsmmc_gpio_init(host, pdata);
+        ret = omap_hsmmc_gpio_init(mmc, host, pdata);
         if (ret)
                 goto err_gpio;
 
@@ -2106,7 +2040,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
 
         if (pdata->max_freq > 0)
                 mmc->f_max = pdata->max_freq;
-        else
+        else if (mmc->f_max == 0)
                 mmc->f_max = OMAP_MMC_MAX_CLOCK;
 
         spin_lock_init(&host->irq_lock);
@@ -2160,7 +2094,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
         if (mmc_pdata(host)->nonremovable)
                 mmc->caps |= MMC_CAP_NONREMOVABLE;
 
-        mmc->pm_caps = mmc_pdata(host)->pm_caps;
+        mmc->pm_caps |= mmc_pdata(host)->pm_caps;
 
         omap_hsmmc_conf_bus_power(host);
 
@@ -2222,22 +2156,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
 
         mmc->ocr_avail = mmc_pdata(host)->ocr_mask;
 
-        /* Request IRQ for card detect */
-        if (host->card_detect_irq) {
-                ret = devm_request_threaded_irq(&pdev->dev,
-                                                host->card_detect_irq,
-                                                NULL, omap_hsmmc_detect,
-                                           IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
-                                           mmc_hostname(mmc), host);
-                if (ret) {
-                        dev_err(mmc_dev(host->mmc),
-                                "Unable to grab MMC CD IRQ\n");
-                        goto err_irq_cd;
-                }
-                host->suspend = omap_hsmmc_suspend_cdirq;
-                host->resume = omap_hsmmc_resume_cdirq;
-        }
-
         omap_hsmmc_disable_irq(host);
 
         /*
@@ -2276,7 +2194,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
 
 err_slot_name:
         mmc_remove_host(mmc);
-err_irq_cd:
         if (host->use_reg)
                 omap_hsmmc_reg_put(host);
 err_irq:
@@ -2289,7 +2206,6 @@ err_irq:
         if (host->dbclk)
                 clk_disable_unprepare(host->dbclk);
 err1:
-        omap_hsmmc_gpio_free(host, pdata);
 err_gpio:
         mmc_free_host(mmc);
 err:
@@ -2315,32 +2231,12 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
         if (host->dbclk)
                 clk_disable_unprepare(host->dbclk);
 
-        omap_hsmmc_gpio_free(host, host->pdata);
         mmc_free_host(host->mmc);
 
         return 0;
 }
 
 #ifdef CONFIG_PM
-static int omap_hsmmc_prepare(struct device *dev)
-{
-        struct omap_hsmmc_host *host = dev_get_drvdata(dev);
-
-        if (host->suspend)
-                return host->suspend(dev);
-
-        return 0;
-}
-
-static void omap_hsmmc_complete(struct device *dev)
-{
-        struct omap_hsmmc_host *host = dev_get_drvdata(dev);
-
-        if (host->resume)
-                host->resume(dev);
-
-}
-
 static int omap_hsmmc_suspend(struct device *dev)
 {
         struct omap_hsmmc_host *host = dev_get_drvdata(dev);
@@ -2398,8 +2294,6 @@ static int omap_hsmmc_resume(struct device *dev)
 }
 
 #else
-#define omap_hsmmc_prepare      NULL
-#define omap_hsmmc_complete     NULL
 #define omap_hsmmc_suspend      NULL
 #define omap_hsmmc_resume       NULL
 #endif
@@ -2484,8 +2378,6 @@ static int omap_hsmmc_runtime_resume(struct device *dev)
 static struct dev_pm_ops omap_hsmmc_dev_pm_ops = {
         .suspend        = omap_hsmmc_suspend,
         .resume         = omap_hsmmc_resume,
-        .prepare        = omap_hsmmc_prepare,
-        .complete       = omap_hsmmc_complete,
         .runtime_suspend = omap_hsmmc_runtime_suspend,
         .runtime_resume = omap_hsmmc_runtime_resume,
 };