kernel: bump 4.14 to 4.14.145

Refreshed all patches.

Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
openwrt-18.06
Koen Vandeputte 2019-09-20 15:09:54 +02:00
parent d32cf52674
commit 7e1db8f27c
10 changed files with 22 additions and 22 deletions

View File

@ -3,10 +3,10 @@
LINUX_RELEASE?=1 LINUX_RELEASE?=1
LINUX_VERSION-4.9 = .193 LINUX_VERSION-4.9 = .193
LINUX_VERSION-4.14 = .144 LINUX_VERSION-4.14 = .145
LINUX_KERNEL_HASH-4.9.193 = 9be5081cc0fa6b720e6b3e5cb90296f3d857469bb3cda09ff93db00f9e16fd01 LINUX_KERNEL_HASH-4.9.193 = 9be5081cc0fa6b720e6b3e5cb90296f3d857469bb3cda09ff93db00f9e16fd01
LINUX_KERNEL_HASH-4.14.144 = cb8b84675ba060b249ffa62de2366d16e842e3edfcb355ebbfb06bf3de03ca54 LINUX_KERNEL_HASH-4.14.145 = eb05b5806713263a6d5bfa1e018ad07c3f4b3c6e71032306a94d7113ed594929
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

View File

@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -1161,6 +1161,10 @@ config SYNC_R4K @@ -1158,6 +1158,10 @@ config SYNC_R4K
config MIPS_MACHINE config MIPS_MACHINE
def_bool n def_bool n

View File

@ -9,7 +9,7 @@ Acked-by: Rob Landley <rob@landley.net>
--- ---
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -1070,9 +1070,6 @@ config FW_ARC @@ -1067,9 +1067,6 @@ config FW_ARC
config ARCH_MAY_HAVE_PC_FDC config ARCH_MAY_HAVE_PC_FDC
bool bool
@ -19,7 +19,7 @@ Acked-by: Rob Landley <rob@landley.net>
config CEVT_BCM1480 config CEVT_BCM1480
bool bool
@@ -2970,6 +2967,18 @@ choice @@ -2967,6 +2964,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments" bool "Extend builtin kernel arguments with bootloader arguments"
endchoice endchoice

View File

@ -24,7 +24,7 @@ v2: incorporated changes suggested by Jonas Gorski
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -2894,6 +2894,20 @@ config MIPS_O32_FP64_SUPPORT @@ -2891,6 +2891,20 @@ config MIPS_O32_FP64_SUPPORT
If unsure, say N. If unsure, say N.

View File

@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
select HAVE_PCSPKR_PLATFORM select HAVE_PCSPKR_PLATFORM
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select I8253 select I8253
@@ -1131,6 +1133,9 @@ config DMA_NONCOHERENT @@ -1128,6 +1130,9 @@ config DMA_NONCOHERENT
bool bool
select NEED_DMA_MAP_STATE select NEED_DMA_MAP_STATE
@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
config NEED_DMA_MAP_STATE config NEED_DMA_MAP_STATE
bool bool
@@ -1655,6 +1660,7 @@ config CPU_R10000 @@ -1652,6 +1657,7 @@ config CPU_R10000
select CPU_SUPPORTS_64BIT_KERNEL select CPU_SUPPORTS_64BIT_KERNEL
select CPU_SUPPORTS_HIGHMEM select CPU_SUPPORTS_HIGHMEM
select CPU_SUPPORTS_HUGEPAGES select CPU_SUPPORTS_HUGEPAGES
@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
help help
MIPS Technologies R10000-series processors. MIPS Technologies R10000-series processors.
@@ -1903,9 +1909,11 @@ config SYS_HAS_CPU_MIPS32_R3_5 @@ -1900,9 +1906,11 @@ config SYS_HAS_CPU_MIPS32_R3_5
bool bool
config SYS_HAS_CPU_MIPS32_R5 config SYS_HAS_CPU_MIPS32_R5
@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
bool bool
config SYS_HAS_CPU_MIPS64_R1 config SYS_HAS_CPU_MIPS64_R1
@@ -1915,6 +1923,7 @@ config SYS_HAS_CPU_MIPS64_R2 @@ -1912,6 +1920,7 @@ config SYS_HAS_CPU_MIPS64_R2
bool bool
config SYS_HAS_CPU_MIPS64_R6 config SYS_HAS_CPU_MIPS64_R6

View File

@ -1,6 +1,6 @@
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -2327,6 +2327,12 @@ config MIPS_VPE_LOADER @@ -2324,6 +2324,12 @@ config MIPS_VPE_LOADER
Includes a loader for loading an elf relocatable object Includes a loader for loading an elf relocatable object
onto another VPE and running it. onto another VPE and running it.

View File

@ -78,7 +78,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
if (cpu_online(tcpu)) { if (cpu_online(tcpu)) {
cpu = tcpu; cpu = tcpu;
goto done; goto done;
@@ -8846,6 +8898,9 @@ static int __init net_dev_init(void) @@ -8848,6 +8900,9 @@ static int __init net_dev_init(void)
sd->backlog.weight = weight_p; sd->backlog.weight = weight_p;
} }

View File

