2 files changed, 24 insertions, 6 deletions

diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
index fd877f633dd2..2f7fc0c5146f 100644
--- a/drivers/mmc/host/mmc_spi.c
+++ b/drivers/mmc/host/mmc_spi.c
@@ -1516,21 +1516,17 @@ static int __devexit mmc_spi_remove(struct spi_device *spi)
         return 0;
 }
 
-#if defined(CONFIG_OF)
 static struct of_device_id mmc_spi_of_match_table[] __devinitdata = {
         { .compatible = "mmc-spi-slot", },
         {},
 };
-#endif
 
 static struct spi_driver mmc_spi_driver = {
         .driver = {
                 .name =         "mmc_spi",
                 .bus =          &spi_bus_type,
                 .owner =        THIS_MODULE,
-#if defined(CONFIG_OF)
                 .of_match_table = mmc_spi_of_match_table,
-#endif
         },
         .probe =        mmc_spi_probe,
         .remove =       __devexit_p(mmc_spi_remove),
diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c
index 1247e5de9faa..5530def54e5b 100644
--- a/drivers/mmc/host/of_mmc_spi.c
+++ b/drivers/mmc/host/of_mmc_spi.c
@@ -34,6 +34,7 @@ enum {
 struct of_mmc_spi {
         int gpios[NUM_GPIOS];
         bool alow_gpios[NUM_GPIOS];
+        int detect_irq;
         struct mmc_spi_platform_data pdata;
 };
 
@@ -61,6 +62,22 @@ static int of_mmc_spi_get_ro(struct device *dev)
         return of_mmc_spi_read_gpio(dev, WP_GPIO);
 }
 
+static int of_mmc_spi_init(struct device *dev,
+                           irqreturn_t (*irqhandler)(int, void *), void *mmc)
+{
+        struct of_mmc_spi *oms = to_of_mmc_spi(dev);
+
+        return request_threaded_irq(oms->detect_irq, NULL, irqhandler, 0,
+                                    dev_name(dev), mmc);
+}
+
+static void of_mmc_spi_exit(struct device *dev, void *mmc)
+{
+        struct of_mmc_spi *oms = to_of_mmc_spi(dev);
+
+        free_irq(oms->detect_irq, mmc);
+}
+
 struct mmc_spi_platform_data *mmc_spi_get_pdata(struct spi_device *spi)
 {
         struct device *dev = &spi->dev;
@@ -121,8 +138,13 @@ struct mmc_spi_platform_data *mmc_spi_get_pdata(struct spi_device *spi)
         if (gpio_is_valid(oms->gpios[WP_GPIO]))
                 oms->pdata.get_ro = of_mmc_spi_get_ro;
 
-        /* We don't support interrupts yet, let's poll. */
-        oms->pdata.caps |= MMC_CAP_NEEDS_POLL;
+        oms->detect_irq = irq_of_parse_and_map(np, 0);
+        if (oms->detect_irq != NO_IRQ) {
+                oms->pdata.init = of_mmc_spi_init;
+                oms->pdata.exit = of_mmc_spi_exit;
+        } else {
+                oms->pdata.caps |= MMC_CAP_NEEDS_POLL;
+        }
 
         dev->platform_data = &oms->pdata;
         return dev->platform_data;