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: Prabhakar Kushwaha <prabhakar@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Родитель
1919aac36c
Коммит
721c070590
|
@ -244,12 +244,6 @@ static int __devinit fsl_ifc_ctrl_probe(struct platform_device *dev)
|
|||
/* get the nand machine irq */
|
||||
fsl_ifc_ctrl_dev->nand_irq =
|
||||
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;
|
||||
|
||||
|
@ -267,13 +261,15 @@ static int __devinit fsl_ifc_ctrl_probe(struct platform_device *dev)
|
|||
goto err_irq;
|
||||
}
|
||||
|
||||
ret = request_irq(fsl_ifc_ctrl_dev->nand_irq, fsl_ifc_nand_irq, 0,
|
||||
"fsl-ifc-nand", fsl_ifc_ctrl_dev);
|
||||
if (fsl_ifc_ctrl_dev->nand_irq) {
|
||||
ret = request_irq(fsl_ifc_ctrl_dev->nand_irq, fsl_ifc_nand_irq,
|
||||
0, "fsl-ifc-nand", fsl_ifc_ctrl_dev);
|
||||
if (ret != 0) {
|
||||
dev_err(&dev->dev, "failed to install irq (%d)\n",
|
||||
fsl_ifc_ctrl_dev->nand_irq);
|
||||
goto err_nandirq;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче