2 files changed, 16 insertions, 4 deletions

diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
index 4778b663653e..bf80855dd0dd 100644
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@ -452,6 +452,10 @@ struct bufdesc_ex {
  * initialisation.
  */
 #define FEC_QUIRK_MIB_CLEAR             (1 << 15)
+/* Only i.MX25/i.MX27/i.MX28 controller supports FRBR,FRSR registers,
+ * those FIFO receive registers are resolved in other platforms.
+ */
+#define FEC_QUIRK_HAS_FRREG             (1 << 16)
 
 struct bufdesc_prop {
         int qid;
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index bf9b9fd6d2a0..7b98bb75ba8a 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -91,14 +91,16 @@ static struct platform_device_id fec_devtype[] = {
                 .driver_data = 0,
         }, {
                 .name = "imx25-fec",
-                .driver_data = FEC_QUIRK_USE_GASKET | FEC_QUIRK_MIB_CLEAR,
+                .driver_data = FEC_QUIRK_USE_GASKET | FEC_QUIRK_MIB_CLEAR |
+                               FEC_QUIRK_HAS_FRREG,
         }, {
                 .name = "imx27-fec",
-                .driver_data = FEC_QUIRK_MIB_CLEAR,
+                .driver_data = FEC_QUIRK_MIB_CLEAR | FEC_QUIRK_HAS_FRREG,
         }, {
                 .name = "imx28-fec",
                 .driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_SWAP_FRAME |
-                                FEC_QUIRK_SINGLE_MDIO | FEC_QUIRK_HAS_RACC,
+                                FEC_QUIRK_SINGLE_MDIO | FEC_QUIRK_HAS_RACC |
+                                FEC_QUIRK_HAS_FRREG,
         }, {
                 .name = "imx6q-fec",
                 .driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT |
@@ -2164,7 +2166,13 @@ static void fec_enet_get_regs(struct net_device *ndev,
         memset(buf, 0, regs->len);
 
         for (i = 0; i < ARRAY_SIZE(fec_enet_register_offset); i++) {
-                off = fec_enet_register_offset[i] / 4;
+                off = fec_enet_register_offset[i];
+
+                if ((off == FEC_R_BOUND || off == FEC_R_FSTART) &&
+                    !(fep->quirks & FEC_QUIRK_HAS_FRREG))
+                        continue;
+
+                off >>= 2;
                 buf[off] = readl(&theregs[off]);
         }
 }