summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Norris2015-10-31 04:33:22 +0100
committerBrian Norris2015-11-11 22:45:13 +0100
commit3e63b26bdd4069c3df2cd7ce7217a21d06801b41 (patch)
tree5525a306d79755361256e1360815d1ef004b3fdf
parentmtd: ofpart: grab device tree node directly from master device node (diff)
downloadkernel-qcow2-linux-3e63b26bdd4069c3df2cd7ce7217a21d06801b41.tar.gz
kernel-qcow2-linux-3e63b26bdd4069c3df2cd7ce7217a21d06801b41.tar.xz
kernel-qcow2-linux-3e63b26bdd4069c3df2cd7ce7217a21d06801b41.zip
mtd: {nand,spi-nor}: assign MTD of_node
We should pass along our flash DT node to the MTD layer, so it can set up ofpart for us. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-rw-r--r--drivers/mtd/nand/nand_base.c3
-rw-r--r--drivers/mtd/spi-nor/spi-nor.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index cc74142938b0..939ab3d5acc2 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -3990,6 +3990,9 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips,
int ret;
if (chip->flash_node) {
+ /* MTD can automatically handle DT partitions, etc. */
+ mtd_set_of_node(mtd, chip->flash_node);
+
ret = nand_dt_init(mtd, chip, chip->flash_node);
if (ret)
return ret;
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 49883905a434..1d3107ccee61 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -1258,6 +1258,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode)
mtd->flags |= MTD_NO_ERASE;
mtd->dev.parent = dev;
+ mtd_set_of_node(mtd, np);
nor->page_size = info->page_size;
mtd->writebufsize = nor->page_size;