aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-28 16:10:40 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-28 23:05:39 +0200
commit01793e8752aa8211d6d74c92722787c403e5420d (patch)
tree41673c27be0d69da5acd411740590e99a5cff195 /target/linux/ath79
parent22f899c6dd62c946db419a5195fd99c7a079bd9c (diff)
downloadupstream-01793e8752aa8211d6d74c92722787c403e5420d.tar.gz
upstream-01793e8752aa8211d6d74c92722787c403e5420d.tar.bz2
upstream-01793e8752aa8211d6d74c92722787c403e5420d.zip
kernel: bump 4.14 to 4.14.67
Refreshed all patches. Removed upstreamed patches: - 037-v4.18-0008-ARM-dts-BCM5301x-Fix-i2c-controller-interrupt-type.patch Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ath79')
-rw-r--r--target/linux/ath79/patches-4.14/0036-MIPS-ath79-remove-irq-code-from-pci.patch6
-rw-r--r--target/linux/ath79/patches-4.14/0037-missing-registers.patch6
-rw-r--r--target/linux/ath79/patches-4.14/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch4
-rw-r--r--target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch10
4 files changed, 11 insertions, 15 deletions
diff --git a/target/linux/ath79/patches-4.14/0036-MIPS-ath79-remove-irq-code-from-pci.patch b/target/linux/ath79/patches-4.14/0036-MIPS-ath79-remove-irq-code-from-pci.patch
index b0e610a0e2..460c4580ee 100644
--- a/target/linux/ath79/patches-4.14/0036-MIPS-ath79-remove-irq-code-from-pci.patch
+++ b/target/linux/ath79/patches-4.14/0036-MIPS-ath79-remove-irq-code-from-pci.patch
@@ -1,7 +1,5 @@
-Index: linux-4.14.66/arch/mips/pci/pci-ar71xx.c
-===================================================================
---- linux-4.14.66.orig/arch/mips/pci/pci-ar71xx.c
-+++ linux-4.14.66/arch/mips/pci/pci-ar71xx.c
+--- a/arch/mips/pci/pci-ar71xx.c
++++ b/arch/mips/pci/pci-ar71xx.c
@@ -54,11 +54,9 @@
struct ar71xx_pci_controller {
struct device_node *np;
diff --git a/target/linux/ath79/patches-4.14/0037-missing-registers.patch b/target/linux/ath79/patches-4.14/0037-missing-registers.patch
index 673233fe00..9fde3d39df 100644
--- a/target/linux/ath79/patches-4.14/0037-missing-registers.patch
+++ b/target/linux/ath79/patches-4.14/0037-missing-registers.patch
@@ -6,10 +6,8 @@ Date: Fri Aug 10 23:24:47 2018 +0200
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-Index: linux-4.14.65/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
-===================================================================
---- linux-4.14.65.orig/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
-+++ linux-4.14.65/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
++++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
@@ -1229,6 +1229,10 @@
#define AR934X_ETH_CFG_RDV_DELAY BIT(16)
#define AR934X_ETH_CFG_RDV_DELAY_MASK 0x3
diff --git a/target/linux/ath79/patches-4.14/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch b/target/linux/ath79/patches-4.14/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch
index 2621377100..634ce56354 100644
--- a/target/linux/ath79/patches-4.14/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch
+++ b/target/linux/ath79/patches-4.14/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch
@@ -40,7 +40,7 @@
+#endif /* __ASM_MACH_ATH79_MANGLE_PORT_H */
--- a/arch/mips/pci/pci-ar71xx.c
+++ b/arch/mips/pci/pci-ar71xx.c
-@@ -73,6 +73,45 @@ static const u32 ar71xx_pci_read_mask[8]
+@@ -71,6 +71,45 @@ static const u32 ar71xx_pci_read_mask[8]
0, 0xff, 0xffff, 0, 0xffffffff, 0, 0, 0
};
@@ -86,7 +86,7 @@
static inline u32 ar71xx_pci_get_ble(int where, int size, int local)
{
u32 t;
-@@ -385,6 +424,9 @@ static int ar71xx_pci_probe(struct platf
+@@ -279,6 +318,9 @@ static int ar71xx_pci_probe(struct platf
register_pci_controller(&apc->pci_ctrl);
diff --git a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch
index 0954c87894..41e58ce8c6 100644
--- a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch
@@ -610,7 +610,7 @@
#define IP6_MF 0x0001
#define IP6_OFFSET 0xFFF8
-@@ -451,8 +451,8 @@ static inline void __ipv6_addr_set_half(
+@@ -444,8 +444,8 @@ static inline void __ipv6_addr_set_half(
}
#endif
#endif
@@ -621,7 +621,7 @@
}
static inline void ipv6_addr_set(struct in6_addr *addr,
-@@ -511,6 +511,8 @@ static inline bool ipv6_prefix_equal(con
+@@ -504,6 +504,8 @@ static inline bool ipv6_prefix_equal(con
const __be32 *a1 = addr1->s6_addr32;
const __be32 *a2 = addr2->s6_addr32;
unsigned int pdw, pbi;
@@ -630,7 +630,7 @@
/* check complete u32 in prefix */
pdw = prefixlen >> 5;
-@@ -519,7 +521,9 @@ static inline bool ipv6_prefix_equal(con
+@@ -512,7 +514,9 @@ static inline bool ipv6_prefix_equal(con
/* check incomplete u32 in prefix */
pbi = prefixlen & 0x1f;
@@ -641,7 +641,7 @@
return false;
return true;
-@@ -663,13 +667,13 @@ static inline void ipv6_addr_set_v4mappe
+@@ -656,13 +660,13 @@ static inline void ipv6_addr_set_v4mappe
*/
static inline int __ipv6_addr_diff32(const void *token1, const void *token2, int addrlen)
{
@@ -657,7 +657,7 @@
if (xb)
return i * 32 + 31 - __fls(ntohl(xb));
}
-@@ -838,17 +842,18 @@ static inline int ip6_default_np_autolab
+@@ -831,17 +835,18 @@ static inline int ip6_default_np_autolab
static inline void ip6_flow_hdr(struct ipv6hdr *hdr, unsigned int tclass,
__be32 flowlabel)
{