Commit 030d2dd4 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by David Woodhouse
Browse files

mtd: Update ep93xx/ts72xx to use generic platform nand driver 



Update the ts72xx platform's nand driver support.

This changes the ts72xx platform from using a custom nand driver
(ts7250.c) to the generic platform nand driver (plat_nand.c).

Tested on TS-7250 with 32MiB NAND.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Tested-by: default avatarMatthieu Crapet <mcrapet@gmail.com>
Cc: Jesse Off <joff@embeddedARM.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent de58288d

arch/arm/mach-ep93xx/ts72xx.c

+131 −57
Original line number Diff line number Diff line
@@ -10,12 +10,16 @@ 
 * your option) any later version.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/m48t86.h>

#include <linux/mtd/physmap.h>

#include <linux/mtd/nand.h>

#include <linux/mtd/partitions.h>



#include <mach/hardware.h>

#include <mach/ts72xx.h>
@@ -54,92 +58,162 @@ static struct map_desc ts72xx_io_desc[] __initdata = { 
	}

};



static struct map_desc ts72xx_nand_io_desc[] __initdata = {

static void __init ts72xx_map_io(void)

{

		.virtual	= TS72XX_NAND_DATA_VIRT_BASE,

		.pfn		= __phys_to_pfn(TS72XX_NAND1_DATA_PHYS_BASE),

		.length		= TS72XX_NAND_DATA_SIZE,

		.type		= MT_DEVICE,

	}, {

		.virtual	= TS72XX_NAND_CONTROL_VIRT_BASE,

		.pfn		= __phys_to_pfn(TS72XX_NAND1_CONTROL_PHYS_BASE),

		.length		= TS72XX_NAND_CONTROL_SIZE,

		.type		= MT_DEVICE,

	}, {

		.virtual	= TS72XX_NAND_BUSY_VIRT_BASE,

		.pfn		= __phys_to_pfn(TS72XX_NAND1_BUSY_PHYS_BASE),

		.length		= TS72XX_NAND_BUSY_SIZE,

		.type		= MT_DEVICE,

	ep93xx_map_io();

	iotable_init(ts72xx_io_desc, ARRAY_SIZE(ts72xx_io_desc));

}

};



static struct map_desc ts72xx_alternate_nand_io_desc[] __initdata = {



/*************************************************************************

 * NAND flash

 *************************************************************************/

#define TS72XX_NAND_CONTROL_ADDR_LINE	22	/* 0xN0400000 */

#define TS72XX_NAND_BUSY_ADDR_LINE	23	/* 0xN0800000 */



static void ts72xx_nand_hwcontrol(struct mtd_info *mtd,

				  int cmd, unsigned int ctrl)

{

		.virtual	= TS72XX_NAND_DATA_VIRT_BASE,

		.pfn		= __phys_to_pfn(TS72XX_NAND2_DATA_PHYS_BASE),

		.length		= TS72XX_NAND_DATA_SIZE,

		.type		= MT_DEVICE,

	struct nand_chip *chip = mtd->priv;



	if (ctrl & NAND_CTRL_CHANGE) {

		void __iomem *addr = chip->IO_ADDR_R;

		unsigned char bits;



		addr += (1 << TS72XX_NAND_CONTROL_ADDR_LINE);



		bits = __raw_readb(addr) & ~0x07;

		bits |= (ctrl & NAND_NCE) << 2;	/* bit 0 -> bit 2 */

		bits |= (ctrl & NAND_CLE);	/* bit 1 -> bit 1 */

		bits |= (ctrl & NAND_ALE) >> 2;	/* bit 2 -> bit 0 */



		__raw_writeb(bits, addr);

	}



	if (cmd != NAND_CMD_NONE)

		__raw_writeb(cmd, chip->IO_ADDR_W);

}



static int ts72xx_nand_device_ready(struct mtd_info *mtd)

{

	struct nand_chip *chip = mtd->priv;

	void __iomem *addr = chip->IO_ADDR_R;



	addr += (1 << TS72XX_NAND_BUSY_ADDR_LINE);



	return !!(__raw_readb(addr) & 0x20);

}



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



#define TS72XX_BOOTROM_PART_SIZE	(SZ_16K)

#define TS72XX_REDBOOT_PART_SIZE	(SZ_2M + SZ_1M)



static struct mtd_partition ts72xx_nand_parts[] = {

	{

		.name		= "TS-BOOTROM",

		.offset		= 0,

		.size		= TS72XX_BOOTROM_PART_SIZE,

