aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2020-01-24 11:20:03 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-01-24 13:14:33 +0100
commit40842167d2fffc053698e17f5dbadbc7b78644cf (patch)
tree8b12d311dd5de7db41e6462aa400e2bf14171136 /target/linux/ath79
parent76254cb75e4abc2a87e13134915cd0c422926fde (diff)
downloadupstream-40842167d2fffc053698e17f5dbadbc7b78644cf.tar.gz
upstream-40842167d2fffc053698e17f5dbadbc7b78644cf.tar.bz2
upstream-40842167d2fffc053698e17f5dbadbc7b78644cf.zip
kernel: bump 4.19 to 4.19.98
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ath79')
-rw-r--r--target/linux/ath79/patches-4.19/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch5
-rw-r--r--target/linux/ath79/patches-4.19/0038-at803x-disable-delays.patch2
-rw-r--r--target/linux/ath79/patches-4.19/425-at803x-allow-sgmii-aneg-override.patch2
-rw-r--r--target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch2
4 files changed, 5 insertions, 6 deletions
diff --git a/target/linux/ath79/patches-4.19/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch b/target/linux/ath79/patches-4.19/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch
index 111c1553d3..dc0af2fe9c 100644
--- a/target/linux/ath79/patches-4.19/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch
+++ b/target/linux/ath79/patches-4.19/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch
@@ -16,7 +16,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
-@@ -1245,7 +1245,12 @@
+@@ -1249,7 +1249,12 @@
*/
#define QCA955X_GMAC_REG_ETH_CFG 0x00
@@ -29,7 +29,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
#define QCA955X_ETH_CFG_RGMII_EN BIT(0)
#define QCA955X_ETH_CFG_MII_GE0 BIT(1)
-@@ -1267,9 +1272,58 @@
+@@ -1271,9 +1276,58 @@
#define QCA955X_ETH_CFG_TXE_DELAY_MASK 0x3
#define QCA955X_ETH_CFG_TXE_DELAY_SHIFT 20
@@ -88,4 +88,3 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
/*
* QCA956X GMAC Interface
*/
-
diff --git a/target/linux/ath79/patches-4.19/0038-at803x-disable-delays.patch b/target/linux/ath79/patches-4.19/0038-at803x-disable-delays.patch
index 56325a831e..c7a9b3cc78 100644
--- a/target/linux/ath79/patches-4.19/0038-at803x-disable-delays.patch
+++ b/target/linux/ath79/patches-4.19/0038-at803x-disable-delays.patch
@@ -10,7 +10,7 @@ with kernel 5.1 and higher. It can be safely dropped with kernel 5.1.
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
-@@ -295,6 +295,14 @@ static int at803x_config_init(struct phy
+@@ -279,6 +279,14 @@ static int at803x_config_init(struct phy
if (ret < 0)
return ret;
diff --git a/target/linux/ath79/patches-4.19/425-at803x-allow-sgmii-aneg-override.patch b/target/linux/ath79/patches-4.19/425-at803x-allow-sgmii-aneg-override.patch
index b0a1942b7a..43c11386c7 100644
--- a/target/linux/ath79/patches-4.19/425-at803x-allow-sgmii-aneg-override.patch
+++ b/target/linux/ath79/patches-4.19/425-at803x-allow-sgmii-aneg-override.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
-@@ -484,6 +484,13 @@ static int at803x_aneg_done(struct phy_d
+@@ -391,6 +391,13 @@ static int at803x_aneg_done(struct phy_d
if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) {
pr_warn("803x_aneg_done: SGMII link is not ok\n");
aneg_done = 0;
diff --git a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch
index 201ad740f1..6f36dc683c 100644
--- a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch
@@ -728,7 +728,7 @@
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
-@@ -3894,14 +3894,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -3895,14 +3895,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);