@ -17,7 +17,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
--- a/drivers/mtd/nand/mtk_nand.c --- a/drivers/mtd/nand/mtk_nand.c
+++ b/drivers/mtd/nand/mtk_nand.c +++ b/drivers/mtd/nand/mtk_nand.c
@@ -1540,7 +1540,6 @@ static int mtk_nfc_resume(struct device @@ -1539,7 +1539,6 @@ static int mtk_nfc_resume(struct device
struct mtk_nfc *nfc = dev_get_drvdata(dev); struct mtk_nfc *nfc = dev_get_drvdata(dev);
struct mtk_nfc_nand_chip *chip; struct mtk_nfc_nand_chip *chip;
struct nand_chip *nand; struct nand_chip *nand;
@ -25,7 +25,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
int ret; int ret;
u32 i; u32 i;
@@ -1553,11 +1552,8 @@ static int mtk_nfc_resume(struct device @@ -1552,11 +1551,8 @@ static int mtk_nfc_resume(struct device
/* reset NAND chip if VCC was powered off */ /* reset NAND chip if VCC was powered off */
list_for_each_entry(chip, &nfc->chips, node) { list_for_each_entry(chip, &nfc->chips, node) {
nand = &chip->nand; nand = &chip->nand;

View File

@ -312,7 +312,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
nfi_writel(nfc, reg, NFI_CON); nfi_writel(nfc, reg, NFI_CON);
nfi_writew(nfc, STAR_EN, NFI_STRDATA); nfi_writew(nfc, STAR_EN, NFI_STRDATA);
@@ -1126,9 +1127,11 @@ static void mtk_nfc_set_fdm(struct mtk_n @@ -1125,9 +1126,11 @@ static void mtk_nfc_set_fdm(struct mtk_n
{ {
struct nand_chip *nand = mtd_to_nand(mtd); struct nand_chip *nand = mtd_to_nand(mtd);
struct mtk_nfc_nand_chip *chip = to_mtk_nand(nand); struct mtk_nfc_nand_chip *chip = to_mtk_nand(nand);
@ -325,7 +325,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
fdm->reg_size = chip->spare_per_sector - ecc_bytes; fdm->reg_size = chip->spare_per_sector - ecc_bytes;
if (fdm->reg_size > NFI_FDM_MAX_SIZE) if (fdm->reg_size > NFI_FDM_MAX_SIZE)
@@ -1208,7 +1211,8 @@ static int mtk_nfc_ecc_init(struct devic @@ -1207,7 +1210,8 @@ static int mtk_nfc_ecc_init(struct devic
* this controller only supports 512 and 1024 sizes * this controller only supports 512 and 1024 sizes
*/ */
if (nand->ecc.size < 1024) { if (nand->ecc.size < 1024) {
@ -335,7 +335,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
nand->ecc.size = 1024; nand->ecc.size = 1024;
nand->ecc.strength <<= 1; nand->ecc.strength <<= 1;
} else { } else {
@@ -1223,7 +1227,8 @@ static int mtk_nfc_ecc_init(struct devic @@ -1222,7 +1226,8 @@ static int mtk_nfc_ecc_init(struct devic
return ret; return ret;
/* calculate oob bytes except ecc parity data */ /* calculate oob bytes except ecc parity data */
@ -345,7 +345,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
free = spare - free; free = spare - free;
/* /*
@@ -1233,10 +1238,12 @@ static int mtk_nfc_ecc_init(struct devic @@ -1232,10 +1237,12 @@ static int mtk_nfc_ecc_init(struct devic
*/ */
if (free > NFI_FDM_MAX_SIZE) { if (free > NFI_FDM_MAX_SIZE) {
spare -= NFI_FDM_MAX_SIZE; spare -= NFI_FDM_MAX_SIZE;
@ -360,7 +360,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
} }
} }
@@ -1389,6 +1396,8 @@ static const struct mtk_nfc_caps mtk_nfc @@ -1388,6 +1395,8 @@ static const struct mtk_nfc_caps mtk_nfc
.num_spare_size = 16, .num_spare_size = 16,
.pageformat_spare_shift = 4, .pageformat_spare_shift = 4,
.nfi_clk_div = 1, .nfi_clk_div = 1,
@ -369,7 +369,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
}; };
static const struct mtk_nfc_caps mtk_nfc_caps_mt2712 = { static const struct mtk_nfc_caps mtk_nfc_caps_mt2712 = {
@@ -1396,6 +1405,8 @@ static const struct mtk_nfc_caps mtk_nfc @@ -1395,6 +1404,8 @@ static const struct mtk_nfc_caps mtk_nfc
.num_spare_size = 19, .num_spare_size = 19,
.pageformat_spare_shift = 16, .pageformat_spare_shift = 16,
.nfi_clk_div = 2, .nfi_clk_div = 2,

View File

@ -81,7 +81,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
static inline struct mtk_nfc_nand_chip *to_mtk_nand(struct nand_chip *nand) static inline struct mtk_nfc_nand_chip *to_mtk_nand(struct nand_chip *nand)
{ {
return container_of(nand, struct mtk_nfc_nand_chip, nand); return container_of(nand, struct mtk_nfc_nand_chip, nand);
@@ -1409,6 +1413,15 @@ static const struct mtk_nfc_caps mtk_nfc @@ -1408,6 +1412,15 @@ static const struct mtk_nfc_caps mtk_nfc
.max_sector_size = 1024, .max_sector_size = 1024,
}; };
@ -97,7 +97,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
static const struct of_device_id mtk_nfc_id_table[] = { static const struct of_device_id mtk_nfc_id_table[] = {
{ {
.compatible = "mediatek,mt2701-nfc", .compatible = "mediatek,mt2701-nfc",
@@ -1416,6 +1429,9 @@ static const struct of_device_id mtk_nfc @@ -1415,6 +1428,9 @@ static const struct of_device_id mtk_nfc
}, { }, {
.compatible = "mediatek,mt2712-nfc", .compatible = "mediatek,mt2712-nfc",
.data = &mtk_nfc_caps_mt2712, .data = &mtk_nfc_caps_mt2712,