memory: fsl_ifc: populate child devices without relying on simple-bus

[linux-2.6-microblaze.git] / drivers / memory / fsl_ifc.c

diff --git a/drivers/memory/fsl_ifc.c b/drivers/memory/fsl_ifc.c
index 75a8c38..2f6939d 100644 (file)
--- a/drivers/memory/fsl_ifc.c
+++ b/drivers/memory/fsl_ifc.c
@@ -88,6 +88,7 @@ static int fsl_ifc_ctrl_remove(struct platform_device *dev)
 {
        struct fsl_ifc_ctrl *ctrl = dev_get_drvdata(&dev->dev);
 
+       of_platform_depopulate(&dev->dev);
        free_irq(ctrl->nand_irq, ctrl);
        free_irq(ctrl->irq, ctrl);
 
@@ -285,8 +286,16 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev)
                }
        }
 
+       /* legacy dts may still use "simple-bus" compatible */
+       ret = of_platform_populate(dev->dev.of_node, NULL, NULL,
+                                       &dev->dev);
+       if (ret)
+               goto err_free_nandirq;
+
        return 0;
 
+err_free_nandirq:
+       free_irq(fsl_ifc_ctrl_dev->nand_irq, fsl_ifc_ctrl_dev);
 err_free_irq:
        free_irq(fsl_ifc_ctrl_dev->irq, fsl_ifc_ctrl_dev);
 err_unmap_nandirq: