aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-5.4/991-at803x.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2020-11-19 10:30:16 -0500
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-11-24 15:36:59 +0100
commit9100566267755ea642f08c203d03a9b8f13478c9 (patch)
tree5fe1256ef33e05a3f8195854be4449fd45f26a04 /target/linux/ramips/patches-5.4/991-at803x.patch
parentcba79b1de2d2155ae5be8c565ef83829b02598e6 (diff)
downloadupstream-9100566267755ea642f08c203d03a9b8f13478c9.tar.gz
upstream-9100566267755ea642f08c203d03a9b8f13478c9.tar.bz2
upstream-9100566267755ea642f08c203d03a9b8f13478c9.zip
kernel: bump 5.4 to 5.4.79
Manually rebased patches: ath79/patches-5.4/910-unaligned_access_hacks.patch bcm27xx/patches-5.4/950-0135-spi-spi-bcm2835-Disable-forced-software-CS.patch bcm27xx/patches-5.4/950-0414-SQUASH-Fix-spi-driver-compiler-warnings.patch ipq806x/patches-5.4/093-4-v5.8-ipq806x-PCI-qcom-Use-bulk-clk-api-and-assert-on-error.patch Removed since could be reverse-applied by quilt and found to be included upstream: ipq806x/patches-5.4/096-PCI-qcom-Make-sure-PCIe-is-reset-before-init-for-rev.patch All modifications made by update_kernel.sh Build system: x86_64 Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [refresh altered targets after rebase] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/ramips/patches-5.4/991-at803x.patch')
-rw-r--r--target/linux/ramips/patches-5.4/991-at803x.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/target/linux/ramips/patches-5.4/991-at803x.patch b/target/linux/ramips/patches-5.4/991-at803x.patch
index 64bc48fe7a..af0132f8f7 100644
--- a/target/linux/ramips/patches-5.4/991-at803x.patch
+++ b/target/linux/ramips/patches-5.4/991-at803x.patch
@@ -12,8 +12,6 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
drivers/net/phy/at803x.c | 91 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 91 insertions(+)
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
-index 31cd7d8a5a1b5..134c894ccf800 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -14,6 +14,8 @@
@@ -44,7 +42,7 @@ index 31cd7d8a5a1b5..134c894ccf800 100644
#define AT803X_DEBUG_REG_0 0x00
#define AT803X_DEBUG_RX_CLK_DLY_EN BIT(15)
-@@ -243,10 +254,72 @@ static int at803x_resume(struct phy_device *phydev)
+@@ -243,10 +254,72 @@ static int at803x_resume(struct phy_devi
return phy_modify(phydev, MII_BMCR, BMCR_PDOWN | BMCR_ISOLATE, 0);
}
@@ -117,7 +115,7 @@ index 31cd7d8a5a1b5..134c894ccf800 100644
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
-@@ -394,6 +467,10 @@ static int at803x_read_status(struct phy_device *phydev)
+@@ -394,6 +467,10 @@ static int at803x_read_status(struct phy
{
int ss, err, old_link = phydev->link;
@@ -128,7 +126,7 @@ index 31cd7d8a5a1b5..134c894ccf800 100644
/* Update the link, but return if there was an error */
err = genphy_update_link(phydev);
if (err)
-@@ -448,6 +525,19 @@ static int at803x_read_status(struct phy_device *phydev)
+@@ -448,6 +525,19 @@ static int at803x_read_status(struct phy
return 0;
}
@@ -148,7 +146,7 @@ index 31cd7d8a5a1b5..134c894ccf800 100644
static struct phy_driver at803x_driver[] = {
{
/* ATHEROS 8035 */
-@@ -491,6 +581,7 @@ static struct phy_driver at803x_driver[] = {
+@@ -491,6 +581,7 @@ static struct phy_driver at803x_driver[]
.suspend = at803x_suspend,
.resume = at803x_resume,
/* PHY_GBIT_FEATURES */