brcm63xx: backport mtd of node changes from upstream

[openwrt/staging/blogic.git] / target / linux / brcm63xx / patches-4.4 / 202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch

diff --git a/target/linux/brcm63xx/patches-4.4/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch b/target/linux/brcm63xx/patches-4.4/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch
index 47938369451b0a2b67ed9e79a78c881afeea614e..6c26d6cd410299d93b1ea087bd78a85662861637 100644 (file)
--- a/target/linux/brcm63xx/patches-4.4/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch
+++ b/target/linux/brcm63xx/patches-4.4/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch
@@ -11,13 +11,16 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -251,7 +251,8 @@ static int m25p_probe(struct spi_device
+@@ -248,8 +248,10 @@ static int m25p_probe(struct spi_device
+       if (ret)
+               return ret;
  
-       ppdata.of_node = spi->dev.of_node;
- 
--      return mtd_device_parse_register(&nor->mtd, NULL, &ppdata,
+-      return mtd_device_register(&nor->mtd, data ? data->parts : NULL,
+-                                 data ? data->nr_parts : 0);
 +      return mtd_device_parse_register(&nor->mtd,
-+                      data ? data->part_probe_types : NULL, &ppdata,
-                       data ? data->parts : NULL,
-                       data ? data->nr_parts : 0);
++                      data ? data->part_probe_types : NULL, NULL,
++                      data ? data->parts : NULL,
++                      data ? data->nr_parts : 0);
  }
+ 
+