aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/rb532/patches-4.14
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-12-06 11:06:03 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-12-10 11:48:44 +0100
commit0028f86687dc355b67263344e9368e8a826f5096 (patch)
tree91d130e9c64626b302a11d183ac00e2eb6d7a984 /target/linux/rb532/patches-4.14
parentdfbf836a52e451f98e90dcf567c107062e2d7048 (diff)
downloadupstream-0028f86687dc355b67263344e9368e8a826f5096.tar.gz
upstream-0028f86687dc355b67263344e9368e8a826f5096.tar.bz2
upstream-0028f86687dc355b67263344e9368e8a826f5096.zip
kernel: bump 4.14 to 4.14.86
Refreshed all patches. Altered patches: - 180-usb-xhci-add-support-for-performing-fake-doorbell.patch Compile-tested on: ar71xx, cns3xxx, imx6 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/rb532/patches-4.14')
-rw-r--r--target/linux/rb532/patches-4.14/106-dont-use-rx-overflow-and-tx-underflow-interrupts.patch14
-rw-r--r--target/linux/rb532/patches-4.14/109-korina-whitespace-cleanup-2.patch6
2 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/rb532/patches-4.14/106-dont-use-rx-overflow-and-tx-underflow-interrupts.patch b/target/linux/rb532/patches-4.14/106-dont-use-rx-overflow-and-tx-underflow-interrupts.patch
index e75079b12f..2bc2c1067e 100644
--- a/target/linux/rb532/patches-4.14/106-dont-use-rx-overflow-and-tx-underflow-interrupts.patch
+++ b/target/linux/rb532/patches-4.14/106-dont-use-rx-overflow-and-tx-underflow-interrupts.patch
@@ -9,7 +9,7 @@
spinlock_t lock; /* NIC xmit lock */
-@@ -890,8 +888,6 @@ static void korina_restart_task(struct w
+@@ -891,8 +889,6 @@ static void korina_restart_task(struct w
*/
disable_irq(lp->rx_irq);
disable_irq(lp->tx_irq);
@@ -18,7 +18,7 @@
writel(readl(&lp->tx_dma_regs->dmasm) |
DMA_STAT_FINI | DMA_STAT_ERR,
-@@ -910,40 +906,10 @@ static void korina_restart_task(struct w
+@@ -911,40 +907,10 @@ static void korina_restart_task(struct w
}
korina_multicast_list(dev);
@@ -59,7 +59,7 @@
static void korina_tx_timeout(struct net_device *dev)
{
struct korina_private *lp = netdev_priv(dev);
-@@ -951,25 +917,6 @@ static void korina_tx_timeout(struct net
+@@ -952,25 +918,6 @@ static void korina_tx_timeout(struct net
schedule_work(&lp->restart_task);
}
@@ -85,7 +85,7 @@
#ifdef CONFIG_NET_POLL_CONTROLLER
static void korina_poll_controller(struct net_device *dev)
{
-@@ -992,8 +939,7 @@ static int korina_open(struct net_device
+@@ -993,8 +940,7 @@ static int korina_open(struct net_device
}
/* Install the interrupt handler
@@ -95,7 +95,7 @@
ret = request_irq(lp->rx_irq, korina_rx_dma_interrupt,
0, "Korina ethernet Rx", dev);
if (ret < 0) {
-@@ -1009,31 +955,10 @@ static int korina_open(struct net_device
+@@ -1010,31 +956,10 @@ static int korina_open(struct net_device
goto err_free_rx_irq;
}
@@ -127,7 +127,7 @@
err_free_rx_irq:
free_irq(lp->rx_irq, dev);
err_release:
-@@ -1051,8 +976,6 @@ static int korina_close(struct net_devic
+@@ -1052,8 +977,6 @@ static int korina_close(struct net_devic
/* Disable interrupts */
disable_irq(lp->rx_irq);
disable_irq(lp->tx_irq);
@@ -136,7 +136,7 @@
korina_abort_tx(dev);
tmp = readl(&lp->tx_dma_regs->dmasm);
-@@ -1072,8 +995,6 @@ static int korina_close(struct net_devic
+@@ -1073,8 +996,6 @@ static int korina_close(struct net_devic
free_irq(lp->rx_irq, dev);
free_irq(lp->tx_irq, dev);
diff --git a/target/linux/rb532/patches-4.14/109-korina-whitespace-cleanup-2.patch b/target/linux/rb532/patches-4.14/109-korina-whitespace-cleanup-2.patch
index 4a2cb8997d..ad24a9e846 100644
--- a/target/linux/rb532/patches-4.14/109-korina-whitespace-cleanup-2.patch
+++ b/target/linux/rb532/patches-4.14/109-korina-whitespace-cleanup-2.patch
@@ -92,7 +92,7 @@
{
struct korina_private *lp = netdev_priv(dev);
-@@ -727,10 +731,10 @@ static u32 netdev_get_link(struct net_de
+@@ -728,10 +732,10 @@ static u32 netdev_get_link(struct net_de
}
static const struct ethtool_ops netdev_ethtool_ops = {
@@ -107,7 +107,7 @@
};
static int korina_alloc_ring(struct net_device *dev)
-@@ -862,7 +866,7 @@ static int korina_init(struct net_device
+@@ -863,7 +867,7 @@ static int korina_init(struct net_device
/* Management Clock Prescaler Divisor
* Clock independent setting */
writel(((idt_cpu_freq) / MII_CLOCK + 1) & ~1,
@@ -116,7 +116,7 @@
/* don't transmit until fifo contains 48b */
writel(48, &lp->eth_regs->ethfifott);
-@@ -945,14 +949,14 @@ static int korina_open(struct net_device
+@@ -946,14 +950,14 @@ static int korina_open(struct net_device
0, "Korina ethernet Rx", dev);
if (ret < 0) {
printk(KERN_ERR "%s: unable to get Rx DMA IRQ %d\n",