Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 31 insertions, 2 deletions

diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c
index 1247e5de9faa..ab66f2454dc4 100644
--- a/drivers/mmc/host/of_mmc_spi.c
+++ b/drivers/mmc/host/of_mmc_spi.c
@@ -15,14 +15,21 @@
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/slab.h>
+#include <linux/irq.h>
 #include <linux/gpio.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
+#include <linux/of_irq.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/mmc_spi.h>
 #include <linux/mmc/core.h>
 #include <linux/mmc/host.h>
 
+/* For archs that don't support NO_IRQ (such as mips), provide a dummy value */
+#ifndef NO_IRQ
+#define NO_IRQ 0
+#endif
+
 MODULE_LICENSE("GPL");
 
 enum {
@@ -34,6 +41,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 +69,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 +145,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;