aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek/patches-4.14/0063-atomic-sleep.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-06-25 12:53:55 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-06-25 16:50:37 +0200
commit5e771160b81bfec760a5f7f114cc5dc41ff595e6 (patch)
treeccb8a2776710be975b27bdc3f67d5563846648bb /target/linux/mediatek/patches-4.14/0063-atomic-sleep.patch
parent9c6fb1d67a450178da49771184dfcb85f719c594 (diff)
downloadupstream-5e771160b81bfec760a5f7f114cc5dc41ff595e6.tar.gz
upstream-5e771160b81bfec760a5f7f114cc5dc41ff595e6.tar.bz2
upstream-5e771160b81bfec760a5f7f114cc5dc41ff595e6.zip
kernel: bump 4.14 to 4.14.130
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mediatek/patches-4.14/0063-atomic-sleep.patch')
-rw-r--r--target/linux/mediatek/patches-4.14/0063-atomic-sleep.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mediatek/patches-4.14/0063-atomic-sleep.patch b/target/linux/mediatek/patches-4.14/0063-atomic-sleep.patch
index 0dde3fdb64..3263e656ae 100644
--- a/target/linux/mediatek/patches-4.14/0063-atomic-sleep.patch
+++ b/target/linux/mediatek/patches-4.14/0063-atomic-sleep.patch
@@ -20,7 +20,7 @@
continue;
}
break;
-@@ -1868,7 +1872,10 @@ static void mtk_stop_dma(struct mtk_eth
+@@ -1869,7 +1873,10 @@ static void mtk_stop_dma(struct mtk_eth
for (i = 0; i < 10; i++) {
val = mtk_r32(eth, glo_cfg);
if (val & (MTK_TX_DMA_BUSY | MTK_RX_DMA_BUSY)) {
@@ -32,7 +32,7 @@
continue;
}
break;
-@@ -1906,7 +1913,10 @@ static void ethsys_reset(struct mtk_eth
+@@ -1907,7 +1914,10 @@ static void ethsys_reset(struct mtk_eth
reset_bits,
reset_bits);