diff options
author | Stijn Segers <francesco.borromini@inventati.org> | 2017-01-21 18:30:10 +0100 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2017-01-27 11:18:27 +0100 |
commit | 20996edd68b8a0b139bdb36b3aafa29c037d4bda (patch) | |
tree | 6e90cf0c514879defeef1a8bb0d21b6ad1c08003 /target/linux/ar71xx/patches-4.4 | |
parent | 71f4d8a0959e0f350dabb640b11bf14d57467042 (diff) | |
download | mtk-20170518-20996edd68b8a0b139bdb36b3aafa29c037d4bda.zip mtk-20170518-20996edd68b8a0b139bdb36b3aafa29c037d4bda.tar.gz mtk-20170518-20996edd68b8a0b139bdb36b3aafa29c037d4bda.tar.bz2 |
Kernel: bump to 4.4.44
Bump kernel to 4.4.44. Compile-tested on ar71xx, ramips/mt7621 and x86/64.
.44 has been run-tested on the 17.01 branch here on ar71xx and mt7621.
Signed-off-by: Stijn Segers <francesco.borromini@inventati.org>
Diffstat (limited to 'target/linux/ar71xx/patches-4.4')
3 files changed, 25 insertions, 37 deletions
diff --git a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch index 21cad91..2c01442 100644 --- a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch @@ -491,7 +491,7 @@ memcpy(p, foc->val, foc->len); --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c -@@ -500,7 +500,7 @@ static struct sk_buff *add_grec(struct s +@@ -505,7 +505,7 @@ static struct sk_buff *add_grec(struct s if (!skb) return NULL; psrc = (__be32 *)skb_put(skb, sizeof(__be32)); @@ -610,7 +610,7 @@ goto next_ht; --- a/net/ipv6/ip6_offload.c +++ b/net/ipv6/ip6_offload.c -@@ -221,7 +221,7 @@ static struct sk_buff **ipv6_gro_receive +@@ -222,7 +222,7 @@ static struct sk_buff **ipv6_gro_receive continue; iph2 = (struct ipv6hdr *)(p->data + off); diff --git a/target/linux/ar71xx/patches-4.4/920-usb-chipidea-AR933x-platform-support.patch b/target/linux/ar71xx/patches-4.4/920-usb-chipidea-AR933x-platform-support.patch index 41eb7f2..71649ca 100644 --- a/target/linux/ar71xx/patches-4.4/920-usb-chipidea-AR933x-platform-support.patch +++ b/target/linux/ar71xx/patches-4.4/920-usb-chipidea-AR933x-platform-support.patch @@ -1,8 +1,6 @@ -Index: linux-4.4.4/arch/mips/include/asm/mach-ath79/ar71xx_regs.h -=================================================================== ---- linux-4.4.4.orig/arch/mips/include/asm/mach-ath79/ar71xx_regs.h 2016-03-31 21:43:10.595132564 +0300 -+++ linux-4.4.4/arch/mips/include/asm/mach-ath79/ar71xx_regs.h 2016-03-31 21:56:21.463152017 +0300 -@@ -641,6 +641,7 @@ +--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h ++++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h +@@ -644,6 +644,7 @@ #define AR933X_BOOTSTRAP_MDIO_GPIO_EN BIT(18) #define AR933X_BOOTSTRAP_EEPBUSY BIT(4) @@ -10,7 +8,7 @@ Index: linux-4.4.4/arch/mips/include/asm/mach-ath79/ar71xx_regs.h #define AR933X_BOOTSTRAP_REF_CLK_40 BIT(0) #define AR934X_BOOTSTRAP_SW_OPTION8 BIT(23) -@@ -670,6 +671,8 @@ +@@ -673,6 +674,8 @@ #define QCA956X_BOOTSTRAP_REF_CLK_40 BIT(2) @@ -19,10 +17,8 @@ Index: linux-4.4.4/arch/mips/include/asm/mach-ath79/ar71xx_regs.h #define AR934X_PCIE_WMAC_INT_WMAC_MISC BIT(0) #define AR934X_PCIE_WMAC_INT_WMAC_TX BIT(1) #define AR934X_PCIE_WMAC_INT_WMAC_RXLP BIT(2) -Index: linux-4.4.4/arch/mips/ath79/dev-usb.c -=================================================================== ---- linux-4.4.4.orig/arch/mips/ath79/dev-usb.c 2016-03-31 21:43:10.407132560 +0300 -+++ linux-4.4.4/arch/mips/ath79/dev-usb.c 2016-03-31 21:43:10.707132567 +0300 +--- a/arch/mips/ath79/dev-usb.c ++++ b/arch/mips/ath79/dev-usb.c @@ -19,6 +19,9 @@ #include <linux/platform_device.h> #include <linux/usb/ehci_pdriver.h> @@ -33,7 +29,7 @@ Index: linux-4.4.4/arch/mips/ath79/dev-usb.c #include <asm/mach-ath79/ath79.h> #include <asm/mach-ath79/ar71xx_regs.h> -@@ -170,6 +173,54 @@ +@@ -170,6 +173,54 @@ static void __init ar913x_usb_setup(void &ath79_ehci_pdata_v2, sizeof(ath79_ehci_pdata_v2)); } @@ -88,7 +84,7 @@ Index: linux-4.4.4/arch/mips/ath79/dev-usb.c static void __init ar933x_usb_setup(void) { ath79_device_reset_set(AR933X_RESET_USBSUS_OVERRIDE); -@@ -185,6 +236,8 @@ +@@ -185,6 +236,8 @@ static void __init ar933x_usb_setup(void AR933X_EHCI_BASE, AR933X_EHCI_SIZE, ATH79_CPU_IRQ(3), &ath79_ehci_pdata_v2, sizeof(ath79_ehci_pdata_v2)); diff --git a/target/linux/ar71xx/patches-4.4/930-chipidea-pullup.patch b/target/linux/ar71xx/patches-4.4/930-chipidea-pullup.patch index 1256823..dfa9f6e 100644 --- a/target/linux/ar71xx/patches-4.4/930-chipidea-pullup.patch +++ b/target/linux/ar71xx/patches-4.4/930-chipidea-pullup.patch @@ -1,8 +1,6 @@ -Index: linux-4.4.4/drivers/usb/chipidea/ci.h -=================================================================== ---- linux-4.4.4.orig/drivers/usb/chipidea/ci.h 2016-03-31 21:39:23.571126980 +0300 -+++ linux-4.4.4/drivers/usb/chipidea/ci.h 2016-03-31 21:39:23.567126980 +0300 -@@ -199,6 +199,7 @@ +--- a/drivers/usb/chipidea/ci.h ++++ b/drivers/usb/chipidea/ci.h +@@ -199,6 +199,7 @@ struct hw_bank { * @in_lpm: if the core in low power mode * @wakeup_int: if wakeup interrupt occur * @rev: The revision number for controller @@ -10,7 +8,7 @@ Index: linux-4.4.4/drivers/usb/chipidea/ci.h */ struct ci_hdrc { struct device *dev; -@@ -248,6 +249,7 @@ +@@ -248,6 +249,7 @@ struct ci_hdrc { bool in_lpm; bool wakeup_int; enum ci_revision rev; @@ -18,11 +16,9 @@ Index: linux-4.4.4/drivers/usb/chipidea/ci.h }; static inline struct ci_role_driver *ci_role(struct ci_hdrc *ci) -Index: linux-4.4.4/drivers/usb/chipidea/core.c -=================================================================== ---- linux-4.4.4.orig/drivers/usb/chipidea/core.c 2016-03-31 21:39:23.571126980 +0300 -+++ linux-4.4.4/drivers/usb/chipidea/core.c 2016-03-31 21:41:33.159130168 +0300 -@@ -883,7 +883,7 @@ +--- a/drivers/usb/chipidea/core.c ++++ b/drivers/usb/chipidea/core.c +@@ -883,7 +883,7 @@ static inline void ci_role_destroy(struc { ci_hdrc_gadget_destroy(ci); ci_hdrc_host_destroy(ci); @@ -31,7 +27,7 @@ Index: linux-4.4.4/drivers/usb/chipidea/core.c ci_hdrc_otg_destroy(ci); } -@@ -933,6 +933,9 @@ +@@ -934,6 +934,9 @@ static int ci_hdrc_probe(struct platform ci->supports_runtime_pm = !!(ci->platdata->flags & CI_HDRC_SUPPORTS_RUNTIME_PM); @@ -41,7 +37,7 @@ Index: linux-4.4.4/drivers/usb/chipidea/core.c ret = hw_device_init(ci, base); if (ret < 0) { dev_err(dev, "can't initialize hardware\n"); -@@ -998,7 +1001,7 @@ +@@ -999,7 +1002,7 @@ static int ci_hdrc_probe(struct platform goto deinit_phy; } @@ -50,11 +46,9 @@ Index: linux-4.4.4/drivers/usb/chipidea/core.c ret = ci_hdrc_otg_init(ci); if (ret) { dev_err(dev, "init otg fails, ret = %d\n", ret); -Index: linux-4.4.4/drivers/usb/chipidea/otg.c -=================================================================== ---- linux-4.4.4.orig/drivers/usb/chipidea/otg.c 2016-03-31 21:39:23.571126980 +0300 -+++ linux-4.4.4/drivers/usb/chipidea/otg.c 2016-03-31 21:39:23.567126980 +0300 -@@ -95,8 +95,10 @@ +--- a/drivers/usb/chipidea/otg.c ++++ b/drivers/usb/chipidea/otg.c +@@ -95,8 +95,10 @@ enum ci_role ci_otg_role(struct ci_hdrc void ci_handle_vbus_change(struct ci_hdrc *ci) { @@ -66,11 +60,9 @@ Index: linux-4.4.4/drivers/usb/chipidea/otg.c if (hw_read_otgsc(ci, OTGSC_BSV)) usb_gadget_vbus_connect(&ci->gadget); -Index: linux-4.4.4/include/linux/usb/chipidea.h -=================================================================== ---- linux-4.4.4.orig/include/linux/usb/chipidea.h 2016-03-31 21:39:23.571126980 +0300 -+++ linux-4.4.4/include/linux/usb/chipidea.h 2016-03-31 21:39:23.567126980 +0300 -@@ -55,6 +55,7 @@ +--- a/include/linux/usb/chipidea.h ++++ b/include/linux/usb/chipidea.h +@@ -55,6 +55,7 @@ struct ci_hdrc_platform_data { #define CI_HDRC_OVERRIDE_AHB_BURST BIT(9) #define CI_HDRC_OVERRIDE_TX_BURST BIT(10) #define CI_HDRC_OVERRIDE_RX_BURST BIT(11) |