From 5b089e45a649b936d5ce71930adef4fdea8a7875 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Fri, 13 Jan 2017 22:35:45 +0100 Subject: kernel: update 4.4 kernel to 4.4.42 Refresh patches on all 4.4 supported platforms. Compile & run tested: lantiq/xrx200 Signed-off-by: Hauke Mehrtens --- .../0019-xhci-mediatek-support-MTK-xHCI-host-controller.patch | 8 ++++---- .../0051-net-next-mediatek-add-an-entry-to-MAINTAINERS.patch | 2 +- .../patches-4.4/0099-MAINTAINERS-change-my-email-address.patch | 2 +- ...100-MAINTAINERS-add-Sean-as-mediatek-ethernet-maintainer.patch | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'target/linux/mediatek/patches-4.4') diff --git a/target/linux/mediatek/patches-4.4/0019-xhci-mediatek-support-MTK-xHCI-host-controller.patch b/target/linux/mediatek/patches-4.4/0019-xhci-mediatek-support-MTK-xHCI-host-controller.patch index 055ea03835..8704a79c0b 100644 --- a/target/linux/mediatek/patches-4.4/0019-xhci-mediatek-support-MTK-xHCI-host-controller.patch +++ b/target/linux/mediatek/patches-4.4/0019-xhci-mediatek-support-MTK-xHCI-host-controller.patch @@ -1428,7 +1428,7 @@ Reviewed-by: Daniel Thompson /* * Returns zero if the TRB isn't in this segment, otherwise it returns the DMA -@@ -3088,17 +3089,22 @@ static u32 xhci_td_remainder(struct xhci +@@ -3121,17 +3122,22 @@ static u32 xhci_td_remainder(struct xhci { u32 maxp, total_packet_count; @@ -1455,7 +1455,7 @@ Reviewed-by: Daniel Thompson /* Queueing functions don't count the current TRB into transferred */ return (total_packet_count - ((transferred + trb_buff_len) / maxp)); } -@@ -3486,7 +3492,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd * +@@ -3519,7 +3525,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd * field |= 0x1; /* xHCI 1.0/1.1 6.4.1.2.1: Transfer Type field */ @@ -1515,11 +1515,11 @@ Reviewed-by: Daniel Thompson --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1631,6 +1631,7 @@ struct xhci_hcd { +@@ -1634,6 +1634,7 @@ struct xhci_hcd { /* For controllers with a broken beyond repair streams implementation */ #define XHCI_BROKEN_STREAMS (1 << 19) #define XHCI_PME_STUCK_QUIRK (1 << 20) +#define XHCI_MTK_HOST (1 << 21) + #define XHCI_MISSING_CAS (1 << 24) unsigned int num_active_eps; unsigned int limit_active_eps; - /* There are two roothubs to keep track of bus suspend info for */ diff --git a/target/linux/mediatek/patches-4.4/0051-net-next-mediatek-add-an-entry-to-MAINTAINERS.patch b/target/linux/mediatek/patches-4.4/0051-net-next-mediatek-add-an-entry-to-MAINTAINERS.patch index 0fc9b373e5..10690b25ef 100644 --- a/target/linux/mediatek/patches-4.4/0051-net-next-mediatek-add-an-entry-to-MAINTAINERS.patch +++ b/target/linux/mediatek/patches-4.4/0051-net-next-mediatek-add-an-entry-to-MAINTAINERS.patch @@ -13,7 +13,7 @@ Signed-off-by: John Crispin --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -6907,6 +6907,13 @@ F: include/uapi/linux/meye.h +@@ -6902,6 +6902,13 @@ F: include/uapi/linux/meye.h F: include/uapi/linux/ivtv* F: include/uapi/linux/uvcvideo.h diff --git a/target/linux/mediatek/patches-4.4/0099-MAINTAINERS-change-my-email-address.patch b/target/linux/mediatek/patches-4.4/0099-MAINTAINERS-change-my-email-address.patch index f0cf4ea7d2..1bad613a80 100644 --- a/target/linux/mediatek/patches-4.4/0099-MAINTAINERS-change-my-email-address.patch +++ b/target/linux/mediatek/patches-4.4/0099-MAINTAINERS-change-my-email-address.patch @@ -12,7 +12,7 @@ Signed-off-by: John Crispin --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -6909,7 +6909,7 @@ F: include/uapi/linux/uvcvideo.h +@@ -6904,7 +6904,7 @@ F: include/uapi/linux/uvcvideo.h MEDIATEK ETHERNET DRIVER M: Felix Fietkau diff --git a/target/linux/mediatek/patches-4.4/0100-MAINTAINERS-add-Sean-as-mediatek-ethernet-maintainer.patch b/target/linux/mediatek/patches-4.4/0100-MAINTAINERS-add-Sean-as-mediatek-ethernet-maintainer.patch index b3ebaf13e2..145868c1f0 100644 --- a/target/linux/mediatek/patches-4.4/0100-MAINTAINERS-add-Sean-as-mediatek-ethernet-maintainer.patch +++ b/target/linux/mediatek/patches-4.4/0100-MAINTAINERS-add-Sean-as-mediatek-ethernet-maintainer.patch @@ -15,7 +15,7 @@ Signed-off-by: John Crispin --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -6910,6 +6910,7 @@ F: include/uapi/linux/uvcvideo.h +@@ -6905,6 +6905,7 @@ F: include/uapi/linux/uvcvideo.h MEDIATEK ETHERNET DRIVER M: Felix Fietkau M: John Crispin -- cgit v1.2.3