From 9a1d7ff187300767f77401302b43733ee01080b4 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Wed, 13 Feb 2019 11:38:08 +0100 Subject: kernel: bump 4.14 to 4.14.99 Refreshed all patches. Remove upstreamed: - 950-0434-mmc-bcm2835-Recover-from-MMC_SEND_EXT_CSD.patch Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte --- target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch | 4 ++-- .../patches-4.14/0107-usb-mtu3-support-36-bit-DMA-address.patch | 6 +++--- .../patches-4.14/0109-usb-mtu3-add-support-for-usb3.1-IP.patch | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'target/linux/mediatek') diff --git a/target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch b/target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch index 926e0d8421..0442506977 100644 --- a/target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch +++ b/target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch @@ -249,7 +249,7 @@ --- a/net/dsa/slave.c +++ b/net/dsa/slave.c -@@ -1263,7 +1263,7 @@ int dsa_slave_create(struct dsa_port *po +@@ -1267,7 +1267,7 @@ int dsa_slave_create(struct dsa_port *po int ret; cpu_dp = ds->dst->cpu_dp; @@ -258,7 +258,7 @@ if (!ds->num_tx_queues) ds->num_tx_queues = 1; -@@ -1301,6 +1301,7 @@ int dsa_slave_create(struct dsa_port *po +@@ -1305,6 +1305,7 @@ int dsa_slave_create(struct dsa_port *po p->dp = port; INIT_LIST_HEAD(&p->mall_tc_list); p->xmit = dst->tag_ops->xmit; diff --git a/target/linux/mediatek/patches-4.14/0107-usb-mtu3-support-36-bit-DMA-address.patch b/target/linux/mediatek/patches-4.14/0107-usb-mtu3-support-36-bit-DMA-address.patch index d2633c1ca8..88f52e6f20 100644 --- a/target/linux/mediatek/patches-4.14/0107-usb-mtu3-support-36-bit-DMA-address.patch +++ b/target/linux/mediatek/patches-4.14/0107-usb-mtu3-support-36-bit-DMA-address.patch @@ -74,7 +74,7 @@ Signed-off-by: Felipe Balbi #include #include #include -@@ -759,7 +760,31 @@ static void mtu3_hw_exit(struct mtu3 *mt +@@ -761,7 +762,31 @@ static void mtu3_hw_exit(struct mtu3 *mt mtu3_mem_free(mtu); } @@ -107,7 +107,7 @@ Signed-off-by: Felipe Balbi int ssusb_gadget_init(struct ssusb_mtk *ssusb) { -@@ -820,6 +845,12 @@ int ssusb_gadget_init(struct ssusb_mtk * +@@ -822,6 +847,12 @@ int ssusb_gadget_init(struct ssusb_mtk * return ret; } @@ -120,7 +120,7 @@ Signed-off-by: Felipe Balbi ret = devm_request_irq(dev, mtu->irq, mtu3_irq, 0, dev_name(dev), mtu); if (ret) { dev_err(dev, "request irq %d failed!\n", mtu->irq); -@@ -845,6 +876,7 @@ int ssusb_gadget_init(struct ssusb_mtk * +@@ -847,6 +878,7 @@ int ssusb_gadget_init(struct ssusb_mtk * gadget_err: device_init_wakeup(dev, false); diff --git a/target/linux/mediatek/patches-4.14/0109-usb-mtu3-add-support-for-usb3.1-IP.patch b/target/linux/mediatek/patches-4.14/0109-usb-mtu3-add-support-for-usb3.1-IP.patch index c17a77be5c..f44ce4e155 100644 --- a/target/linux/mediatek/patches-4.14/0109-usb-mtu3-add-support-for-usb3.1-IP.patch +++ b/target/linux/mediatek/patches-4.14/0109-usb-mtu3-add-support-for-usb3.1-IP.patch @@ -46,7 +46,7 @@ Signed-off-by: Felipe Balbi } dev_info(mtu->dev, "max_speed: %s\n", -@@ -624,6 +627,10 @@ static irqreturn_t mtu3_link_isr(struct +@@ -626,6 +629,10 @@ static irqreturn_t mtu3_link_isr(struct udev_speed = USB_SPEED_SUPER; maxpkt = 512; break; @@ -57,7 +57,7 @@ Signed-off-by: Felipe Balbi default: udev_speed = USB_SPEED_UNKNOWN; break; -@@ -825,14 +832,15 @@ int ssusb_gadget_init(struct ssusb_mtk * +@@ -827,14 +834,15 @@ int ssusb_gadget_init(struct ssusb_mtk * case USB_SPEED_FULL: case USB_SPEED_HIGH: case USB_SPEED_SUPER: -- cgit v1.2.3