[PATCH v2 06/10] ARM: a9m2410: convert to devfs_create_partitions

[Uwe Kleine-König]

Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
---
 arch/arm/boards/a9m2410/a9m2410.c | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boards/a9m2410/a9m2410.c b/arch/arm/boards/a9m2410/a9m2410.c
index b2b6c87117a3..943b7709bf2e 100644
--- a/arch/arm/boards/a9m2410/a9m2410.c
+++ b/arch/arm/boards/a9m2410/a9m2410.c
@@ -82,6 +82,24 @@ static int a9m2410_mem_init(void)
 }
 mem_initcall(a9m2410_mem_init);
 
+static const struct devfs_partition a9m2410_nand0_partitions[] = {
+	{
+		.offset = 0,
+		.size = 0x40000,
+		.flags = DEVFS_PARTITION_FIXED,
+		.name = "self_raw",
+		.bbname = "self0",
+	}, {
+		.offset = DEVFS_PARTITION_APPEND,
+		.size = 0x20000,
+		.flags = DEVFS_PARTITION_FIXED,
+		.name = "env_raw",
+		.bbname = "env0",
+	}, {
+		/* sentinel */
+	}
+};
+
 static int a9m2410_devices_init(void)
 {
 	uint32_t reg;
@@ -116,14 +134,9 @@ static int a9m2410_devices_init(void)
 	add_generic_device("smc91c111", DEVICE_ID_DYNAMIC, NULL, S3C_CS1_BASE + 0x300,
 			16, IORESOURCE_MEM, NULL);
 
-#ifdef CONFIG_NAND
-	/* ----------- add some vital partitions -------- */
-	devfs_add_partition("nand0", 0x00000, 0x40000, DEVFS_PARTITION_FIXED, "self_raw");
-	dev_add_bb_dev("self_raw", "self0");
+	if (IS_ENABLED(CONFIG_NAND))
+		devfs_create_partitions("nand0", a9m2410_nand0_partitions);
 
-	devfs_add_partition("nand0", 0x40000, 0x20000, DEVFS_PARTITION_FIXED, "env_raw");
-	dev_add_bb_dev("env_raw", "env0");
-#endif
 	armlinux_set_architecture(MACH_TYPE_A9M2410);
 
 	return 0;
-- 
1.8.5.3