Merge branch 'fsl-fixes'

Madalin Bucur says:

====================
fsl/fman: fixes for ARM

The patch set fixes advertised speeds for QSGMII interfaces, disables
A007273 erratum workaround on non-PowerPC platforms where it does not
apply, enables compilation on ARM64 and addresses a probing issue on
non PPC platforms.

Changes from v3: removed redundant comment, added ack by Scott
Changes from v2: merged fsl/fman changes to avoid a point of failure
Changes from v1: unifying probing on all supported platforms
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 17 insertions, 4 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/Kconfig b/drivers/net/ethernet/freescale/fman/Kconfig
index 79b7c84b7869..dc0850b3b517 100644
--- a/drivers/net/ethernet/freescale/fman/Kconfig
+++ b/drivers/net/ethernet/freescale/fman/Kconfig
@@ -1,6 +1,6 @@
 config FSL_FMAN
         tristate "FMan support"
-        depends on FSL_SOC || COMPILE_TEST
+        depends on FSL_SOC || ARCH_LAYERSCAPE || COMPILE_TEST
         select GENERIC_ALLOCATOR
         select PHYLIB
         default n
diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c
index dafd9e1baba2..f60845f0c6ca 100644
--- a/drivers/net/ethernet/freescale/fman/fman.c
+++ b/drivers/net/ethernet/freescale/fman/fman.c
@@ -1890,6 +1890,7 @@ static int fman_reset(struct fman *fman)
 
                 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)
 
                 /* Enable all MACs */
                 iowrite32be(reg, &guts_regs->devdisr2);
+#endif
 
                 /* 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;
@@ -2868,6 +2876,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:
diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c
index 69ca42ce5dd5..0b31f8502ada 100644
--- a/drivers/net/ethernet/freescale/fman/mac.c
+++ b/drivers/net/ethernet/freescale/fman/mac.c
@@ -594,6 +594,7 @@ static const u16 phy2speed[] = {
         [PHY_INTERFACE_MODE_RGMII_RXID] = SPEED_1000,
         [PHY_INTERFACE_MODE_RGMII_TXID] = SPEED_1000,
         [PHY_INTERFACE_MODE_RTBI]               = SPEED_1000,
+        [PHY_INTERFACE_MODE_QSGMII]             = SPEED_1000,
         [PHY_INTERFACE_MODE_XGMII]              = SPEED_10000
 };