diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-05-09 18:18:20 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-05-18 00:10:34 +0200 |
| commit | e0bdf839722659ded1ce2f827f04ec4d9be3c6fc (patch) | |
| tree | da9d261db6cbc5d4a5fac5d93da6978880807b2c /target/linux/bcm27xx/patches-5.4/950-0339-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch | |
| parent | b4ea8e1089b6db4367d9bd40654d7b16590ae19f (diff) | |
| download | upstream-e0bdf839722659ded1ce2f827f04ec4d9be3c6fc.tar.gz upstream-e0bdf839722659ded1ce2f827f04ec4d9be3c6fc.tar.bz2 upstream-e0bdf839722659ded1ce2f827f04ec4d9be3c6fc.zip | |
kernel: bump 5.4 to 5.4.191
Merged upstream:
apm821xx/patches-5.4/150-ata-sata_dwc_460ex-Fix-crash-due-to-OOB-write.patch
Similar patch merged upstream:
bcm27xx/patches-5.4/950-0210-usb-xhci-Disable-the-XHCI-5-second-timeout.patch
Manually adapted:
layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch
Compile-tested: armvirt/64
Run-tested: armvirt/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0339-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0339-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0339-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch b/target/linux/bcm27xx/patches-5.4/950-0339-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch index b3e237fdf5..e323d9ff4c 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0339-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0339-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch @@ -87,7 +87,7 @@ Signed-off-by: James Hughes <james.hughes@raspberrypi.org> (default "off") --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c -@@ -267,6 +267,9 @@ static void bcm54xx_adjust_rxrefclk(stru +@@ -268,6 +268,9 @@ static void bcm54xx_adjust_rxrefclk(stru static int bcm54xx_config_init(struct phy_device *phydev) { int reg, err, val; @@ -97,7 +97,7 @@ Signed-off-by: James Hughes <james.hughes@raspberrypi.org> reg = phy_read(phydev, MII_BCM54XX_ECR); if (reg < 0) -@@ -318,6 +321,8 @@ static int bcm54xx_config_init(struct ph +@@ -319,6 +322,8 @@ static int bcm54xx_config_init(struct ph bcm54xx_phydsp_config(phydev); @@ -106,7 +106,7 @@ Signed-off-by: James Hughes <james.hughes@raspberrypi.org> /* Encode link speed into LED1 and LED3 pair (green/amber). * Also flash these two LEDs on activity. This means configuring * them for MULTICOLOR and encoding link/activity into them. -@@ -327,8 +332,8 @@ static int bcm54xx_config_init(struct ph +@@ -328,8 +333,8 @@ static int bcm54xx_config_init(struct ph bcm_phy_write_shadow(phydev, BCM5482_SHD_LEDS1, val); val = BCM_LED_MULTICOLOR_IN_PHASE | |