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 <[email protected]>
Signed-off-by: Madalin Bucur <[email protected]>
Acked-by: Scott Wood <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c
index 3803b0addf657edafae38ee217136db69a5db900..6c0ba75fb2561f730908050c18afc35ebd45eb5f 100644 (file)
--- 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 dafd9e1baba2cb420ea70826408d0474488ca246..4b832633a1c041c3ba76830be7974933ae5baa24 100644 (file)
--- 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: