cddd459140
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
73 lines
2.2 KiB
Diff
73 lines
2.2 KiB
Diff
From f8c221dc7383a50defcc5b96595e092159dbe928 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Oltean <vladimir.oltean@nxp.com>
|
|
Date: Sat, 9 Nov 2019 15:02:59 +0200
|
|
Subject: [PATCH] net: mscc: ocelot: refactor adjust_link into a
|
|
netdev-independent function
|
|
|
|
This will be called from the Felix DSA frontend, which will work in
|
|
PHYLIB compatibility mode initially.
|
|
|
|
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/mscc/ocelot.c | 27 +++++++++++++++++----------
|
|
1 file changed, 17 insertions(+), 10 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mscc/ocelot.c
|
|
+++ b/drivers/net/ethernet/mscc/ocelot.c
|
|
@@ -410,15 +410,13 @@ static u16 ocelot_wm_enc(u16 value)
|
|
return value;
|
|
}
|
|
|
|
-static void ocelot_port_adjust_link(struct net_device *dev)
|
|
+static void ocelot_adjust_link(struct ocelot *ocelot, int port,
|
|
+ struct phy_device *phydev)
|
|
{
|
|
- struct ocelot_port_private *priv = netdev_priv(dev);
|
|
- struct ocelot_port *ocelot_port = &priv->port;
|
|
- struct ocelot *ocelot = ocelot_port->ocelot;
|
|
+ struct ocelot_port *ocelot_port = ocelot->ports[port];
|
|
int speed, atop_wm, mode = 0;
|
|
- u8 port = priv->chip_port;
|
|
|
|
- switch (dev->phydev->speed) {
|
|
+ switch (phydev->speed) {
|
|
case SPEED_10:
|
|
speed = OCELOT_SPEED_10;
|
|
break;
|
|
@@ -434,14 +432,14 @@ static void ocelot_port_adjust_link(stru
|
|
mode = DEV_MAC_MODE_CFG_GIGA_MODE_ENA;
|
|
break;
|
|
default:
|
|
- netdev_err(dev, "Unsupported PHY speed: %d\n",
|
|
- dev->phydev->speed);
|
|
+ dev_err(ocelot->dev, "Unsupported PHY speed on port %d: %d\n",
|
|
+ port, phydev->speed);
|
|
return;
|
|
}
|
|
|
|
- phy_print_status(dev->phydev);
|
|
+ phy_print_status(phydev);
|
|
|
|
- if (!dev->phydev->link)
|
|
+ if (!phydev->link)
|
|
return;
|
|
|
|
/* Only full duplex supported for now */
|
|
@@ -536,6 +534,15 @@ static void ocelot_port_adjust_link(stru
|
|
ocelot_write(ocelot, ocelot_wm_enc(atop_wm), SYS_ATOP_TOT_CFG);
|
|
}
|
|
|
|
+static void ocelot_port_adjust_link(struct net_device *dev)
|
|
+{
|
|
+ struct ocelot_port_private *priv = netdev_priv(dev);
|
|
+ struct ocelot *ocelot = priv->port.ocelot;
|
|
+ int port = priv->chip_port;
|
|
+
|
|
+ ocelot_adjust_link(ocelot, port, dev->phydev);
|
|
+}
|
|
+
|
|
static void ocelot_port_enable(struct ocelot *ocelot, int port,
|
|
struct phy_device *phy)
|
|
{
|