mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
f5919b65d4
Patch generation process: - rebase rpi/rpi-4.14.y on v4.14.89 from linux-stable - git format-patch v4.14.89 Patches skipped during rebase: - lan78xx: Read MAC address from DT if present - lan78xx: Enable LEDs and auto-negotiation - Revert "softirq: Let ksoftirqd do its job" - sc16is7xx: Fix for multi-channel stall - lan78xx: Ignore DT MAC address if already valid - lan78xx: Simple patch to prevent some crashes - tcp_write_queue_purge clears all the SKBs in the write queue - Revert "lan78xx: Simple patch to prevent some crashes" - lan78xx: Connect phy early - Arm: mm: ftrace: Only set text back to ro after kernel has been marked ro - Revert "Revert "softirq: Let ksoftirqd do its job"" - ASoC: cs4265: SOC_SINGLE register value error fix - Revert "ASoC: cs4265: SOC_SINGLE register value error fix" - Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends" - Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"" Patches dropped after rebase: - net: Add non-mainline source for rtl8192cu wlan - net: Fix rtl8192cu build errors on other platforms - brcm: adds support for BCM43341 wifi - brcmfmac: Mute expected startup 'errors' - ARM64: Fix build break for RTL8187/RTL8192CU wifi - ARM64: Enable RTL8187/RTL8192CU wifi in build config - This is the driver for Sony CXD2880 DVB-T2/T tuner + demodulator - brcmfmac: add CLM download support - brcmfmac: request_firmware_direct is quieter - Sets the BCDC priority to constant 0 - brcmfmac: Disable ARP offloading when promiscuous - brcmfmac: Avoid possible out-of-bounds read - brcmfmac: Delete redundant length check - net: rtl8192cu: Normalize indentation - net: rtl8192cu: Fix implicit fallthrough warnings - Revert "Sets the BCDC priority to constant 0" - media: cxd2880: Bump to match 4.18.y version - media: cxd2880-spi: Bump to match 4.18.y version - Revert "mm: alloc_contig: re-allow CMA to compact FS pages" - Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages"" - cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT - 950-0421-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch - 950-0453-Add-hid-bigbenff-to-list-of-have_special_driver-for-.patch Make I2C built-in instead of modular as in upstream defconfig; also the easiest way to get MFD_ARIZONA enabled, which is required by kmod-sound-soc-rpi-cirrus. Add missing compatible strings from 4.9/960-add-rasbperrypi-compatible.patch, using upstream names for compute modules. Add extra patch to enable the LEDs on lan78xx. Compile-tested: bcm2708, bcm2709, bcm2710 (with CONFIG_ALL_KMODS=y) Runtime-tested: bcm2708, bcm2710 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
68 lines
2.2 KiB
Diff
68 lines
2.2 KiB
Diff
From b6be512663a34f85e79bd6dd6caeece57d9f6fe0 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Wed, 21 Mar 2018 15:59:26 +0000
|
|
Subject: [PATCH 257/454] lan78xx: Read LED states from Device Tree
|
|
|
|
Add support for DT property "microchip,led-modes", a vector of two
|
|
cells (u32s) in the range 0-15, each of which sets the mode for one
|
|
of the two LEDs. The possible values are:
|
|
|
|
0=link/activity 1=link1000/activity
|
|
2=link100/activity 3=link10/activity
|
|
4=link100/1000/activity 5=link10/1000/activity
|
|
6=link10/100/activity 14=off 15=on
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
drivers/net/usb/lan78xx.c | 27 +++++++++++++++++++--------
|
|
1 file changed, 19 insertions(+), 8 deletions(-)
|
|
|
|
--- a/drivers/net/usb/lan78xx.c
|
|
+++ b/drivers/net/usb/lan78xx.c
|
|
@@ -1998,7 +1998,9 @@ static int lan78xx_phy_init(struct lan78
|
|
{
|
|
int ret;
|
|
u32 mii_adv;
|
|
- u32 led_modes;
|
|
+ u32 led_modes[2];
|
|
+ u32 led_modes_reg;
|
|
+ int i;
|
|
struct phy_device *phydev = dev->net->phydev;
|
|
|
|
phydev = phy_find_first(dev->mdiobus);
|
|
@@ -2071,18 +2073,27 @@ static int lan78xx_phy_init(struct lan78
|
|
mii_adv = (u32)mii_advertise_flowctrl(dev->fc_request_control);
|
|
phydev->advertising |= mii_adv_to_ethtool_adv_t(mii_adv);
|
|
|
|
- /* Change LED defaults:
|
|
- * orange = link1000/activity
|
|
- * green = link10/link100/activity
|
|
+ /* Set LED modes:
|
|
* led: 0=link/activity 1=link1000/activity
|
|
* 2=link100/activity 3=link10/activity
|
|
* 4=link100/1000/activity 5=link10/1000/activity
|
|
* 6=link10/100/activity 14=off 15=on
|
|
*/
|
|
- led_modes = phy_read(phydev, 0x1d);
|
|
- led_modes &= ~0xff;
|
|
- led_modes |= (1 << 0) | (6 << 4);
|
|
- (void)phy_write(phydev, 0x1d, led_modes);
|
|
+
|
|
+ memset(led_modes, ~0, sizeof(led_modes));
|
|
+
|
|
+ of_property_read_u32_array(dev->udev->dev.of_node,
|
|
+ "microchip,led-modes",
|
|
+ led_modes, ARRAY_SIZE(led_modes));
|
|
+
|
|
+ led_modes_reg = phy_read(phydev, 0x1d);
|
|
+ for (i = 0; i < ARRAY_SIZE(led_modes); i++) {
|
|
+ if (led_modes[i] != ~0) {
|
|
+ led_modes_reg &= ~(0xf << (i * 4));
|
|
+ led_modes_reg |= (led_modes[i] & 0xf) << (i * 4);
|
|
+ }
|
|
+ }
|
|
+ (void)phy_write(phydev, 0x1d, led_modes_reg);
|
|
|
|
genphy_config_aneg(phydev);
|
|
|