summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2023-08-23 09:57:55 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2023-08-23 09:57:55 +0200
commit5b0c3cb80d1e16346f42165230496336e6d06de9 (patch)
treec2590a2e0e69b068e705dbc96f24a9e01f93a4e4 /drivers/net
parent33f8161a72e2dd4911b60cb0eaee5f1a3a1bd0f3 (diff)
parent411e9ba6e803a35feb35ed2544e0cdf555161d65 (diff)
downloadbarebox-5b0c3cb80d1e16346f42165230496336e6d06de9.tar.gz
barebox-5b0c3cb80d1e16346f42165230496336e6d06de9.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ksz9477.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/ksz9477.c b/drivers/net/ksz9477.c
index 61142aa97b..9665e0f723 100644
--- a/drivers/net/ksz9477.c
+++ b/drivers/net/ksz9477.c
@@ -175,12 +175,6 @@ static void ksz9477_phy_errata_setup(struct ksz_switch *priv, int port)
*/
ksz9477_port_mmd_write(priv, port, 0x1c, 0x04, 0x00d0);
- /* Energy Efficient Ethernet (EEE) feature select must
- * be manually disabled (except on KSZ8565 which is 100Mbit)
- */
- if (priv->features & GBIT_SUPPORT)
- ksz9477_port_mmd_write(priv, port, 0x07, 0x3c, 0x0000);
-
/* Register settings are required to meet data sheet
* supply current specifications
*/
@@ -269,6 +263,8 @@ static int ksz_port_setup(struct ksz_switch *priv, int port,
if (priv->features & KSZ9477_PHY_ERRATA)
ksz9477_phy_errata_setup(priv, port);
+ ksz9477_port_mmd_write(priv, port, 0x07, 0x3c, 0x0000);
+
ksz_pwrite16(priv, port, 0x100 + (MII_BMCR << 1),
BMCR_ANENABLE | BMCR_ANRESTART | BMCR_RESET);
} else {
@@ -476,6 +472,7 @@ static const struct of_device_id microchip_switch_dt_ids[] = {
{ .compatible = "microchip,ksz8563" },
{ .compatible = "microchip,ksz9477" },
{ .compatible = "microchip,ksz9563" },
+ { .compatible = "microchip,ksz9893" },
{ }
};
MODULE_DEVICE_TABLE(of, microchip_switch_dt_ids);