		.mask_flags	= MTD_WRITEABLE,	/* force read-only */

	}, {

		.virtual	= TS72XX_NAND_CONTROL_VIRT_BASE,

		.pfn		= __phys_to_pfn(TS72XX_NAND2_CONTROL_PHYS_BASE),

		.length		= TS72XX_NAND_CONTROL_SIZE,

		.type		= MT_DEVICE,

		.name		= "Linux",

		.offset		= MTDPART_OFS_APPEND,

		.size		= 0,			/* filled in later */

	}, {

		.virtual	= TS72XX_NAND_BUSY_VIRT_BASE,

		.pfn		= __phys_to_pfn(TS72XX_NAND2_BUSY_PHYS_BASE),

		.length		= TS72XX_NAND_BUSY_SIZE,

		.type		= MT_DEVICE,

	}

		.name		= "RedBoot",

		.offset		= MTDPART_OFS_APPEND,

		.size		= MTDPART_SIZ_FULL,

		.mask_flags	= MTD_WRITEABLE,	/* force read-only */

	},

};



static void __init ts72xx_map_io(void)

static void ts72xx_nand_set_parts(uint64_t size,

				  struct platform_nand_chip *chip)

{

	ep93xx_map_io();

	iotable_init(ts72xx_io_desc, ARRAY_SIZE(ts72xx_io_desc));

	/* Factory TS-72xx boards only come with 32MiB or 128MiB NAND options */

	if (size == SZ_32M || size == SZ_128M) {

		/* Set the "Linux" partition size */

		ts72xx_nand_parts[1].size = size - TS72XX_REDBOOT_PART_SIZE;



	/*

	 * The TS-7200 has NOR flash, the other models have NAND flash.

	 */

	if (!board_is_ts7200()) {

		if (is_ts9420_installed()) {

			iotable_init(ts72xx_alternate_nand_io_desc,

				ARRAY_SIZE(ts72xx_alternate_nand_io_desc));

		chip->partitions = ts72xx_nand_parts;

		chip->nr_partitions = ARRAY_SIZE(ts72xx_nand_parts);

	} else {

			iotable_init(ts72xx_nand_io_desc,

				ARRAY_SIZE(ts72xx_nand_io_desc));

		}

		pr_warning("Unknown nand disk size:%lluMiB\n", size >> 20);

	}

}



static struct platform_nand_data ts72xx_nand_data = {

	.chip = {

		.nr_chips	= 1,

		.chip_offset	= 0,

		.chip_delay	= 15,

		.part_probe_types = ts72xx_nand_part_probes,

		.set_parts	= ts72xx_nand_set_parts,

	},

	.ctrl = {

		.cmd_ctrl	= ts72xx_nand_hwcontrol,

		.dev_ready	= ts72xx_nand_device_ready,

	},

};



static struct resource ts72xx_nand_resource[] = {

	{

		.start		= 0,			/* filled in later */

		.end		= 0,			/* filled in later */

		.flags		= IORESOURCE_MEM,

	},

};



static struct platform_device ts72xx_nand_flash = {

	.name			= "gen_nand",

	.id			= -1,

	.dev.platform_data	= &ts72xx_nand_data,

	.resource		= ts72xx_nand_resource,

	.num_resources		= ARRAY_SIZE(ts72xx_nand_resource),

};





/*************************************************************************

 * NOR flash (TS-7200 only)

 *************************************************************************/

static struct physmap_flash_data ts72xx_flash_data = {

static struct physmap_flash_data ts72xx_nor_data = {

	.width		= 2,

};



static struct resource ts72xx_flash_resource = {

static struct resource ts72xx_nor_resource = {

	.start		= EP93XX_CS6_PHYS_BASE,

	.end		= EP93XX_CS6_PHYS_BASE + SZ_16M - 1,

	.flags		= IORESOURCE_MEM,

};



static struct platform_device ts72xx_flash = {

static struct platform_device ts72xx_nor_flash = {

	.name			= "physmap-flash",

	.id			= 0,

	.dev		= {

		.platform_data	= &ts72xx_flash_data,

	},

	.dev.platform_data	= &ts72xx_nor_data,

	.resource		= &ts72xx_nor_resource,

	.num_resources		= 1,

	.resource	= &ts72xx_flash_resource,

};



static void __init ts72xx_register_flash(void)

{

	if (board_is_ts7200())

		platform_device_register(&ts72xx_flash);

	if (board_is_ts7200()) {

		platform_device_register(&ts72xx_nor_flash);

	} else {

		resource_size_t start;



		if (is_ts9420_installed())

			start = EP93XX_CS7_PHYS_BASE;

		else

			start = EP93XX_CS6_PHYS_BASE;



		ts72xx_nand_resource[0].start = start;

		ts72xx_nand_resource[0].end = start + SZ_16M - 1;



		platform_device_register(&ts72xx_nand_flash);

	}

}





static unsigned char ts72xx_rtc_readbyte(unsigned long addr)

{

	__raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE);

CRA Git | Maintained and supported by SUSTech CRA and CCSE