From a1c20450342a758dda7d6ac91ebb4f57290d0520 Mon Sep 17 00:00:00 2001
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Wed, 21 Mar 2018 13:00:21 +0100
Subject: colibri_t20: integrate mtd partitions via dt

Use device tree to set MTD partitions of the NAND chip.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Stefan Agner <stefan.agner@toradex.com>
---
 board/toradex/colibri_t20/colibri_t20.c | 13 +++++++++++++
 configs/colibri_t20_defconfig           |  1 +
 2 files changed, 14 insertions(+)

diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c
index 14361a21dc..555111534c 100644
--- a/board/toradex/colibri_t20/colibri_t20.c
+++ b/board/toradex/colibri_t20/colibri_t20.c
@@ -14,6 +14,9 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <i2c.h>
+#include <jffs2/load_kernel.h>
+#include <fdt_support.h>
+#include <mtd_node.h>
 #include <nand.h>
 #include "../common/tdx-common.h"
 
@@ -134,6 +137,16 @@ int checkboard(void)
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 int ft_board_setup(void *blob, bd_t *bd)
 {
+#if defined(CONFIG_FDT_FIXUP_PARTITIONS)
+	static struct node_info nodes[] = {
+		{ "nvidia,tegra20-nand", MTD_DEV_TYPE_NAND, }, /* NAND flash */
+	};
+
+	/* Update partition nodes using info from mtdparts env var */
+	puts("   Updating MTD partitions...\n");
+	fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
+#endif
+
 	return ft_common_board_setup(blob, bd);
 }
 #endif
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index f5cbea2b9a..6b8350d45e 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -65,4 +65,5 @@ CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_TEGRA20=y
 CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_FDT_FIXUP_PARTITIONS=y
 # CONFIG_EFI_LOADER is not set
-- 
cgit v1.2.3