brcm63xx: update flash of_node patches to full patch set

[openwrt/staging/noltari.git] / target / linux / brcm63xx / patches-4.4 / 000-4.5-05-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch

diff --git a/target/linux/brcm63xx/patches-4.4/000-4.5-05-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch b/target/linux/brcm63xx/patches-4.4/000-4.5-05-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch
new file mode 100644 (file)
index 0000000..74af24b
--- /dev/null
+++ b/target/linux/brcm63xx/patches-4.4/000-4.5-05-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch
@@ -0,0 +1,79 @@
+From 9c7d787508be6d68a6ec66de3c3466b24e820c71 Mon Sep 17 00:00:00 2001
+From: Brian Norris <computersforpeace@gmail.com>
+Date: Fri, 30 Oct 2015 20:33:24 -0700
+Subject: [PATCH] mtd: spi-nor: convert to spi_nor_{get, set}_flash_node()
+
+Used semantic patch with 'make coccicheck MODE=patch COCCI=script.cocci':
+
+---8<----
+virtual patch
+
+@@
+struct spi_nor b;
+struct spi_nor *c;
+expression d;
+@@
+(
+-(b).flash_node = (d)
++spi_nor_set_flash_node(&b, d)
+|
+-(c)->flash_node = (d)
++spi_nor_set_flash_node(c, d)
+)
+---8<----
+
+And a manual conversion for the one use of spi_nor_get_flash_node().
+
+Signed-off-by: Brian Norris <computersforpeace@gmail.com>
+Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
+---
+ drivers/mtd/devices/m25p80.c      | 2 +-
+ drivers/mtd/spi-nor/fsl-quadspi.c | 2 +-
+ drivers/mtd/spi-nor/nxp-spifi.c   | 2 +-
+ drivers/mtd/spi-nor/spi-nor.c     | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -221,7 +221,7 @@ static int m25p_probe(struct spi_device
+       nor->read_reg = m25p80_read_reg;
+ 
+       nor->dev = &spi->dev;
+-      nor->flash_node = spi->dev.of_node;
++      spi_nor_set_flash_node(nor, spi->dev.of_node);
+       nor->priv = flash;
+ 
+       spi_set_drvdata(spi, flash);
+--- a/drivers/mtd/spi-nor/fsl-quadspi.c
++++ b/drivers/mtd/spi-nor/fsl-quadspi.c
+@@ -1013,7 +1013,7 @@ static int fsl_qspi_probe(struct platfor
+               mtd = &nor->mtd;
+ 
+               nor->dev = dev;
+-              nor->flash_node = np;
++              spi_nor_set_flash_node(nor, np);
+               nor->priv = q;
+ 
+               /* fill the hooks */
+--- a/drivers/mtd/spi-nor/nxp-spifi.c
++++ b/drivers/mtd/spi-nor/nxp-spifi.c
+@@ -330,7 +330,7 @@ static int nxp_spifi_setup_flash(struct
+       writel(ctrl, spifi->io_base + SPIFI_CTRL);
+ 
+       spifi->nor.dev   = spifi->dev;
+-      spifi->nor.flash_node = np;
++      spi_nor_set_flash_node(&spifi->nor, np);
+       spifi->nor.priv  = spifi;
+       spifi->nor.read  = nxp_spifi_read;
+       spifi->nor.write = nxp_spifi_write;
+--- a/drivers/mtd/spi-nor/spi-nor.c
++++ b/drivers/mtd/spi-nor/spi-nor.c
+@@ -1113,7 +1113,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+       const struct flash_info *info = NULL;
+       struct device *dev = nor->dev;
+       struct mtd_info *mtd = &nor->mtd;
+-      struct device_node *np = nor->flash_node;
++      struct device_node *np = spi_nor_get_flash_node(nor);
+       int ret;
+       int i;
+