leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MTD] [NAND] pxa3xx_nand: allow to define flash types in the platform data

Browse Source 
This patch adds 'flash' and 'num_flash' attributes to the platform data.
There was added code in the driver to iterate across these attributes in the
detect-flash routine.  This is done similarly to the existing method
which uses a 'builtin_flash_types' field.

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Enrico Scholz 2008-08-29 12:59:48 +02:00 committed by David Woodhouse
parent 43035338ad
commit c8ac3f818e
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-pxa/include/mach/pxa3xx_nand.h
View File

@ -58,6 +58,9 @@ struct pxa3xx_nand_platform_data {
struct mtd_partition *parts; struct mtd_partition *parts;
unsigned int nr_parts; unsigned int nr_parts;
struct pxa3xx_nand_flash * const flash;
size_t num_flash;
}; };
extern void pxa3xx_set_nand_info(struct pxa3xx_nand_platform_data *info); extern void pxa3xx_set_nand_info(struct pxa3xx_nand_platform_data *info);

18
drivers/mtd/nand/pxa3xx_nand.c
View File

@ -911,12 +911,26 @@ static int pxa3xx_nand_config_flash(struct pxa3xx_nand_info *info,
return 0; return 0;
} }
static int pxa3xx_nand_detect_flash(struct pxa3xx_nand_info *info) static int pxa3xx_nand_detect_flash(struct pxa3xx_nand_info *info,
const struct pxa3xx_nand_platform_data *pdata)
{ {
struct pxa3xx_nand_flash *f; struct pxa3xx_nand_flash *f;
uint32_t id; uint32_t id;
int i; int i;
for (i = 0; i<pdata->num_flash; ++i) {
f = pdata->flash + i;
if (pxa3xx_nand_config_flash(info, f))
continue;
if (__readid(info, &id))
continue;
if (id == f->chip_id)
return 0;
}
for (i = 0; i < ARRAY_SIZE(builtin_flash_types); i++) { for (i = 0; i < ARRAY_SIZE(builtin_flash_types); i++) {
f = builtin_flash_types[i]; f = builtin_flash_types[i];
@ -1114,7 +1128,7 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
goto fail_free_buf; goto fail_free_buf;
} }
ret = pxa3xx_nand_detect_flash(info); ret = pxa3xx_nand_detect_flash(info, pdata);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to detect flash\n"); dev_err(&pdev->dev, "failed to detect flash\n");
ret = -ENODEV; ret = -ENODEV;