Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 603129af authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: mach-rsk: Update for parse_mtd_partitions() fallout. 



The RSK+ setup code was doing some pretty dubious things with
parse_mtd_partitions() in order to populate the physmap-flash map
platform data. The physmap-flash driver contains all of the functionality
that we require already, so simply drop the special casing and pad out
the platform data accordingly.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent b1bdd255

arch/sh/boards/mach-rsk/setup.c

+6 −37
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ 
#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>

#ifdef CONFIG_MTD

#include <linux/mtd/map.h>

#endif

#include <asm/machvec.h>

#include <asm/io.h>



static const char *part_probes[] = { "cmdlinepart", NULL };



static struct mtd_partition rsk_partitions[] = {

	{

		.name		= "Bootloader",
@@ -42,6 +42,7 @@ static struct physmap_flash_data flash_data = { 
	.parts			= rsk_partitions,

	.nr_parts		= ARRAY_SIZE(rsk_partitions),

	.width			= 2,

	.part_probe_types	= part_probes,

};



static struct resource flash_resource = {
@@ -60,44 +61,12 @@ static struct platform_device flash_device = { 
	},

};



#ifdef CONFIG_MTD

static const char *probes[] = { "cmdlinepart", NULL };



static struct map_info rsk_flash_map = {

	.name		= "RSK+ Flash",

	.size		= 0x400000,

	.bankwidth	= 2,

};



static struct mtd_info *flash_mtd;



static struct mtd_partition *parsed_partitions;



static void __init set_mtd_partitions(void)

{

	int nr_parts = 0;



	simple_map_init(&rsk_flash_map);

	flash_mtd = do_map_probe("cfi_probe", &rsk_flash_map);

	nr_parts = parse_mtd_partitions(flash_mtd, probes,

					&parsed_partitions, 0);

	/* If there is no partition table, used the hard coded table */

	if (nr_parts > 0) {

		flash_data.nr_parts = nr_parts;

		flash_data.parts = parsed_partitions;

	}

}

#else

static inline void set_mtd_partitions(void) {}

#endif



static struct platform_device *rsk_devices[] __initdata = {

	&flash_device,

};



static int __init rsk_devices_setup(void)

{

	set_mtd_partitions();

	return platform_add_devices(rsk_devices,

				    ARRAY_SIZE(rsk_devices));

}