950-0033-lan78xx-Enable-LEDs-and-auto-negotiation.patch 1.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748
  1. From 10346eaf22b2540aaf0afc71aa8db931038054a2 Mon Sep 17 00:00:00 2001
  2. From: Phil Elwell <[email protected]>
  3. Date: Tue, 17 Oct 2017 15:04:29 +0100
  4. Subject: [PATCH 033/782] lan78xx: Enable LEDs and auto-negotiation
  5. For applications of the LAN78xx that don't have valid programmed
  6. EEPROMs or OTPs, enabling both LEDs and auto-negotiation by default
  7. seems reasonable.
  8. Signed-off-by: Phil Elwell <[email protected]>
  9. ---
  10. drivers/net/usb/lan78xx.c | 11 +++++++++++
  11. 1 file changed, 11 insertions(+)
  12. --- a/drivers/net/usb/lan78xx.c
  13. +++ b/drivers/net/usb/lan78xx.c
  14. @@ -2472,6 +2472,11 @@ static int lan78xx_reset(struct lan78xx_
  15. int ret = 0;
  16. unsigned long timeout;
  17. u8 sig;
  18. + bool has_eeprom;
  19. + bool has_otp;
  20. +
  21. + has_eeprom = !lan78xx_read_eeprom(dev, 0, 0, NULL);
  22. + has_otp = !lan78xx_read_otp(dev, 0, 0, NULL);
  23. ret = lan78xx_read_reg(dev, HW_CFG, &buf);
  24. buf |= HW_CFG_LRST_;
  25. @@ -2525,6 +2530,9 @@ static int lan78xx_reset(struct lan78xx_
  26. ret = lan78xx_read_reg(dev, HW_CFG, &buf);
  27. buf |= HW_CFG_MEF_;
  28. + /* If no valid EEPROM and no valid OTP, enable the LEDs by default */
  29. + if (!has_eeprom && !has_otp)
  30. + buf |= HW_CFG_LED0_EN_ | HW_CFG_LED1_EN_;
  31. ret = lan78xx_write_reg(dev, HW_CFG, buf);
  32. ret = lan78xx_read_reg(dev, USB_CFG0, &buf);
  33. @@ -2580,6 +2588,9 @@ static int lan78xx_reset(struct lan78xx_
  34. buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_;
  35. }
  36. }
  37. + /* If no valid EEPROM and no valid OTP, enable AUTO negotiation */
  38. + if (!has_eeprom && !has_otp)
  39. + buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_;
  40. ret = lan78xx_write_reg(dev, MAC_CR, buf);
  41. ret = lan78xx_read_reg(dev, MAC_TX, &buf);