Update ts72xx to use generic platform nand driver
Subsystems (7)
PATCH 1/2 Update 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 32MB NAND.
---
arch/arm/mach-ep93xx/ts72xx.c +145 -50
@@ -16,6 +16,8 @@#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 +56,185 @@ static struct map_desc ts72xx_io_desc[] __initdata = { } }; -static struct map_desc ts72xx_nand_io_desc[]__initdata = { +static void __init ts72xx_map_io (void ) +{ +ep93xx_map_io (); +iotable_init (ts72xx_io_desc,ARRAY_SIZE (ts72xx_io_desc)); +} + + +/************************************************************************* +* 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) +{ +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 = (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 ((__raw_readb (addr) & ~0x7 ) | 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_part_info32[] = { { - .virtual =TS72XX_NAND_DATA_VIRT_BASE , - .pfn =__phys_to_pfn (TS72XX_NAND1_DATA_PHYS_BASE ), - .length =TS72XX_NAND_DATA_SIZE , - .type =MT_DEVICE , + .name ="TS-BOOTROM" , + .offset =0 , + .size =TS72XX_BOOTROM_PART_SIZE , }, { - .virtual =TS72XX_NAND_CONTROL_VIRT_BASE , - .pfn =__phys_to_pfn (TS72XX_NAND1_CONTROL_PHYS_BASE ), - .length =TS72XX_NAND_CONTROL_SIZE , - .type =MT_DEVICE , + .name ="Linux" , + .offset =MTDPART_OFS_APPEND , + .size =SZ_32M -TS72XX_REDBOOT_PART_SIZE , }, { - .virtual =TS72XX_NAND_BUSY_VIRT_BASE , - .pfn =__phys_to_pfn (TS72XX_NAND1_BUSY_PHYS_BASE ), - .length =TS72XX_NAND_BUSY_SIZE , - .type =MT_DEVICE , - } + .name ="RedBoot" , + .offset =MTDPART_OFS_APPEND , + .size =MTDPART_SIZ_FULL , + }, }; -static struct map_desc ts72xx_alternate_nand_io_desc[]__initdata = { +static struct mtd_partition ts72xx_part_info128[] = { { - .virtual =TS72XX_NAND_DATA_VIRT_BASE , - .pfn =__phys_to_pfn (TS72XX_NAND2_DATA_PHYS_BASE ), - .length =TS72XX_NAND_DATA_SIZE , - .type =MT_DEVICE , + .name ="TS-BOOTROM" , + .offset =0 , + .size =TS72XX_BOOTROM_PART_SIZE , }, { - .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 =SZ_128M -TS72XX_REDBOOT_PART_SIZE , }, { - .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 , + }, }; -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)); - -/* -* 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)); - }else { -iotable_init (ts72xx_nand_io_desc, -ARRAY_SIZE (ts72xx_nand_io_desc)); - } +switch (size) { +case SZ_32M : + chip->partitions = ts72xx_part_info32; + chip->nr_partitions =ARRAY_SIZE (ts72xx_part_info32); +break ; +case SZ_128M : + chip->partitions = ts72xx_part_info128; + chip->nr_partitions =ARRAY_SIZE (ts72xx_part_info128); +break ; +default : +pr_warning ("ts72xx: Unknown nand disk size:%lluMB\n" , size >>20 ); +break ; } } +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 ts7250_nand_resource[] = { + { + .start =EP93XX_CS6_PHYS_BASE , + .end =EP93XX_CS6_PHYS_BASE +SZ_16M -1 , + .flags =IORESOURCE_MEM , + }, +}; + +static struct resource ts9420_nand_resource[] = { + { + .start =EP93XX_CS7_PHYS_BASE , + .end =EP93XX_CS7_PHYS_BASE +SZ_16M -1 , + .flags =IORESOURCE_MEM , + }, +}; + +static struct platform_device ts72xx_nand_flash = { + .name ="gen_nand" , + .id =-1 , + .dev.platform_data = &ts72xx_nand_data, +}; + +/************************************************************************* * 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, + .platform_data = &ts72xx_nor_data, }, .num_resources =1 , - .resource = &ts72xx_flash_resource, + .resource = &ts72xx_nor_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 { +if (is_ts9420_installed ()) { + ts72xx_nand_flash.resource = ts9420_nand_resource; + ts72xx_nand_flash.num_resources = +ARRAY_SIZE (ts9420_nand_resource); + }else { + ts72xx_nand_flash.resource = ts7250_nand_resource; + ts72xx_nand_flash.num_resources = +ARRAY_SIZE (ts7250_nand_resource); + } +platform_device_register (&ts72xx_nand_flash); + } } +static unsigned char ts72xx_rtc_readbyte (unsigned long addr) {__raw_writeb (addr,TS72XX_RTC_INDEX_VIRT_BASE );
PATCH 1/2 Update ts72xx to use generic platform nand driver
Hi,
Quoted 72 lines · In gmane.linux.drivers.mtd H Hartley Sweeten
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 32MB NAND.
[snipped]
arch/arm/mach-ep93xx/ts72xx.c +16
-13+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_part_info32[] = { { - .virtual = TS72XX_NAND_DATA_VIRT_BASE, - .pfn = __phys_to_pfn(TS72XX_NAND1_DATA_PHYS_BASE), - .length = TS72XX_NAND_DATA_SIZE, - .type = MT_DEVICE, + .name ="TS-BOOTROM" , + .offset =0 , + .size =TS72XX_BOOTROM_PART_SIZE , }, { - .virtual = TS72XX_NAND_CONTROL_VIRT_BASE, - .pfn = __phys_to_pfn(TS72XX_NAND1_CONTROL_PHYS_BASE), - .length = TS72XX_NAND_CONTROL_SIZE, - .type = MT_DEVICE, + .name ="Linux" , + .offset =MTDPART_OFS_APPEND , + .size =SZ_32M -TS72XX_REDBOOT_PART_SIZE , }, { - .virtual = TS72XX_NAND_BUSY_VIRT_BASE, - .pfn = __phys_to_pfn(TS72XX_NAND1_BUSY_PHYS_BASE), - .length = TS72XX_NAND_BUSY_SIZE, - .type = MT_DEVICE, - } + .name ="RedBoot" , + .offset =MTDPART_OFS_APPEND , + .size =MTDPART_SIZ_FULL , + },};
arch/arm/mach-ep93xx/ts72xx.c +11
-14-static struct map_desc ts72xx_alternate_nand_io_desc[]__initdata = { +static struct mtd_partition ts72xx_part_info128[] = { { - .virtual =TS72XX_NAND_DATA_VIRT_BASE , - .pfn =__phys_to_pfn (TS72XX_NAND2_DATA_PHYS_BASE ), - .length =TS72XX_NAND_DATA_SIZE , - .type =MT_DEVICE , + .name ="TS-BOOTROM" , + .offset =0 , + .size =TS72XX_BOOTROM_PART_SIZE , }, { - .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 =SZ_128M -TS72XX_REDBOOT_PART_SIZE , }, { - .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 , + },
Quoted 2 lines
};
These struct's are almost identical so could you not...
Quoted 31 lines
arch/arm/mach-ep93xx/ts72xx.c +2
-1-static void __init ts72xx_map_io (void ) +static void ts72xx_nand_set_parts (uint64_t size, +struct platform_nand_chip *chip){
arch/arm/mach-ep93xx/ts72xx.c +12
-14-ep93xx_map_io (); -iotable_init (ts72xx_io_desc,ARRAY_SIZE (ts72xx_io_desc)); - -/* -* 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)); - }else { -iotable_init (ts72xx_nand_io_desc, -ARRAY_SIZE (ts72xx_nand_io_desc)); - } +switch (size) { +case SZ_32M : + chip->partitions = ts72xx_part_info32; + chip->nr_partitions =ARRAY_SIZE (ts72xx_part_info32); +break ; +case SZ_128M : + chip->partitions = ts72xx_part_info128; + chip->nr_partitions =ARRAY_SIZE (ts72xx_part_info128); +break ; +default : +pr_warning ("ts72xx: Unknown nand disk size:%lluMB\n" , size >>20 ); +break ; }
Quoted 2 lines
}
-----------
static struct mtd_partition ts72xx_part_info[] = {
{
/* gut feeling for *Joe Public* is to go MTD_WRITABLE */
.name = "TS-BOOTROM",
.offset = 0,
.size = TS72XX_BOOTROM_PART_SIZE,
}, {
.name = "Linux",
.offset = MTDPART_OFS_APPEND,
/* to be filled in later */
.size = 0,
}, {
/* mask MTD_WRITABLE here too? */
.name = "Redboot",
.offset = MTDPART_OFS_APPEND,
.size = MTDPART_SIZ_FULL,
}
};static void ts72xx_nand_set_parts(....)
{
....
/* or I guess you could just bailout... */
if (size != SZ_32M && size != SZ_128M)
pr_warning("ts72xx: Unknown nand disk size:%lluMB\n", size >> 20);
chip->partitions = ts72xx_part_info;
chip->nr_partitions = ARRAY_SIZE(ts72xx_part_info);
ts72xx_part_info[1].size = size - TS72XX_REDBOOT_PART_SIZE;
}---------
Cheers
Signature · 2 lines
Alexander Clouter .sigmonster says: Life's too short to dance with ugly women.
PATCH 1/2 Update ts72xx to use generic platform nand driver
Quoted 1 line · Alexander Clouter
Hi,
[snip]
Quoted 1 line
These struct's are almost identical so could you not...
[snip]
Quoted 21 lines
-----------
static struct mtd_partition ts72xx_part_info[] = { { /* gut feeling for *Joe Public* is to go MTD_WRITABLE */ .name = "TS-BOOTROM", .offset = 0, .size = TS72XX_BOOTROM_PART_SIZE, }, { .name = "Linux", .offset = MTDPART_OFS_APPEND, /* to be filled in later */ .size = 0, }, { /* mask MTD_WRITABLE here too? */ .name = "Redboot", .offset = MTDPART_OFS_APPEND, .size = MTDPART_SIZ_FULL, } };static void
ts72xx_nand_set_parts(....)
Quoted 12 lines
{
....
/* or I guess you could just bailout... */
if (size != SZ_32M && size != SZ_128M)
pr_warning("ts72xx: Unknown nand disk size:%lluMB\n", size >> 20);
chip->partitions = ts72xx_part_info;
chip->nr_partitions = ARRAY_SIZE(ts72xx_part_info);
ts72xx_part_info[1].size = size - TS72XX_REDBOOT_PART_SIZE;
}Thanks for pointing that out. I like your change and will modify the patch.
I didn't think about making the "TS-BOOTROM" and "RedBoot" partitions read-only. Probably a good idea, I'll add that also.
Updated patch coming soon.
Regards,
Hartley
PATCH 1/2 Update 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 32MB NAND.
---
V2 - mark the TS-BOOTROM and RedBoot partitions read-only (Alexander Clouter)
combined the nand mtd_partition structs (Alexander Clouter) combined the nand resource structs similarly
arch/arm/mach-ep93xx/ts72xx.c +125 -52
@@ -16,6 +16,8 @@#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 +56,163 @@ static struct map_desc ts72xx_io_desc[] __initdata = { } }; -static struct map_desc ts72xx_nand_io_desc[]__initdata = { - { - .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 , +static void __init ts72xx_map_io (void ) +{ +ep93xx_map_io (); +iotable_init (ts72xx_io_desc,ARRAY_SIZE (ts72xx_io_desc)); +} + + +/************************************************************************* +* 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) +{ +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 = (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 ((__raw_readb (addr) & ~0x7 ) | bits, addr); } -}; -static struct map_desc ts72xx_alternate_nand_io_desc[]__initdata = { +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[] = { { - .virtual =TS72XX_NAND_DATA_VIRT_BASE , - .pfn =__phys_to_pfn (TS72XX_NAND2_DATA_PHYS_BASE ), - .length =TS72XX_NAND_DATA_SIZE , - .type =MT_DEVICE , + .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 board only come with 32MB or 128MB 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)); - }else { -iotable_init (ts72xx_nand_io_desc, -ARRAY_SIZE (ts72xx_nand_io_desc)); - } + chip->partitions = ts72xx_nand_parts; + chip->nr_partitions =ARRAY_SIZE (ts72xx_nand_parts); + }else { +pr_warning ("ts72xx: Unknown nand disk size:%lluMB\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, + .platform_data = &ts72xx_nor_data, }, .num_resources =1 , - .resource = &ts72xx_flash_resource, + .resource = &ts72xx_nor_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 );
PATCH 1/2 Update ts72xx to use generic platform nand driver
In reply to H Hartley SweetenQuoted 5 lines · H Hartley Sweeten
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).
Quoted 7 lines
Tested on TS-7250 with 32MB NAND.
Signed-off-by H Hartley Sweeten <[email protected]>Tested-by Matthieu Crapet <[email protected]>Cc David Woodhouse <[email protected]>Cc <[email protected]>Cc <[email protected]>
Patches do not apply cleanly to current mtd tree. Please, refresh and resend.
Signature · 2 lines
Best Regards, Artem Bityutskiy (????? ????????)
PATCH 1/2 Update ts72xx to use generic platform nand driver
Quoted 8 lines · Artem Bityutskiy
Quoted 7 lines · H Hartley Sweeten
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 32MB NAND.
Quoted 8 lines
Quoted 5 lines
Signed-off-by H Hartley Sweeten <[email protected]>Tested-by Matthieu Crapet <[email protected]>Cc David Woodhouse <[email protected]>Cc <[email protected]>Cc <[email protected]>Patches do not apply cleanly to current mtd tree. Please, refresh and resend.
Strange. The original file in the mtd tree is identical to the one in the 2.6.32-rc3 tree. What was the problem with the patch?
I will rebase it on the mtd tree anyway and repost with a diffstat.
Regards,
Hartley
PATCH 1/2 Update ts72xx to use generic platform nand driver
In reply to Artem BityutskiyUpdate 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 32MB NAND.
---
V2 - rebased to current mtd tree (Artem Bityutskiy)
arch/arm/mach-ep93xx/ts72xx.c | 177 +++++++++++++++++++++++++++++------------ 1 files changed, 125 insertions(+), 52 deletions(-)
arch/arm/mach-ep93xx/ts72xx.c +125 -52
@@ -16,6 +16,8 @@#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 +56,163 @@ static struct map_desc ts72xx_io_desc[] __initdata = { } }; -static struct map_desc ts72xx_nand_io_desc[]__initdata = { - { - .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 , +static void __init ts72xx_map_io (void ) +{ +ep93xx_map_io (); +iotable_init (ts72xx_io_desc,ARRAY_SIZE (ts72xx_io_desc)); +} + + +/************************************************************************* +* 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) +{ +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 = (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 ((__raw_readb (addr) & ~0x7 ) | bits, addr); } -}; -static struct map_desc ts72xx_alternate_nand_io_desc[]__initdata = { +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[] = { { - .virtual =TS72XX_NAND_DATA_VIRT_BASE , - .pfn =__phys_to_pfn (TS72XX_NAND2_DATA_PHYS_BASE ), - .length =TS72XX_NAND_DATA_SIZE , - .type =MT_DEVICE , + .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 board only come with 32MB or 128MB 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)); - }else { -iotable_init (ts72xx_nand_io_desc, -ARRAY_SIZE (ts72xx_nand_io_desc)); - } + chip->partitions = ts72xx_nand_parts; + chip->nr_partitions =ARRAY_SIZE (ts72xx_nand_parts); + }else { +pr_warning ("ts72xx: Unknown nand disk size:%lluMB\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, + .platform_data = &ts72xx_nor_data, }, .num_resources =1 , - .resource = &ts72xx_flash_resource, + .resource = &ts72xx_nor_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 );
PATCH 1/2 Update ts72xx to use generic platform nand driver
Quoted 14 lines · H Hartley Sweeten
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 32MB NAND.
Signed-off-by H Hartley Sweeten <[email protected]>Tested-by Matthieu Crapet <[email protected]>Cc David Woodhouse <[email protected]>Cc Artem Bityutskiy <[email protected]>Cc <[email protected]>Cc <[email protected]>
Quoted 6 lines
---
V2 - rebased to current mtd tree (Artem Bityutskiy)
arch/arm/mach-ep93xx/ts72xx.c | 177 +++++++++++++++++++++++++++++------------ 1 files changed, 125 insertions(+), 52 deletions(-)
Ok, I've tried this patch on both mtd-2.6 and linux-2.6 git trees, and it does not apply cleanly.
[dedekind at eru mtd-2.6]$ git am ../l2-mtd-2.6.git/sweeten1
Applying: RE: [PATCH 1/2] Update ts72xx to use generic platform nand driver
error: patch failed: arch/arm/mach-ep93xx/ts72xx.c:54
error: arch/arm/mach-ep93xx/ts72xx.c: patch does not apply
Patch failed at 0001 RE: [PATCH 1/2] Update ts72xx to use generic platform nand driver When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort". [dedekind at eru mtd-2.6]$ patch -p1 < .git/rebase-apply/patch
patching file arch/arm/mach-ep93xx/ts72xx.c
Hunk #2 succeeded at 56 with fuzz 1.
Ok, I can do things manually:
[dedekind at eru mtd-2.6]$ git update-index arch/arm/mach-ep93xx/ts72xx.c [dedekind at eru mtd-2.6]$ git am --resolved
Applying: RE: [PATCH 1/2] Update ts72xx to use generic platform nand driver
But then the second patch does not apply anyway:
[dedekind at eru mtd-2.6]$ git am ../l2-mtd-2.6.git/sweeten2
Applying: RE: [PATCH 2/2] Remove now-defunct ts7250 nand driver
error: patch failed: drivers/mtd/nand/ts7250.c:1
error: drivers/mtd/nand/ts7250.c: patch does not apply
Patch failed at 0001 RE: [PATCH 2/2] Remove now-defunct ts7250 nand driver When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". [dedekind at eru mtd-2.6]$ patch -p1 < .git/rebase-apply/patch patching file arch/arm/mach-ep93xx/include/mach/ts72xx.h patching file drivers/mtd/nand/Kconfig
patching file drivers/mtd/nand/Makefile
patching file drivers/mtd/nand/ts7250.c
Reversed (or previously applied) patch detected! Assume -R? [n] ^C
This is where I'm in the mtd-2.6.git tree, for reference.
[dedekind at eru mtd-2.6]$ git show
commit e4af3bf6334341435740fce9ff236ba814686b99
Author: Claudio Scordino <[email protected]> Date: Wed Oct 7 14:27:07 2009 +0200
mtd: atmel_nand: unused variable removed
Unused variable "eccpos" removed from atmel_nand driver.
(quoted diff) +0 -0
b/drivers/mtd/nand/atmel_nand.c
index f8e9975..4f62d20 100644
drivers/mtd/nand/atmel_nand.c +0 -0
@@ -192,7 +192,6 @@ static int atmel_nand_calculate(struct mtd_info
*mtd,
{
struct nand_chip *nand_chip = mtd->priv;
struct atmel_nand_host *host = nand_chip->priv;
- uint32_t *eccpos = nand_chip->ecc.layout->eccpos;
unsigned int ecc_value;
/* get the first 2 ECC bytes */Signature · 2 lines
Best Regards, Artem Bityutskiy (????? ????????)
PATCH 1/2 Update ts72xx to use generic platform nand driver
Quoted 17 lines · Artem Bityutskiy
Quoted 16 lines · H Hartley Sweeten
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 32MB NAND.
Signed-off-by H Hartley Sweeten <[email protected]>Tested-by Matthieu Crapet <[email protected]>Cc David Woodhouse <[email protected]>Cc Artem Bityutskiy <[email protected]>Cc <[email protected]>Cc <[email protected]>---
Quoted 7 lines
Quoted 4 lines
V2 - rebased to current mtd tree (Artem Bityutskiy)
arch/arm/mach-ep93xx/ts72xx.c | 177 +++++++++++++++++++++++++++++------------ 1 files changed, 125 insertions(+), 52 deletions(-)Ok, I've tried this patch on both mtd-2.6 and linux-2.6 git trees, and it does not apply cleanly.
[snip]
I'm really confused why this does not apply.
My mtd-2.6.git tree is at the same place as yours.
bigguiness at etch:~/src/git/mtd-2.6$ git show
commit 8032747e7680a31cdde293421af62d2e1904c528
Author: David Woodhouse <[email protected]> Date: Mon Oct 5 08:30:04 2009 +0100
mtd: make onenand_base.c compile again
drivers/mtd/onenand/onenand_base.c +3 -3
@@ -1051,7 +1051,7 @@ static int onenand_mlc_read_ops_nolock(struct mtd_info *mtd, loff_t from,int writesize = this->writesize;DEBUG (MTD_DEBUG_LEVEL3 ,"%s: from = 0x%08x, len = %i\n" , - (unsigned int ) from, (int ) len); + __func__, (unsigned int ) from, (int ) len);if (ops->mode ==MTD_OOB_AUTO ) oobsize = this->ecclayout->oobavail;
@@ -2022,8 +2022,8 @@ static int onenand_write_oob_nolock(struct mtd_info *mtd, loff_t to,if (unlikely (to >= mtd->size || column + len > ((mtd->size >> this->page_shift) - (to >> this->page_shift)) * oobsize)) { -printk (KERN_ERR "%s: Attempted to write past end of device\n" - __func__); +printk (KERN_ERR "%s: Attempted to write past end of device\n" , + __func__);return -EINVAL ; }
If I apply the two patches I get.
bigguiness at etch:~/src/git/mtd-2.6$ patch -p1 < /mnt/hgfs/share/ts72xx_plat_nand_v2.patch patching file arch/arm/mach-ep93xx/ts72xx.c
bigguiness@etch:~/src/git/mtd-2.6$ patch -p1 < /mnt/hgfs/share/ts7250_remove_v2.patch patching file arch/arm/mach-ep93xx/include/mach/ts72xx.h patching file drivers/mtd/nand/Kconfig patching file drivers/mtd/nand/Makefile patching file drivers/mtd/nand/ts7250.c
I have attached the two patches just in case it's an email issue.
Regards,
Hartley
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ts7250_remove_v2.patch
Type: application/octet-stream
Size: 7973 bytes
Desc: ts7250_remove_v2.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20091014/5bf168b2/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ts72xx_plat_nand_v2.patch
Type: application/octet-stream
Size: 6733 bytes
Desc: ts72xx_plat_nand_v2.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20091014/5bf168b2/attachment-0003.obj>
PATCH 1/2 Update ts72xx to use generic platform nand driver
Quoted 55 lines · H Hartley Sweeten
Quoted 17 lines · Artem Bityutskiy
Quoted 16 lines · H Hartley Sweeten
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 32MB NAND.
Signed-off-by H Hartley Sweeten <[email protected]>Tested-by Matthieu Crapet <[email protected]>Cc David Woodhouse <[email protected]>Cc Artem Bityutskiy <[email protected]>Cc <[email protected]>Cc <[email protected]>---
Quoted 7 lines
Quoted 4 lines
V2 - rebased to current mtd tree (Artem Bityutskiy)
arch/arm/mach-ep93xx/ts72xx.c | 177 +++++++++++++++++++++++++++++------------ 1 files changed, 125 insertions(+), 52 deletions(-)Ok, I've tried this patch on both mtd-2.6 and linux-2.6 git trees, and it does not apply cleanly.
[snip]
I'm really confused why this does not apply.
My mtd-2.6.git tree is at the same place as yours.
bigguiness at etch:~/src/git/mtd-2.6$ git show
commit8032747e7680a31cdde293421af62d2e1904c528Author: David Woodhouse <[email protected]> Date: Mon Oct 5 08:30:04 2009 +0100mtd: make
onenand_base.ccompile againSigned-off-by David Woodhouse <[email protected]>drivers/mtd/onenand/onenand_base.c +1
-1@@ -1051,7 +1051,7 @@ static int onenand_mlc_read_ops_nolock(struct mtd_info *mtd, loff_t from,int writesize = this->writesize;DEBUG (MTD_DEBUG_LEVEL3 ,"%s: from = 0x%08x, len = %i\n" , - (unsigned int ) from, (int ) len); + __func__, (unsigned int ) from, (int ) len);if (ops->mode ==MTD_OOB_AUTO ) oobsize = this->ecclayout->oobavail;
drivers/mtd/onenand/onenand_base.c static int onenand_write_oob_nolock(struct mtd_info *mtd, loff_t to, · line 2028
Quoted 9 lines
drivers/mtd/onenand/onenand_base.c +2
-2@@ -2022,8 +2022,8 @@ static int onenand_write_oob_nolock(struct mtd_info *mtd, loff_t to,if (unlikely (to >= mtd->size || column + len > ((mtd->size >> this->page_shift) - (to >> this->page_shift)) * oobsize)) { -printk (KERN_ERR "%s: Attempted to write past end of device\n" - __func__); +printk (KERN_ERR "%s: Attempted to write past end of device\n" , + __func__);return -EINVAL ; }
My git head was actually different, take a look at my previous answer.
Quoted 1 line
If I apply the two patches I get.
Could you please try to save your own e-mails, and then apply them using "git am"?
Signature · 2 lines
Best Regards, Artem Bityutskiy (????? ????????)
PATCH 1/2 Update ts72xx to use generic platform nand driver
Quoted 2 lines · Artem Bityutskiy
Could you please try to save your own e-mails, and then apply them using "git am"?
Ok, this is strange.
Quoted 4 lines · Your previous email
[dedekind at eru mtd-2.6]$ git am ../l2-mtd-2.6.git/sweeten1
Applying: RE: [PATCH 1/2] Update ts72xx to use generic platform nand driver
error: patch failed:arch/arm/mach-ep93xx/ts72xx.c:54
error:arch/arm/mach-ep93xx/ts72xx.c: patch does not apply
If I understand that error correctly, the patch failed at this line:
@@ -54,92 +56,163 @@ static struct map_desc ts72xx_io_desc[] __initdata = {
The patch was created by doing a 'git diff'. If I just is the 'diff' command it produces a completely different output. Here it is:
---
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 32MB NAND.
---
V3 - generate patch using 'diff -uprN mtd-2.6/arch/arm/mach-ep93xx/ts72xx.c{.orig,}' V2 - rebased to current mtd tree (Artem Bityutskiy)
arch/arm/mach-ep93xx/ts72xx.c renamed from arch/arm/mach-ep93xx/ts72xx.c.orig +128 -55
@@ -16,6 +16,8 @@#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 +56,163 @@ static struct map_desc ts72xx_io_desc[] } }; -static struct map_desc ts72xx_nand_io_desc[]__initdata = { - { - .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 , +static void __init ts72xx_map_io (void ) +{ +ep93xx_map_io (); +iotable_init (ts72xx_io_desc,ARRAY_SIZE (ts72xx_io_desc)); +} + + +/************************************************************************* +* 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) +{ +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 = (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 ((__raw_readb (addr) & ~0x7 ) | bits, addr); } -}; -static struct map_desc ts72xx_alternate_nand_io_desc[]__initdata = { +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[] = { { - .virtual =TS72XX_NAND_DATA_VIRT_BASE , - .pfn =__phys_to_pfn (TS72XX_NAND2_DATA_PHYS_BASE ), - .length =TS72XX_NAND_DATA_SIZE , - .type =MT_DEVICE , - }, { - .virtual =TS72XX_NAND_CONTROL_VIRT_BASE , - .pfn =__phys_to_pfn (TS72XX_NAND2_CONTROL_PHYS_BASE ), - .length =TS72XX_NAND_CONTROL_SIZE , - .type =MT_DEVICE , - }, { - .virtual =TS72XX_NAND_BUSY_VIRT_BASE , - .pfn =__phys_to_pfn (TS72XX_NAND2_BUSY_PHYS_BASE ), - .length =TS72XX_NAND_BUSY_SIZE , - .type =MT_DEVICE , - } + .name ="TS-BOOTROM" , + .offset =0 , + .size =TS72XX_BOOTROM_PART_SIZE , + .mask_flags =MTD_WRITEABLE ,/* force read-only */ + }, { + .name ="Linux" , + .offset =MTDPART_OFS_APPEND , + .size =0 ,/* filled in later */ + }, { + .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)); - -/* -* 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)); - }else { -iotable_init (ts72xx_nand_io_desc, -ARRAY_SIZE (ts72xx_nand_io_desc)); - } +/* Factory TS-72xx board only come with 32MB or 128MB NAND options */ +if (size ==SZ_32M || size ==SZ_128M ) { +/* Set the "Linux" partition size */ + ts72xx_nand_parts[1 ].size = size -TS72XX_REDBOOT_PART_SIZE ; + + chip->partitions = ts72xx_nand_parts; + chip->nr_partitions =ARRAY_SIZE (ts72xx_nand_parts); + }else { +pr_warning ("ts72xx: Unknown nand disk size:%lluMB\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, + .platform_data = &ts72xx_nor_data, }, .num_resources =1 , - .resource = &ts72xx_flash_resource, + .resource = &ts72xx_nor_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 );
PATCH 1/2 Update ts72xx to use generic platform nand driver
Quoted 1 line · H Hartley Sweeten
+
pr_warning("ts72xx: Unknown nand disk size:%lluMB\n", size >> 20);
If it's >>20, then you mean 'MiB' not 'MB'.
Signature · 1 line
dwmw2
PATCH 1/2 Update ts72xx to use generic platform nand driver
Quoted 4 lines · David Woodhouse
Quoted 1 line · H Hartley Sweeten
+
pr_warning("ts72xx: Unknown nand disk size:%lluMB\n", size >> 20);If it's >>20, then you mean 'MiB' not 'MB'.
Thanks. I will update the patch.
Stupid question... What does the 'i' stand for? I see in lib/string_helpers.c that all the units_10[] values don't have the 'i' and units_2[] do but I would like to know what it actually means.
Regards,
Hartley
PATCH 1/2 Update ts72xx to use generic platform nand driver
Quoted 3 lines · H Hartley Sweeten
Stupid question... What does the 'i' stand for? I see in
lib/string_helpers.cthat all the units_10[] values don't have the 'i' and units_2[] do but I would like to know what it actually means.
http://physics.nist.gov/cuu/Units/binary.html
Signature · 1 line
dwmw2