diff options
| author | Madalin Bucur <madalin.bucur@nxp.com> | 2016-12-19 22:42:44 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-20 13:55:34 -0500 |
| commit | ae6021d4fc2bcc9e3193a007b2c9d31392ac641b (patch) | |
| tree | cad5bc7bec55ed235e230fcc4ba1b079f13145a3 | |
| parent | 606987b04e6c0dd8027ea331f2eeae35a5f4413c (diff) | |
| download | linux-ae6021d4fc2bcc9e3193a007b2c9d31392ac641b.tar.bz2 | |
powerpc: fsl/fman: remove fsl,fman from of_device_ids[]
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 <igal.liberman@freescale.com>
Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
Acked-by: Scott Wood <oss@buserror.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/powerpc/platforms/85xx/corenet_generic.c | 3 | ||||
| -rw-r--r-- | drivers/net/ethernet/freescale/fman/fman.c | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c index 3803b0addf65..6c0ba75fb256 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", diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c index dafd9e1baba2..4b832633a1c0 100644 --- a/drivers/net/ethernet/freescale/fman/fman.c +++ b/drivers/net/ethernet/freescale/fman/fman.c @@ -2868,6 +2868,13 @@ static struct fman *read_dts_node(struct platform_device *of_dev) fman->dev = &of_dev->dev; + 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; + } + return fman; fman_node_put: |