generic: mtd: backport SPI_NOR_HAS_LOCK
[openwrt/openwrt.git] / target / linux / layerscape / patches-4.4 / 7065-dpaa_eth-replace-sgmii-2500-with-qsgmii.patch
1 From a768af05b1ffe644f54303036e5c048952e0f721 Mon Sep 17 00:00:00 2001
2 From: Madalin Bucur <madalin.bucur@freescale.com>
3 Date: Mon, 4 Apr 2016 20:23:21 +0300
4 Subject: [PATCH 65/70] dpaa_eth: replace sgmii-2500 with qsgmii
5
6 Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com>
7 ---
8 drivers/net/ethernet/freescale/sdk_dpaa/mac.c | 6 ------
9 1 file changed, 6 deletions(-)
10
11 --- a/drivers/net/ethernet/freescale/sdk_dpaa/mac.c
12 +++ b/drivers/net/ethernet/freescale/sdk_dpaa/mac.c
13 @@ -74,7 +74,6 @@ 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_QSGMII] = "sgmii-2500"
18 };
19
20 static phy_interface_t __pure __attribute__((nonnull)) str2phy(const char *str)
21 @@ -101,7 +100,6 @@ static const uint16_t phy2speed[] = {
22 [PHY_INTERFACE_MODE_RGMII_TXID] = SPEED_1000,
23 [PHY_INTERFACE_MODE_RTBI] = SPEED_1000,
24 [PHY_INTERFACE_MODE_XGMII] = SPEED_10000,
25 - [PHY_INTERFACE_MODE_QSGMII] = SPEED_2500
26 };
27
28 static struct mac_device * __cold
29 @@ -341,10 +339,6 @@ static int __cold mac_probe(struct platf
30 mac_dev->if_support &= ~(SUPPORTED_10baseT_Half |
31 SUPPORTED_100baseT_Half);
32
33 - if (strstr(char_prop, "sgmii-2500"))
34 - mac_dev->if_support &= ~(SUPPORTED_10baseT_Half |
35 - SUPPORTED_100baseT_Half);
36 -
37 /* Gigabit support (no half-duplex) */
38 if (mac_dev->max_speed == SPEED_1000 ||
39 mac_dev->max_speed == SPEED_2500)