kernel: bump 4.14 to 4.14.44

[openwrt/staging/chunkeey.git] / target / linux / mediatek / patches-4.14 / 0167-mtd-nand-mtk-Support-MT7622-NAND-flash-controller.patch

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 d7550ee7e881f107f934434c0fb7c5090490eeb5..7763e0644dbd2973fc1a5ea5c784e014b88d4646 100644 (file)
--- 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
@@ -12,11 +12,9 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
  drivers/mtd/nand/mtk_nand.c | 16 ++++++++++++++++
  2 files changed, 42 insertions(+)
 
-diff --git a/drivers/mtd/nand/mtk_ecc.c b/drivers/mtd/nand/mtk_ecc.c
-index 6610eefaa92b..40d86a861a70 100644
 --- a/drivers/mtd/nand/mtk_ecc.c
 +++ b/drivers/mtd/nand/mtk_ecc.c
-@@ -83,6 +83,10 @@ static const u8 ecc_strength_mt2712[] = {
+@@ -83,6 +83,10 @@ static const u8 ecc_strength_mt2712[] =
        40, 44, 48, 52, 56, 60, 68, 72, 80
  };
  
@@ -43,7 +41,7 @@ index 6610eefaa92b..40d86a861a70 100644
  static inline void mtk_ecc_wait_idle(struct mtk_ecc *ecc,
                                     enum mtk_ecc_operation op)
  {
-@@ -458,6 +471,16 @@ static const struct mtk_ecc_caps mtk_ecc_caps_mt2712 = {
+@@ -458,6 +471,16 @@ static const struct mtk_ecc_caps mtk_ecc
        .pg_irq_sel = 1,
  };
  
@@ -60,7 +58,7 @@ index 6610eefaa92b..40d86a861a70 100644
  static const struct of_device_id mtk_ecc_dt_match[] = {
        {
                .compatible = "mediatek,mt2701-ecc",
-@@ -465,6 +488,9 @@ static const struct of_device_id mtk_ecc_dt_match[] = {
+@@ -465,6 +488,9 @@ static const struct of_device_id mtk_ecc
        }, {
                .compatible = "mediatek,mt2712-ecc",
                .data = &mtk_ecc_caps_mt2712,
@@ -70,8 +68,6 @@ index 6610eefaa92b..40d86a861a70 100644
        },
        {},
  };
-diff --git a/drivers/mtd/nand/mtk_nand.c b/drivers/mtd/nand/mtk_nand.c
-index 7349aa846f9a..8f71b405d639 100644
 --- a/drivers/mtd/nand/mtk_nand.c
 +++ b/drivers/mtd/nand/mtk_nand.c
 @@ -174,6 +174,10 @@ static const u8 spare_size_mt2712[] = {
@@ -85,7 +81,7 @@ index 7349aa846f9a..8f71b405d639 100644
  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_caps_mt2712 = {
+@@ -1409,6 +1413,15 @@ static const struct mtk_nfc_caps mtk_nfc
        .max_sector_size = 1024,
  };
  
@@ -101,7 +97,7 @@ index 7349aa846f9a..8f71b405d639 100644
  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_id_table[] = {
+@@ -1416,6 +1429,9 @@ static const struct of_device_id mtk_nfc
        }, {
                .compatible = "mediatek,mt2712-nfc",
                .data = &mtk_nfc_caps_mt2712,
@@ -111,6 +107,3 @@ index 7349aa846f9a..8f71b405d639 100644
        },
        {}
  };
--- 
-2.11.0
-