lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Shaohui Xie
2014-01-07 14:27:41 +08:00
committed by Scott Wood
parent 297649b9f5
commit a655f724df
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/include/asm/fsl_lbc.h
View File

@@ -285,7 +285,7 @@ struct fsl_lbc_ctrl {
/* device info */ /* device info */
struct device *dev; struct device *dev;
struct fsl_lbc_regs __iomem *regs; struct fsl_lbc_regs __iomem *regs;
int irq; int irq[2];
wait_queue_head_t irq_wait; wait_queue_head_t irq_wait;
spinlock_t lock; spinlock_t lock;
void *nand; void *nand;

31
arch/powerpc/sysdev/fsl_lbc.c
View File

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