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

Commit c2e0090c authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Paul Mundt
Browse files

sh: mach-r2d: add physmap-flash support for R2D+ boards. 



The RTS7751R2D_1 boards only support 1MB of socket-mounted MBM29F040
flash, which we just leave alone as it's not terribly interesting.

This adds support for the s29gl256p on the r2d+ boards that makes a bit
more sense to expose to the user.

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 47c8a08b

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

+50 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ 
 */

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>

#include <linux/ata_platform.h>

#include <linux/sm501.h>

#include <linux/sm501-regs.h>
@@ -181,6 +184,50 @@ static struct platform_device sm501_device = { 
	.resource	= sm501_resources,

};



static struct mtd_partition r2d_partitions[] = {

	{

		.name		= "U-Boot",

		.offset		= 0x00000000,

		.size		= 0x00040000,

		.mask_flags	= MTD_WRITEABLE,

	}, {

		.name		= "Environment",

		.offset		= MTDPART_OFS_NXTBLK,

		.size		= 0x00040000,

		.mask_flags	= MTD_WRITEABLE,

	}, {

		.name		= "Kernel",

		.offset		= MTDPART_OFS_NXTBLK,

		.size		= 0x001c0000,

	}, {

		.name		= "Flash_FS",

		.offset		= MTDPART_OFS_NXTBLK,

		.size		= MTDPART_SIZ_FULL,

	}

};



static struct physmap_flash_data flash_data = {

	.width		= 2,

	.nr_parts	= ARRAY_SIZE(r2d_partitions),

	.parts		= r2d_partitions,

};



static struct resource flash_resource = {

	.start		= 0x00000000,

	.end		= 0x02000000,

	.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 platform_device *rts7751r2d_devices[] __initdata = {

	&sm501_device,

	&heartbeat_device,
@@ -203,6 +250,9 @@ static int __init rts7751r2d_devices_setup(void) 
	if (register_trapped_io(&cf_trapped_io) == 0)

		platform_device_register(&cf_ide_device);



	if (mach_is_r2d_plus())

		platform_device_register(&flash_device);



	spi_register_board_info(spi_bus, ARRAY_SIZE(spi_bus));



	return platform_add_devices(rts7751r2d_devices,

arch/sh/configs/rts7751r2dplus_defconfig

+86 −1
Original line number Diff line number Diff line
@@ -424,7 +424,92 @@ CONFIG_FIRMWARE_IN_KERNEL=y 
CONFIG_EXTRA_FIRMWARE=""

# CONFIG_SYS_HYPERVISOR is not set

# CONFIG_CONNECTOR is not set

# CONFIG_MTD is not set

CONFIG_MTD=y

# CONFIG_MTD_DEBUG is not set

CONFIG_MTD_CONCAT=y

CONFIG_MTD_PARTITIONS=y

# CONFIG_MTD_TESTS is not set

# CONFIG_MTD_REDBOOT_PARTS is not set

CONFIG_MTD_CMDLINE_PARTS=y

# CONFIG_MTD_AR7_PARTS is not set



#

# User Modules And Translation Layers

#

CONFIG_MTD_CHAR=y

# CONFIG_MTD_BLKDEVS is not set

# CONFIG_MTD_BLOCK is not set

# CONFIG_MTD_BLOCK_RO is not set

# CONFIG_FTL is not set

# CONFIG_NFTL is not set

# CONFIG_INFTL is not set

# CONFIG_RFD_FTL is not set

# CONFIG_SSFDC is not set

# CONFIG_MTD_OOPS is not set



#

# RAM/ROM/Flash chip drivers

#

CONFIG_MTD_CFI=y

# CONFIG_MTD_JEDECPROBE is not set

CONFIG_MTD_GEN_PROBE=y

# CONFIG_MTD_CFI_ADV_OPTIONS is not set

CONFIG_MTD_MAP_BANK_WIDTH_1=y

CONFIG_MTD_MAP_BANK_WIDTH_2=y

CONFIG_MTD_MAP_BANK_WIDTH_4=y

# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set

# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set

# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set

CONFIG_MTD_CFI_I1=y

CONFIG_MTD_CFI_I2=y

# CONFIG_MTD_CFI_I4 is not set

# CONFIG_MTD_CFI_I8 is not set

# CONFIG_MTD_CFI_INTELEXT is not set

CONFIG_MTD_CFI_AMDSTD=y

# CONFIG_MTD_CFI_STAA is not set

CONFIG_MTD_CFI_UTIL=y

# CONFIG_MTD_RAM is not set

# CONFIG_MTD_ROM is not set

# CONFIG_MTD_ABSENT is not set



#

# Mapping drivers for chip access

#

# CONFIG_MTD_COMPLEX_MAPPINGS is not set

CONFIG_MTD_PHYSMAP=y

# CONFIG_MTD_PHYSMAP_COMPAT is not set

# CONFIG_MTD_INTEL_VR_NOR is not set

# CONFIG_MTD_PLATRAM is not set



#

# Self-contained MTD device drivers

#

# CONFIG_MTD_PMC551 is not set

# CONFIG_MTD_DATAFLASH is not set

# CONFIG_MTD_M25P80 is not set

# CONFIG_MTD_SLRAM is not set

# CONFIG_MTD_PHRAM is not set

# CONFIG_MTD_MTDRAM is not set

# CONFIG_MTD_BLOCK2MTD is not set



#

# Disk-On-Chip Device Drivers

#

# CONFIG_MTD_DOC2000 is not set

# CONFIG_MTD_DOC2001 is not set

# CONFIG_MTD_DOC2001PLUS is not set

# CONFIG_MTD_NAND is not set

# CONFIG_MTD_ONENAND is not set



#

# LPDDR flash memory drivers

#

# CONFIG_MTD_LPDDR is not set



#

# UBI - Unsorted block images

#

# CONFIG_MTD_UBI is not set

# CONFIG_PARPORT is not set

CONFIG_BLK_DEV=y

# CONFIG_BLK_CPQ_CISS_DA is not set