From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Thu, 19 Jul 2018 07:28:26 +0000 (+0900)
Subject: ARM: uniphier: support fdt_fixup_mtdparts
X-Git-Tag: v2018.09-rc1~33^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bb04d2ec4d1fc1924b491c074ccfdad633167cc7;p=oweals%2Fu-boot.git

ARM: uniphier: support fdt_fixup_mtdparts

Propagate the "mtdparts" environment variable to the DT passed
in to OS.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

diff --git a/arch/arm/mach-uniphier/fdt-fixup.c b/arch/arm/mach-uniphier/fdt-fixup.c
index 022e44216e..6f3c29d8c0 100644
--- a/arch/arm/mach-uniphier/fdt-fixup.c
+++ b/arch/arm/mach-uniphier/fdt-fixup.c
@@ -7,6 +7,8 @@
 #include <common.h>
 #include <fdt_support.h>
 #include <fdtdec.h>
+#include <jffs2/load_kernel.h>
+#include <mtd_node.h>
 #include <linux/kernel.h>
 #include <linux/printk.h>
 
@@ -46,8 +48,14 @@ static int uniphier_ld20_fdt_mem_rsv(void *fdt, bd_t *bd)
 
 int ft_board_setup(void *fdt, bd_t *bd)
 {
+	static const struct node_info nodes[] = {
+		{ "socionext,uniphier-denali-nand-v5a", MTD_DEV_TYPE_NAND },
+		{ "socionext,uniphier-denali-nand-v5b", MTD_DEV_TYPE_NAND },
+	};
 	int ret;
 
+	fdt_fixup_mtdparts(fdt, nodes, ARRAY_SIZE(nodes));
+
 	ret = uniphier_ld20_fdt_mem_rsv(fdt, bd);
 	if (ret)
 		return ret;