powerpc/85xx: handle the eLBC error interrupt if it exists in dts

On P1020, P1021, P1022, and P1023, eLBC event interrupts are routed
to internal interrupt 3 while ELBC error interrupts are routed to
internal interrupt 0.  We need to call request_irq for each.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
[scottwood@freescale.com: reworded commit message and fixed author]
Signed-off-by: Scott Wood <scottwood@freescale.com>

diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h
index 420b453..067fb0d 100644 (file)
--- a/arch/powerpc/include/asm/fsl_lbc.h
+++ b/arch/powerpc/include/asm/fsl_lbc.h
@@ -285,7 +285,7 @@ struct fsl_lbc_ctrl {
        /* device info */
        struct device                   *dev;
        struct fsl_lbc_regs __iomem     *regs;
-       int                             irq;
+       int                             irq[2];
        wait_queue_head_t               irq_wait;
        spinlock_t                      lock;
        void                            *nand;

diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c
index 6bc5a54..d631022 100644 (file)
--- a/arch/powerpc/sysdev/fsl_lbc.c
+++ b/arch/powerpc/sysdev/fsl_lbc.c
@@ -214,10 +214,14 @@ static irqreturn_t fsl_lbc_ctrl_irq(int irqno, void *data)
        struct fsl_lbc_ctrl *ctrl = data;
        struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
        u32 status;
+       unsigned long flags;
 
+       spin_lock_irqsave(&fsl_lbc_lock, flags);
        status = in_be32(&lbc->ltesr);
-       if (!status)
+       if (!status) {
+               spin_unlock_irqrestore(&fsl_lbc_lock, flags);
                return IRQ_NONE;
+       }
 
        out_be32(&lbc->ltesr, LTESR_CLEAR);
        out_be32(&lbc->lteatr, 0);
@@ -260,6 +264,7 @@ static irqreturn_t fsl_lbc_ctrl_irq(int irqno, void *data)
        if (status & ~LTESR_MASK)
                dev_err(ctrl->dev, "Unknown error: "
                        "LTESR 0x%08X\n", status);
+       spin_unlock_irqrestore(&fsl_lbc_lock, flags);
        return IRQ_HANDLED;
 }
 
@@ -298,8 +303,8 @@ static int fsl_lbc_ctrl_probe(struct platform_device *dev)
                goto err;
        }
 
-       fsl_lbc_ctrl_dev->irq = irq_of_parse_and_map(dev->dev.of_node, 0);
-       if (fsl_lbc_ctrl_dev->irq == NO_IRQ) {
+       fsl_lbc_ctrl_dev->irq[0] = irq_of_parse_and_map(dev->dev.of_node, 0);
+       if (!fsl_lbc_ctrl_dev->irq[0]) {
                dev_err(&dev->dev, "failed to get irq resource\n");
                ret = -ENODEV;
                goto err;
@@ -311,20 +316,34 @@ static int fsl_lbc_ctrl_probe(struct platform_device *dev)
        if (ret < 0)
                goto err;
 
-       ret = request_irq(fsl_lbc_ctrl_dev->irq, fsl_lbc_ctrl_irq, 0,
+       ret = request_irq(fsl_lbc_ctrl_dev->irq[0], fsl_lbc_ctrl_irq, 0,
                                "fsl-lbc", fsl_lbc_ctrl_dev);
        if (ret != 0) {
                dev_err(&dev->dev, "failed to install irq (%d)\n",
-                       fsl_lbc_ctrl_dev->irq);
-               ret = fsl_lbc_ctrl_dev->irq;
+                       fsl_lbc_ctrl_dev->irq[0]);
+               ret = fsl_lbc_ctrl_dev->irq[0];
                goto err;
        }
 
+       fsl_lbc_ctrl_dev->irq[1] = irq_of_parse_and_map(dev->dev.of_node, 1);
+       if (fsl_lbc_ctrl_dev->irq[1]) {
+               ret = request_irq(fsl_lbc_ctrl_dev->irq[1], fsl_lbc_ctrl_irq,
+                               IRQF_SHARED, "fsl-lbc-err", fsl_lbc_ctrl_dev);
+               if (ret) {
+                       dev_err(&dev->dev, "failed to install irq (%d)\n",
+                                       fsl_lbc_ctrl_dev->irq[1]);
+                       ret = fsl_lbc_ctrl_dev->irq[1];
+                       goto err1;
+               }
+       }
+
        /* Enable interrupts for any detected events */
        out_be32(&fsl_lbc_ctrl_dev->regs->lteir, LTEIR_ENABLE);
 
        return 0;
 
+err1:
+       free_irq(fsl_lbc_ctrl_dev->irq[0], fsl_lbc_ctrl_dev);
 err:
        iounmap(fsl_lbc_ctrl_dev->regs);
        kfree(fsl_lbc_ctrl_dev);