summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Yang <leoyang.li@nxp.com>2021-11-17 00:18:46 +0300
committerKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>2022-01-27 12:41:23 +0300
commit3e25f800afb82bd9e5f82458c0c71f1623b31ee5 (patch)
tree43d3480f2a2868e4ac41953775e6e9ca4a0c4cf4
parent985ede63a045eabf3f9dbd7b52a10ae6f2272cb2 (diff)
downloadlinux-3e25f800afb82bd9e5f82458c0c71f1623b31ee5.tar.xz
memory: fsl_ifc: populate child devices without relying on simple-bus
After we update the binding to not use simple-bus compatible for the controller, we need the driver to populate the child devices explicitly. Signed-off-by: Li Yang <leoyang.li@nxp.com> Link: https://lore.kernel.org/r/20211116211846.16335-3-leoyang.li@nxp.com Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
-rw-r--r--drivers/memory/fsl_ifc.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/memory/fsl_ifc.c b/drivers/memory/fsl_ifc.c
index 75a8c38df939..2f6939da21cd 100644
--- 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: