Commit 721c0705 authored by Prabhakar Kushwaha's avatar Prabhakar Kushwaha Committed by Kumar Gala

powerpc/mpc85xx: Update interrupt handling for IFC controller

IFC may have one or two interrupts.  If two interrupt specifiers are
present, the first is the "common" interrupt (CM_EVTER_STAT), and the
second is the NAND interrupt (NAND_EVTER_STAT).  If there is only one, that
interrupt reports both types of event.
Signed-off-by: default avatarPrabhakar Kushwaha <prabhakar@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 1919aac3
...@@ -244,12 +244,6 @@ static int __devinit fsl_ifc_ctrl_probe(struct platform_device *dev) ...@@ -244,12 +244,6 @@ static int __devinit fsl_ifc_ctrl_probe(struct platform_device *dev)
/* get the nand machine irq */ /* get the nand machine irq */
fsl_ifc_ctrl_dev->nand_irq = fsl_ifc_ctrl_dev->nand_irq =
irq_of_parse_and_map(dev->dev.of_node, 1); irq_of_parse_and_map(dev->dev.of_node, 1);
if (fsl_ifc_ctrl_dev->nand_irq == NO_IRQ) {
dev_err(&dev->dev, "failed to get irq resource "
"for NAND Machine\n");
ret = -ENODEV;
goto err;
}
fsl_ifc_ctrl_dev->dev = &dev->dev; fsl_ifc_ctrl_dev->dev = &dev->dev;
...@@ -267,12 +261,14 @@ static int __devinit fsl_ifc_ctrl_probe(struct platform_device *dev) ...@@ -267,12 +261,14 @@ static int __devinit fsl_ifc_ctrl_probe(struct platform_device *dev)
goto err_irq; goto err_irq;
} }
ret = request_irq(fsl_ifc_ctrl_dev->nand_irq, fsl_ifc_nand_irq, 0, if (fsl_ifc_ctrl_dev->nand_irq) {
"fsl-ifc-nand", fsl_ifc_ctrl_dev); ret = request_irq(fsl_ifc_ctrl_dev->nand_irq, fsl_ifc_nand_irq,
if (ret != 0) { 0, "fsl-ifc-nand", fsl_ifc_ctrl_dev);
dev_err(&dev->dev, "failed to install irq (%d)\n", if (ret != 0) {
fsl_ifc_ctrl_dev->nand_irq); dev_err(&dev->dev, "failed to install irq (%d)\n",
goto err_nandirq; fsl_ifc_ctrl_dev->nand_irq);
goto err_nandirq;
}
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment