2020-07-02 23:30:56 +08:00
|
|
|
From e91aa9302b0d3f9730983d0f1b168a081aab6236 Mon Sep 17 00:00:00 2001
|
2019-07-16 02:39:17 -07:00
|
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
|
|
Date: Tue, 17 Oct 2017 15:04:29 +0100
|
2020-01-11 23:39:11 +08:00
|
|
|
Subject: [PATCH] lan78xx: Enable LEDs and auto-negotiation
|
2019-07-16 02:39:17 -07:00
|
|
|
|
|
|
|
For applications of the LAN78xx that don't have valid programmed
|
|
|
|
EEPROMs or OTPs, enabling both LEDs and auto-negotiation by default
|
|
|
|
seems reasonable.
|
|
|
|
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
|
|
---
|
|
|
|
drivers/net/usb/lan78xx.c | 11 +++++++++++
|
|
|
|
1 file changed, 11 insertions(+)
|
|
|
|
|
|
|
|
--- a/drivers/net/usb/lan78xx.c
|
|
|
|
+++ b/drivers/net/usb/lan78xx.c
|
kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
431fb8c mac80211: add AQL improvements
6bdd4c9 mac80211: add missing backports for building with 4.14 kernels
0106820 mac80211: add missing return code checks in AQL improvements
e7f7101 mac80211: rework encapsulation offload support
[package]
base-files: add function for generating random MAC
dnsmasq: abort dhcp_check on interface state
boot: sync upstream source code
ath10k-ct-firmware/mt76/sch_cake: update to latest git HEAD
[script]
download: add China Mirror Station
[target]
Sync: arc770, ath79, bcm63xx, kirkwood, lantiq, layerscape,
mediatek, mvebu, octeon, oxnas, pistachio, uml
Sync most of the target patches.
Run-compiled-on: ipq40xx (4.19 & 5.4), ramips
2020-08-26 11:31:50 +08:00
|
|
|
@@ -2461,6 +2461,11 @@ static int lan78xx_reset(struct lan78xx_
|
2019-07-16 02:39:17 -07:00
|
|
|
int ret = 0;
|
|
|
|
unsigned long timeout;
|
|
|
|
u8 sig;
|
|
|
|
+ bool has_eeprom;
|
|
|
|
+ bool has_otp;
|
|
|
|
+
|
|
|
|
+ has_eeprom = !lan78xx_read_eeprom(dev, 0, 0, NULL);
|
|
|
|
+ has_otp = !lan78xx_read_otp(dev, 0, 0, NULL);
|
|
|
|
|
|
|
|
ret = lan78xx_read_reg(dev, HW_CFG, &buf);
|
|
|
|
buf |= HW_CFG_LRST_;
|
kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
431fb8c mac80211: add AQL improvements
6bdd4c9 mac80211: add missing backports for building with 4.14 kernels
0106820 mac80211: add missing return code checks in AQL improvements
e7f7101 mac80211: rework encapsulation offload support
[package]
base-files: add function for generating random MAC
dnsmasq: abort dhcp_check on interface state
boot: sync upstream source code
ath10k-ct-firmware/mt76/sch_cake: update to latest git HEAD
[script]
download: add China Mirror Station
[target]
Sync: arc770, ath79, bcm63xx, kirkwood, lantiq, layerscape,
mediatek, mvebu, octeon, oxnas, pistachio, uml
Sync most of the target patches.
Run-compiled-on: ipq40xx (4.19 & 5.4), ramips
2020-08-26 11:31:50 +08:00
|
|
|
@@ -2514,6 +2519,9 @@ static int lan78xx_reset(struct lan78xx_
|
2019-07-16 02:39:17 -07:00
|
|
|
|
|
|
|
ret = lan78xx_read_reg(dev, HW_CFG, &buf);
|
|
|
|
buf |= HW_CFG_MEF_;
|
|
|
|
+ /* If no valid EEPROM and no valid OTP, enable the LEDs by default */
|
|
|
|
+ if (!has_eeprom && !has_otp)
|
|
|
|
+ buf |= HW_CFG_LED0_EN_ | HW_CFG_LED1_EN_;
|
|
|
|
ret = lan78xx_write_reg(dev, HW_CFG, buf);
|
|
|
|
|
|
|
|
ret = lan78xx_read_reg(dev, USB_CFG0, &buf);
|
kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
431fb8c mac80211: add AQL improvements
6bdd4c9 mac80211: add missing backports for building with 4.14 kernels
0106820 mac80211: add missing return code checks in AQL improvements
e7f7101 mac80211: rework encapsulation offload support
[package]
base-files: add function for generating random MAC
dnsmasq: abort dhcp_check on interface state
boot: sync upstream source code
ath10k-ct-firmware/mt76/sch_cake: update to latest git HEAD
[script]
download: add China Mirror Station
[target]
Sync: arc770, ath79, bcm63xx, kirkwood, lantiq, layerscape,
mediatek, mvebu, octeon, oxnas, pistachio, uml
Sync most of the target patches.
Run-compiled-on: ipq40xx (4.19 & 5.4), ramips
2020-08-26 11:31:50 +08:00
|
|
|
@@ -2569,6 +2577,9 @@ static int lan78xx_reset(struct lan78xx_
|
2019-07-16 02:39:17 -07:00
|
|
|
buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
+ /* If no valid EEPROM and no valid OTP, enable AUTO negotiation */
|
|
|
|
+ if (!has_eeprom && !has_otp)
|
|
|
|
+ buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_;
|
|
|
|
ret = lan78xx_write_reg(dev, MAC_CR, buf);
|
|
|
|
|
|
|
|
ret = lan78xx_read_reg(dev, MAC_TX, &buf);
|