--- v2
+++ v1
@@ -1,31 +1,60 @@
-From: Igal Liberman <igal.liberman@freescale.com>
-
-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>
+Reviewed-by: Camelia Groza <camelia.groza@nxp.com>
---
drivers/net/ethernet/freescale/fman/fman.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c
-index dafd9e1..0b7f711 100644
+index f36b4eb..93d6a36 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(struct platform_device *of_dev)
+@@ -1890,6 +1890,7 @@ static int fman_reset(struct fman *fman)
- fman->dev = &of_dev->dev;
+ goto _return;
+ } else {
++#ifdef CONFIG_PPC
+ struct device_node *guts_node;
+ struct ccsr_guts __iomem *guts_regs;
+ u32 devdisr2, reg;
+@@ -1921,6 +1922,7 @@ static int fman_reset(struct fman *fman)
-+ /* 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;
-+ }
-+
- return fman;
+ /* Enable all MACs */
+ iowrite32be(reg, &guts_regs->devdisr2);
++#endif
- fman_node_put:
+ /* Perform FMan reset */
+ iowrite32be(FPM_RSTC_FM_RESET, &fman->fpm_regs->fm_rstc);
+@@ -1932,25 +1934,31 @@ static int fman_reset(struct fman *fman)
+ } while (((ioread32be(&fman->fpm_regs->fm_rstc)) &
+ FPM_RSTC_FM_RESET) && --count);
+ if (count == 0) {
++#ifdef CONFIG_PPC
+ iounmap(guts_regs);
+ of_node_put(guts_node);
++#endif
+ err = -EBUSY;
+ goto _return;
+ }
++#ifdef CONFIG_PPC
+
+ /* Restore devdisr2 value */
+ iowrite32be(devdisr2, &guts_regs->devdisr2);
+
+ iounmap(guts_regs);
+ of_node_put(guts_node);
++#endif
+
+ goto _return;
+
++#ifdef CONFIG_PPC
+ guts_regs:
+ of_node_put(guts_node);
+ guts_node:
+ dev_dbg(fman->dev, "%s: Didn't perform FManV3 reset due to Errata A007273!\n",
+ __func__);
++#endif
+ }
+ _return:
+ return err;
--
2.1.0