| From 2619a33961e126b849e4d6e3296f97bb297a50f2 Mon Sep 17 00:00:00 2001 |
| From: Madalin Bucur <madalin.bucur@oss.nxp.com> |
| Date: Wed, 22 Jan 2020 16:15:14 +0200 |
| Subject: [PATCH] net: fsl/fman: rename IF_MODE_XGMII to IF_MODE_10G |
| |
| commit 457bfc0a4bf531487ecc3cf82ec728a5e114fb1e upstream. |
| |
| As the only 10G PHY interface type defined at the moment the code |
| was developed was XGMII, although the PHY interface mode used was |
| not XGMII, XGMII was used in the code to denote 10G. This patch |
| renames the 10G interface mode to remove the ambiguity. |
| |
| Signed-off-by: Madalin Bucur <madalin.bucur@oss.nxp.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/net/ethernet/freescale/fman/fman_memac.c b/drivers/net/ethernet/freescale/fman/fman_memac.c |
| index 41c6fa200e74..e1901874c19f 100644 |
| --- a/drivers/net/ethernet/freescale/fman/fman_memac.c |
| +++ b/drivers/net/ethernet/freescale/fman/fman_memac.c |
| @@ -110,7 +110,7 @@ do { \ |
| /* Interface Mode Register (IF_MODE) */ |
| |
| #define IF_MODE_MASK 0x00000003 /* 30-31 Mask on i/f mode bits */ |
| -#define IF_MODE_XGMII 0x00000000 /* 30-31 XGMII (10G) interface */ |
| +#define IF_MODE_10G 0x00000000 /* 30-31 10G interface */ |
| #define IF_MODE_GMII 0x00000002 /* 30-31 GMII (1G) interface */ |
| #define IF_MODE_RGMII 0x00000004 |
| #define IF_MODE_RGMII_AUTO 0x00008000 |
| @@ -440,7 +440,7 @@ static int init(struct memac_regs __iomem *regs, struct memac_cfg *cfg, |
| tmp = 0; |
| switch (phy_if) { |
| case PHY_INTERFACE_MODE_XGMII: |
| - tmp |= IF_MODE_XGMII; |
| + tmp |= IF_MODE_10G; |
| break; |
| default: |
| tmp |= IF_MODE_GMII; |
| -- |
| 2.7.4 |
| |
