diff options
| author | Stijn Segers <francesco.borromini@inventati.org> | 2017-05-24 22:39:28 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-05-24 22:47:01 +0200 |
| commit | 215c1d05b8bb7b99cc8c40a877f649c5b1c15198 (patch) | |
| tree | e44256447d81a6ca36a1c616689494b12a83bce4 /target/linux/ipq806x/patches-4.4/096-08-usb-dwc3-remove-num_event_buffers.patch | |
| parent | d1a0fc3ec8e5323e95bec8db581bc7758aed783f (diff) | |
| download | upstream-215c1d05b8bb7b99cc8c40a877f649c5b1c15198.tar.gz upstream-215c1d05b8bb7b99cc8c40a877f649c5b1c15198.tar.bz2 upstream-215c1d05b8bb7b99cc8c40a877f649c5b1c15198.zip | |
kernel: update kernel 4.4 to 4.4.69
Bump the 17.01 tree kernel to 4.4.69. Trunk 4.4 and 17.01 4.4 have diverged, talked this
through with jow, he was okay with a clean diff against 17.01 and not a backported trunk
patch.
The following patches were applied upstream:
* 062-[1-6]-MIPS-* series
* 042-0004-mtd-bcm47xxpart-fix-parsing-first-block
Reintroduced lantiq/patches-4.4/0050-MIPS-Lantiq-Fix-cascaded-IRQ-setup, as
it was incorrectly included upstream thus dropped from LEDE, but subsequently
reverted upstream. Thanks to Kevin Darbyshire-Bryant for pointing me to it.
Compile-tested on: ar71xx, ramips/mt7621, x86/64.
Run-tested on: ar71xx, ramips/mt7621, x86/64.
Signed-off-by: Stijn Segers <francesco.borromini@inventati.org>
Diffstat (limited to 'target/linux/ipq806x/patches-4.4/096-08-usb-dwc3-remove-num_event_buffers.patch')
| -rw-r--r-- | target/linux/ipq806x/patches-4.4/096-08-usb-dwc3-remove-num_event_buffers.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/ipq806x/patches-4.4/096-08-usb-dwc3-remove-num_event_buffers.patch b/target/linux/ipq806x/patches-4.4/096-08-usb-dwc3-remove-num_event_buffers.patch index 5067548019..4fb406442c 100644 --- a/target/linux/ipq806x/patches-4.4/096-08-usb-dwc3-remove-num_event_buffers.patch +++ b/target/linux/ipq806x/patches-4.4/096-08-usb-dwc3-remove-num_event_buffers.patch @@ -161,7 +161,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c -@@ -2556,14 +2556,14 @@ static void dwc3_process_event_entry(str +@@ -2569,14 +2569,14 @@ static void dwc3_process_event_entry(str } } @@ -178,7 +178,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> left = evt->count; if (!(evt->flags & DWC3_EVENT_PENDING)) -@@ -2588,7 +2588,7 @@ static irqreturn_t dwc3_process_event_bu +@@ -2601,7 +2601,7 @@ static irqreturn_t dwc3_process_event_bu evt->lpos = (evt->lpos + 4) % DWC3_EVENT_BUFFERS_SIZE; left -= 4; @@ -187,7 +187,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> } evt->count = 0; -@@ -2596,9 +2596,9 @@ static irqreturn_t dwc3_process_event_bu +@@ -2609,9 +2609,9 @@ static irqreturn_t dwc3_process_event_bu ret = IRQ_HANDLED; /* Unmask interrupt */ @@ -199,7 +199,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> return ret; } -@@ -2608,27 +2608,23 @@ static irqreturn_t dwc3_thread_interrupt +@@ -2621,27 +2621,23 @@ static irqreturn_t dwc3_thread_interrupt struct dwc3 *dwc = _dwc; unsigned long flags; irqreturn_t ret = IRQ_NONE; @@ -231,7 +231,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> count &= DWC3_GEVNTCOUNT_MASK; if (!count) return IRQ_NONE; -@@ -2637,9 +2633,9 @@ static irqreturn_t dwc3_check_event_buf( +@@ -2650,9 +2646,9 @@ static irqreturn_t dwc3_check_event_buf( evt->flags |= DWC3_EVENT_PENDING; /* Mask interrupt */ @@ -243,7 +243,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> return IRQ_WAKE_THREAD; } -@@ -2647,18 +2643,8 @@ static irqreturn_t dwc3_check_event_buf( +@@ -2660,18 +2656,8 @@ static irqreturn_t dwc3_check_event_buf( static irqreturn_t dwc3_interrupt(int irq, void *_dwc) { struct dwc3 *dwc = _dwc; |