kernel: bump 5.4 to 5.4.137
[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 701-net-0041-net-ethernet-Rename-PHY_INTERFACE_MODE_SGMII_2500.patch
1 From 15096410c230acd29b2b1bf7958b71e1f990414a Mon Sep 17 00:00:00 2001
2 From: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
3 Date: Wed, 29 Nov 2017 06:48:54 +0530
4 Subject: [PATCH] net: ethernet: Rename PHY_INTERFACE_MODE_SGMII_2500
5
6 Rename PHY_INTERFACE_MODE_SGMII_2500 to PHY_INTERFACE_MODE_2500SGMII
7 Convention is to put the number(2500) first and then the
8 interface mode(SGMII)
9
10 Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
11 ---
12 drivers/net/ethernet/freescale/sdk_dpaa/mac.c | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15 --- a/drivers/net/ethernet/freescale/sdk_dpaa/mac.c
16 +++ b/drivers/net/ethernet/freescale/sdk_dpaa/mac.c
17 @@ -76,7 +76,7 @@ static const char phy_str[][11] = {
18 [PHY_INTERFACE_MODE_RGMII_TXID] = "rgmii-txid",
19 [PHY_INTERFACE_MODE_RTBI] = "rtbi",
20 [PHY_INTERFACE_MODE_XGMII] = "xgmii",
21 - [PHY_INTERFACE_MODE_SGMII_2500] = "sgmii-2500",
22 + [PHY_INTERFACE_MODE_2500SGMII] = "sgmii-2500",
23 };
24
25 static phy_interface_t __pure __attribute__((nonnull)) str2phy(const char *str)
26 @@ -103,7 +103,7 @@ static const uint16_t phy2speed[] = {
27 [PHY_INTERFACE_MODE_RGMII_TXID] = SPEED_1000,
28 [PHY_INTERFACE_MODE_RTBI] = SPEED_1000,
29 [PHY_INTERFACE_MODE_XGMII] = SPEED_10000,
30 - [PHY_INTERFACE_MODE_SGMII_2500] = SPEED_2500,
31 + [PHY_INTERFACE_MODE_2500SGMII] = SPEED_2500,
32 };
33
34 static struct mac_device * __cold