mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-10-20 14:38:20 +02:00
2bb02ccae3
Deleted (upstreamed): bcm27xx/patches-5.10/950-0186-pinctrl-bcm2835-Change-init-order-for-gpio-hogs.patch [1] sunxi/patches-5.10/103-arm64-dts-allwinner-orangepi-zero-plus-fix-PHY-mo.patch [2] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.89&id=ba696b470839d70c6b8290c1f798bac7fb2a584c [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.89&id=93a957bbf46ceb224b959de61fe85cfc6f71b6c7 Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
From 021908b753875198daddfa9e77a0d2fd8004a469 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Tue, 17 Oct 2017 15:04:29 +0100
|
|
Subject: [PATCH] lan78xx: Enable LEDs and auto-negotiation
|
|
|
|
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
|
|
@@ -2463,6 +2463,11 @@ static int lan78xx_reset(struct lan78xx_
|
|
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_;
|
|
@@ -2516,6 +2521,9 @@ static int lan78xx_reset(struct lan78xx_
|
|
|
|
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);
|
|
@@ -2571,6 +2579,9 @@ static int lan78xx_reset(struct lan78xx_
|
|
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);
|