target/linux/mediatek/patches-4.4/0059-mtd-nand-backport-fixes.patch

   1 From 96bddff914c0cee1b16d809220e84b470b433122 Mon Sep 17 00:00:00 2001
   2 From: John Crispin <blogic@openwrt.org>
   3 Date: Thu, 31 Mar 2016 02:28:08 +0200
   4 Subject: [PATCH 59/91] mtd: nand: backport fixes
   5
   6 ---
   7  drivers/mtd/nand/mtksdg1_nand.c |    9 ++++++++-
   8  1 file changed, 8 insertions(+), 1 deletion(-)
   9
  10 diff --git a/drivers/mtd/nand/mtksdg1_nand.c b/drivers/mtd/nand/mtksdg1_nand.c
  11 index 55dd17d..f92b949 100644
  12 --- a/drivers/mtd/nand/mtksdg1_nand.c
  13 +++ b/drivers/mtd/nand/mtksdg1_nand.c
  14 @@ -107,6 +107,9 @@ static struct nand_ecclayout nand_4k_128 = {
  15         .oobfree = { {0, 32} },
  16  };
  17
  18 +static const char * const part_probes[] = {
  19 +       "cmdlinepart", "RedBoot", "ofpart", NULL };
  20 +
  21  /* NFI register access */
  22  static inline void mtk_nfi_writel(struct mtk_nfc_host *host, u32 val, u32 reg)
  23  {
  24 @@ -1298,6 +1301,7 @@ static int mtk_nfc_probe(struct platform_device *pdev)
  25
  26         chip = &host->chip;
  27         mtd = nand_to_mtd(chip);
  28 +       mtd->priv = chip;
  29         host->dev = dev;
  30
  31         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  32 @@ -1428,7 +1432,10 @@ static int mtk_nfc_probe(struct platform_device *pdev)
  33         }
  34         host->switch_oob = false;
  35
  36 -       ret = mtd_device_parse_register(mtd, NULL, NULL, NULL, 0);
  37 +       ret = mtd_device_parse_register(mtd, part_probes,
  38 +                       &(struct mtd_part_parser_data) {
  39 +                               .of_node = pdev->dev.of_node,
  40 +                       }, NULL, 0);
  41         if (ret) {
  42                 dev_err(dev, "mtd parse partition error\n");
  43                 goto nand_free;
  44 --
  45 1.7.10.4
  46