diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-09-20 15:08:16 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-09-20 15:51:49 +0200 |
| commit | 0b18fca82f5a4009d611abe9f06a0c3160ded837 (patch) | |
| tree | 0b9c3ce48fbee7c01a0de3388ca9ab1cdba60a06 /target/linux/mediatek | |
| parent | d6bd3fd5c4ac22b09e4b2ac549901aaa2f8d7f8e (diff) | |
| download | upstream-0b18fca82f5a4009d611abe9f06a0c3160ded837.tar.gz upstream-0b18fca82f5a4009d611abe9f06a0c3160ded837.tar.bz2 upstream-0b18fca82f5a4009d611abe9f06a0c3160ded837.zip | |
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>
Diffstat (limited to 'target/linux/mediatek')
3 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/mediatek/patches-4.14/0162-mtd-nand-mtk-use-nand_reset-to-reset-NAND-devices-in.patch b/target/linux/mediatek/patches-4.14/0162-mtd-nand-mtk-use-nand_reset-to-reset-NAND-devices-in.patch index d27209292a..4429934765 100644 --- a/target/linux/mediatek/patches-4.14/0162-mtd-nand-mtk-use-nand_reset-to-reset-NAND-devices-in.patch +++ b/target/linux/mediatek/patches-4.14/0162-mtd-nand-mtk-use-nand_reset-to-reset-NAND-devices-in.patch @@ -17,7 +17,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> --- a/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_nand_chip *chip; struct nand_chip *nand; @@ -25,7 +25,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> int ret; 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 */ list_for_each_entry(chip, &nfc->chips, node) { nand = &chip->nand; diff --git a/target/linux/mediatek/patches-4.14/0166-mtd-nand-mtk-Support-different-MTK-NAND-flash-contro.patch b/target/linux/mediatek/patches-4.14/0166-mtd-nand-mtk-Support-different-MTK-NAND-flash-contro.patch index 437901c943..63e1dad188 100644 --- a/target/linux/mediatek/patches-4.14/0166-mtd-nand-mtk-Support-different-MTK-NAND-flash-contro.patch +++ b/target/linux/mediatek/patches-4.14/0166-mtd-nand-mtk-Support-different-MTK-NAND-flash-contro.patch @@ -312,7 +312,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> nfi_writel(nfc, reg, NFI_CON); 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 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; 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 */ 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.strength <<= 1; } 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; /* calculate oob bytes except ecc parity data */ @@ -345,7 +345,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> 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) { 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, .pageformat_spare_shift = 4, .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 = { -@@ -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, .pageformat_spare_shift = 16, .nfi_clk_div = 2, diff --git a/target/linux/mediatek/patches-4.14/0167-mtd-nand-mtk-Support-MT7622-NAND-flash-controller.patch b/target/linux/mediatek/patches-4.14/0167-mtd-nand-mtk-Support-MT7622-NAND-flash-controller.patch index 7763e0644d..5cf99c14bc 100644 --- a/target/linux/mediatek/patches-4.14/0167-mtd-nand-mtk-Support-MT7622-NAND-flash-controller.patch +++ b/target/linux/mediatek/patches-4.14/0167-mtd-nand-mtk-Support-MT7622-NAND-flash-controller.patch @@ -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) { 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, }; @@ -97,7 +97,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> static const struct of_device_id mtk_nfc_id_table[] = { { .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", .data = &mtk_nfc_caps_mt2712, |