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

Commit e87ab0c4 authored by Markus Brunner's avatar Markus Brunner Committed by Paul Mundt
Browse files

sh: Magic Panel MTD mapping update. 



This update moves the flash mapping for the Magic Panel into the board
setup. It also removes references to the old MTD mapping option in the
defconfig.

Signed-off by: Markus Brunner <super.firetwister@gmail.com>
Signed-off by: Mark Jonas <toertel@gmail.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 02353f5d

arch/sh/boards/magicpanelr2/setup.c

+85 −3
Original line number Diff line number Diff line
@@ -12,14 +12,19 @@ 
#include <linux/init.h>

#include <linux/irq.h>

#include <linux/platform_device.h>

#include <linux/ide.h>

#include <linux/irq.h>

#include <linux/delay.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>

#include <linux/mtd/map.h>

#include <asm/magicpanelr2.h>

#include <asm/heartbeat.h>



#define LAN9115_READY	(ctrl_inl(0xA8000084UL) & 0x00000001UL)



/* Prefer cmdline over RedBoot */

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



/* Wait until reset finished. Timeout is 100ms. */

static int __init ethernet_reset_finished(void)

{
@@ -270,13 +275,90 @@ static struct platform_device heartbeat_device = { 
	.resource	= heartbeat_resources,

};



static struct mtd_partition *parsed_partitions;



static struct mtd_partition mpr2_partitions[] = {

	/* Reserved for bootloader, read-only */

	{

		.name = "Bootloader",

		.offset = 0x00000000UL,

		.size = MPR2_MTD_BOOTLOADER_SIZE,

		.mask_flags = MTD_WRITEABLE,

	},

	/* Reserved for kernel image */

	{

		.name = "Kernel",

		.offset = MTDPART_OFS_NXTBLK,

		.size = MPR2_MTD_KERNEL_SIZE,

	},

	/* Rest is used for Flash FS */

	{

		.name = "Flash_FS",

		.offset = MTDPART_OFS_NXTBLK,

		.size = MTDPART_SIZ_FULL,

	}

};



static struct physmap_flash_data flash_data = {

	.width		= 2,

};



static struct resource flash_resource = {

	.start		= 0x00000000,

	.end		= 0x2000000UL,

	.flags		= IORESOURCE_MEM,

};



static struct platform_device flash_device = {

	.name		= "physmap-flash",

	.id		= -1,

	.resource	= &flash_resource,

	.num_resources	= 1,

	.dev		= {

		.platform_data = &flash_data,

	},

};



static struct mtd_info *flash_mtd;



static struct map_info mpr2_flash_map = {

	.name = "Magic Panel R2 Flash",

	.size = 0x2000000UL,

	.bankwidth = 2,

};



static void __init set_mtd_partitions(void)

{

	int nr_parts = 0;



	simple_map_init(&mpr2_flash_map);

	flash_mtd = do_map_probe("cfi_probe", &mpr2_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.parts = mpr2_partitions;

		flash_data.nr_parts = ARRAY_SIZE(mpr2_partitions);

	} else {

		flash_data.nr_parts = nr_parts;

		flash_data.parts = parsed_partitions;

	}

}



/*

 * Add all resources to the platform_device

 */



static struct platform_device *mpr2_devices[] __initdata = {

	&heartbeat_device,

	&smc911x_device,

	&flash_device,

};





static int __init mpr2_devices_setup(void)

{

	set_mtd_partitions();

	return platform_add_devices(mpr2_devices, ARRAY_SIZE(mpr2_devices));

}

device_initcall(mpr2_devices_setup);

arch/sh/configs/magicpanelr2_defconfig

+5 −3
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ CONFIG_SH_MAGIC_PANEL_R2=y 
#

# Magic Panel R2 options

#

CONFIG_SH_MAGIC_PANEL_R2_VERSION=2

CONFIG_SH_MAGIC_PANEL_R2_VERSION=3



#

# Timer and clock configuration
@@ -404,9 +404,11 @@ CONFIG_MTD_CFI_UTIL=y 
# Mapping drivers for chip access

#

# CONFIG_MTD_COMPLEX_MAPPINGS is not set

# CONFIG_MTD_PHYSMAP is not set

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PHYSMAP_START=0x0000000

CONFIG_MTD_PHYSMAP_LEN=0

CONFIG_MTD_PHYSMAP_BANKWIDTH=0

# CONFIG_MTD_SOLUTIONENGINE is not set

CONFIG_MTD_MAGICPANELR2=y

# CONFIG_MTD_PLATRAM is not set



#