Re: [upstream-release] [PATCH net v3 2/4] powerpc: fsl/fman: remove fsl, fman from of_device_ids[]
From: Scott Wood <oss@buserror.net>
Date: 2016-12-19 19:46:40
Also in:
linuxppc-dev, netdev
On Mon, 2016-12-19 at 18:13 +0200, Madalin Bucur wrote:
quoted hunk ↗ jump to hunk
The fsl/fman drivers will use of_platform_populate() on all supported platforms. Call of_platform_populate() to probe the FMan sub-nodes. Signed-off-by: Igal Liberman <redacted> Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com> --- arch/powerpc/platforms/85xx/corenet_generic.c | 3 --- drivers/net/ethernet/freescale/fman/fman.c | 8 ++++++++ 2 files changed, 8 insertions(+), 3 deletions(-)diff --git a/arch/powerpc/platforms/85xx/corenet_generic.cb/arch/powerpc/platforms/85xx/corenet_generic.c index 1179115..824b7f1 100644--- a/arch/powerpc/platforms/85xx/corenet_generic.c +++ b/arch/powerpc/platforms/85xx/corenet_generic.c@@ -117,9 +117,6 @@ static const struct of_device_id of_device_ids[] = {{ .compatible = "fsl,qe", }, - { - .compatible = "fsl,fman", - }, /* The following two are for the Freescale hypervisor */ { .name = "hypervisor",
For this part: Acked-by: Scott Wood <oss@buserror.net>
quoted hunk ↗ jump to hunk
diff --git a/drivers/net/ethernet/freescale/fman/fman.cb/drivers/net/ethernet/freescale/fman/fman.c index dafd9e1..0b7f711 100644--- a/drivers/net/ethernet/freescale/fman/fman.c +++ b/drivers/net/ethernet/freescale/fman/fman.c@@ -2868,6 +2868,14 @@ static struct fman *read_dts_node(structplatform_device *of_dev) fman->dev = &of_dev->dev; + /* call of_platform_populate in order to probe sub-nodes on arm64 */ + err = of_platform_populate(fm_node, NULL, NULL, &of_dev->dev); + if (err) { + dev_err(&of_dev->dev, "%s: of_platform_populate() failed\n", + __func__); + goto fman_free; + }
The "on arm64" comment is no longer accurate (and the rest of the comment seems unnecessary). -Scott