mmc: sh_mmcif: add support for bundled MMCIF IRQs

On newer SoCs like R-Mobile U2, MMCIF interrupts are bundled.

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>

1 files changed, 16 insertions, 9 deletions

diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 2ff3e4774b67..c7984bad8efc 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -1307,10 +1307,11 @@ static int sh_mmcif_probe(struct platform_device *pdev)
         struct sh_mmcif_plat_data *pd = pdev->dev.platform_data;
         struct resource *res;
         void __iomem *reg;
+        const char *name;
 
         irq[0] = platform_get_irq(pdev, 0);
         irq[1] = platform_get_irq(pdev, 1);
-        if (irq[0] < 0 || irq[1] < 0) {
+        if (irq[0] < 0) {
                 dev_err(&pdev->dev, "Get irq error\n");
                 return -ENXIO;
         }
@@ -1375,15 +1376,19 @@ static int sh_mmcif_probe(struct platform_device *pdev)
         sh_mmcif_sync_reset(host);
         sh_mmcif_writel(host->addr, MMCIF_CE_INT_MASK, MASK_ALL);
 
-        ret = request_threaded_irq(irq[0], sh_mmcif_intr, sh_mmcif_irqt, 0, "sh_mmc:error", host);
+        name = irq[1] < 0 ? dev_name(&pdev->dev) : "sh_mmc:error";
+        ret = request_threaded_irq(irq[0], sh_mmcif_intr, sh_mmcif_irqt, 0, name, host);
         if (ret) {
-                dev_err(&pdev->dev, "request_irq error (sh_mmc:error)\n");
+                dev_err(&pdev->dev, "request_irq error (%s)\n", name);
                 goto ereqirq0;
         }
-        ret = request_threaded_irq(irq[1], sh_mmcif_intr, sh_mmcif_irqt, 0, "sh_mmc:int", host);
-        if (ret) {
-                dev_err(&pdev->dev, "request_irq error (sh_mmc:int)\n");
-                goto ereqirq1;
+        if (irq[1] >= 0) {
+                ret = request_threaded_irq(irq[1], sh_mmcif_intr, sh_mmcif_irqt,
+                                           0, "sh_mmc:int", host);
+                if (ret) {
+                        dev_err(&pdev->dev, "request_irq error (sh_mmc:int)\n");
+                        goto ereqirq1;
+                }
         }
 
         if (pd && pd->use_cd_gpio) {
@@ -1406,7 +1411,8 @@ static int sh_mmcif_probe(struct platform_device *pdev)
 
 emmcaddh:
 erqcd:
-        free_irq(irq[1], host);
+        if (irq[1] >= 0)
+                free_irq(irq[1], host);
 ereqirq1:
         free_irq(irq[0], host);
 ereqirq0:
@@ -1451,7 +1457,8 @@ static int sh_mmcif_remove(struct platform_device *pdev)
         irq[1] = platform_get_irq(pdev, 1);
 
         free_irq(irq[0], host);
-        free_irq(irq[1], host);
+        if (irq[1] >= 0)
+                free_irq(irq[1], host);
 
         platform_set_drvdata(pdev, NULL);