From 548182bc6d38a3817c8e9f5b11207043a31c59b9 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 20 Aug 2018 10:43:09 +0200 Subject: kernel: bump 3.18 to 3.18.119 Refreshed all patches. Compile-tested on: adm5120, adm8668, au1000, mcs814x, ppc40x, ppc44x, xburst Runtime-tested on: none Signed-off-by: Koen Vandeputte --- target/linux/mcs814x/patches-3.18/004-usb.patch | 2 +- .../012-mtd-cfi_cmdset_0002-force-word-write.patch | 4 ++-- target/linux/mcs814x/patches-3.18/013-ohci_workarounds.patch | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'target/linux/mcs814x/patches-3.18') diff --git a/target/linux/mcs814x/patches-3.18/004-usb.patch b/target/linux/mcs814x/patches-3.18/004-usb.patch index d69ec211a5..410c53085d 100644 --- a/target/linux/mcs814x/patches-3.18/004-usb.patch +++ b/target/linux/mcs814x/patches-3.18/004-usb.patch @@ -14,7 +14,7 @@ int retval = 0; --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c -@@ -1259,6 +1259,11 @@ MODULE_LICENSE ("GPL"); +@@ -1260,6 +1260,11 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ohci_hcd_tilegx_driver #endif diff --git a/target/linux/mcs814x/patches-3.18/012-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/mcs814x/patches-3.18/012-mtd-cfi_cmdset_0002-force-word-write.patch index 10593ce70d..6269e40a09 100644 --- a/target/linux/mcs814x/patches-3.18/012-mtd-cfi_cmdset_0002-force-word-write.patch +++ b/target/linux/mcs814x/patches-3.18/012-mtd-cfi_cmdset_0002-force-word-write.patch @@ -7,8 +7,8 @@ -#define FORCE_WORD_WRITE 0 +#define FORCE_WORD_WRITE 1 --#define MAX_WORD_RETRIES 3 -+#define MAX_WORD_RETRIES 10 +-#define MAX_RETRIES 3 ++#define MAX_RETRIES 10 #define SST49LF004B 0x0060 #define SST49LF040B 0x0050 diff --git a/target/linux/mcs814x/patches-3.18/013-ohci_workarounds.patch b/target/linux/mcs814x/patches-3.18/013-ohci_workarounds.patch index 8697f03386..9d4982b0fb 100644 --- a/target/linux/mcs814x/patches-3.18/013-ohci_workarounds.patch +++ b/target/linux/mcs814x/patches-3.18/013-ohci_workarounds.patch @@ -18,8 +18,8 @@ + u32 hcca_area; /* Accept arbitrarily long scatter-gather lists */ - hcd->self.sg_tablesize = ~0; -@@ -501,11 +502,13 @@ static int ohci_init (struct ohci_hcd *o + if (!(hcd->driver->flags & HCD_LOCAL_MEM)) +@@ -502,11 +503,13 @@ static int ohci_init (struct ohci_hcd *o (unsigned long) ohci); set_timer_slack(&ohci->io_watchdog, msecs_to_jiffies(20)); @@ -35,7 +35,7 @@ if ((ret = ohci_mem_init (ohci)) < 0) ohci_stop (hcd); else { -@@ -523,6 +526,7 @@ static int ohci_init (struct ohci_hcd *o +@@ -524,6 +527,7 @@ static int ohci_init (struct ohci_hcd *o */ static int ohci_run (struct ohci_hcd *ohci) { @@ -43,7 +43,7 @@ u32 mask, val; int first = ohci->fminterval == 0; struct usb_hcd *hcd = ohci_to_hcd(ohci); -@@ -573,6 +577,8 @@ static int ohci_run (struct ohci_hcd *oh +@@ -574,6 +578,8 @@ static int ohci_run (struct ohci_hcd *oh msleep(val); memset (ohci->hcca, 0, sizeof (struct ohci_hcca)); @@ -52,7 +52,7 @@ /* 2msec timelimit here means no irqs/preempt */ spin_lock_irq (&ohci->lock); -@@ -984,9 +990,6 @@ static void ohci_stop (struct usb_hcd *h +@@ -985,9 +991,6 @@ static void ohci_stop (struct usb_hcd *h remove_debug_files (ohci); ohci_mem_cleanup (ohci); if (ohci->hcca) { -- cgit v1.2.3