40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
|
From a768af05b1ffe644f54303036e5c048952e0f721 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Madalin Bucur <madalin.bucur@freescale.com>
|
||
|
|
Date: Mon, 4 Apr 2016 20:23:21 +0300
|
||
|
|
Subject: [PATCH 65/70] dpaa_eth: replace sgmii-2500 with qsgmii
|
||
|
|
|
||
|
|
Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/freescale/sdk_dpaa/mac.c | 6 ------
|
||
|
|
1 file changed, 6 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/ethernet/freescale/sdk_dpaa/mac.c
|
||
|
|
+++ b/drivers/net/ethernet/freescale/sdk_dpaa/mac.c
|
||
|
|
@@ -74,7 +74,6 @@ static const char phy_str[][11] = {
|
||
|
|
[PHY_INTERFACE_MODE_RGMII_TXID] = "rgmii-txid",
|
||
|
|
[PHY_INTERFACE_MODE_RTBI] = "rtbi",
|
||
|
|
[PHY_INTERFACE_MODE_XGMII] = "xgmii",
|
||
|
|
- [PHY_INTERFACE_MODE_QSGMII] = "sgmii-2500"
|
||
|
|
};
|
||
|
|
|
||
|
|
static phy_interface_t __pure __attribute__((nonnull)) str2phy(const char *str)
|
||
|
|
@@ -101,7 +100,6 @@ static const uint16_t phy2speed[] = {
|
||
|
|
[PHY_INTERFACE_MODE_RGMII_TXID] = SPEED_1000,
|
||
|
|
[PHY_INTERFACE_MODE_RTBI] = SPEED_1000,
|
||
|
|
[PHY_INTERFACE_MODE_XGMII] = SPEED_10000,
|
||
|
|
- [PHY_INTERFACE_MODE_QSGMII] = SPEED_2500
|
||
|
|
};
|
||
|
|
|
||
|
|
static struct mac_device * __cold
|
||
|
|
@@ -341,10 +339,6 @@ static int __cold mac_probe(struct platf
|
||
|
|
mac_dev->if_support &= ~(SUPPORTED_10baseT_Half |
|
||
|
|
SUPPORTED_100baseT_Half);
|
||
|
|
|
||
|
|
- if (strstr(char_prop, "sgmii-2500"))
|
||
|
|
- mac_dev->if_support &= ~(SUPPORTED_10baseT_Half |
|
||
|
|
- SUPPORTED_100baseT_Half);
|
||
|
|
-
|
||
|
|
/* Gigabit support (no half-duplex) */
|
||
|
|
if (mac_dev->max_speed == SPEED_1000 ||
|
||
|
|
mac_dev->max_speed == SPEED_2500)
|