kernel: bump 5.4 to 5.4.153
[openwrt/staging/chunkeey.git] / target / linux / layerscape / patches-5.4 / 701-net-0129-sdk_dpa-align-to-upstream-PHY_INTERFACE_MODE.patch
1 From 3343551eb8a692aafcbf1a7eaf0b79965aa60ba9 Mon Sep 17 00:00:00 2001
2 From: Madalin Bucur <madalin.bucur@nxp.com>
3 Date: Wed, 16 Oct 2019 11:53:54 +0300
4 Subject: [PATCH] sdk_dpa: align to upstream PHY_INTERFACE_MODE
5
6 Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
7 ---
8 drivers/net/ethernet/freescale/sdk_dpaa/mac.c | 4 ++--
9 1 file changed, 2 insertions(+), 2 deletions(-)
10
11 --- a/drivers/net/ethernet/freescale/sdk_dpaa/mac.c
12 +++ b/drivers/net/ethernet/freescale/sdk_dpaa/mac.c
13 @@ -76,7 +76,7 @@ static const char phy_str[][11] = {
14 [PHY_INTERFACE_MODE_RGMII_TXID] = "rgmii-txid",
15 [PHY_INTERFACE_MODE_RTBI] = "rtbi",
16 [PHY_INTERFACE_MODE_XGMII] = "xgmii",
17 - [PHY_INTERFACE_MODE_2500SGMII] = "sgmii-2500",
18 + [PHY_INTERFACE_MODE_2500BASEX] = "sgmii-2500",
19 };
20
21 static phy_interface_t __pure __attribute__((nonnull)) str2phy(const char *str)
22 @@ -103,7 +103,7 @@ static const uint16_t phy2speed[] = {
23 [PHY_INTERFACE_MODE_RGMII_TXID] = SPEED_1000,
24 [PHY_INTERFACE_MODE_RTBI] = SPEED_1000,
25 [PHY_INTERFACE_MODE_XGMII] = SPEED_10000,
26 - [PHY_INTERFACE_MODE_2500SGMII] = SPEED_2500,
27 + [PHY_INTERFACE_MODE_2500BASEX] = SPEED_2500,
28 };
29
30 static struct mac_device * __cold