qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-28 19:53:09 +02:00
Code

jz4740_nand: Add ident_callback

Browse Source 
Add ident_callback which is called after the nand chip has been identified and
before it is setup. This can be used by board code to set partition and ecc info
depending on the chip.
This commit is contained in:
Lars-Peter Clausen 2009-10-12 01:28:13 +02:00 committed by Xiangfu Liu
parent 7fa87373a8
commit cc05485408
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
target/linux/xburst/files-2.6.31/drivers/mtd/nand/jz4740_nand.c
View File

@ -127,7 +127,7 @@ static void jz_nand_hwctl(struct mtd_info *mtd, int mode)
} }
static int jz_nand_calculate_ecc_rs(struct mtd_info* mtd, const uint8_t* dat, static int jz_nand_calculate_ecc_rs(struct mtd_info* mtd, const uint8_t* dat,
uint8_t *ecc_code) uint8_t *ecc_code)
{ {
struct jz_nand *nand = mtd_to_jz_nand(mtd); struct jz_nand *nand = mtd_to_jz_nand(mtd);
uint32_t reg, status; uint32_t reg, status;
@ -308,7 +308,7 @@ static int __devinit jz_nand_probe(struct platform_device *pdev)
chip->ecc.size = 512; chip->ecc.size = 512;
chip->ecc.bytes = 9; chip->ecc.bytes = 9;
if (pdata) if (pdata)
chip->ecc.layout = pdata->ecc_layout; chip->ecc.layout = pdata->ecc_layout;
chip->chip_delay = 50; chip->chip_delay = 50;
chip->cmd_ctrl = jz_nand_cmd_ctrl; chip->cmd_ctrl = jz_nand_cmd_ctrl;
@ -322,25 +322,31 @@ static int __devinit jz_nand_probe(struct platform_device *pdev)
nand->pdata = pdata; nand->pdata = pdata;
platform_set_drvdata(pdev, nand); platform_set_drvdata(pdev, nand);
ret = nand_scan(mtd, 1); ret = nand_scan_ident(mtd, 1);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to scan nand\n"); dev_err(&pdev->dev, "Failed to scan nand\n");
goto err_gpio_free; goto err_gpio_free;
} }
if (pdata && pdata->ident_callback) {
pdata->ident_callback(pdev, chip, &pdata->partitions, &pdata->num_partitions);
}
ret = nand_scan_tail(mtd);
if (ret) {
dev_err(&pdev->dev, "Failed to scan nand\n");
goto err_gpio_free;
}
#ifdef CONFIG_MTD_PARTITIONS #ifdef CONFIG_MTD_PARTITIONS
#ifdef CONFIG_MTD_CMDLINE_PARTS #ifdef CONFIG_MTD_CMDLINE_PARTS
num_partitions = parse_mtd_partitions(mtd, part_probes, num_partitions = parse_mtd_partitions(mtd, part_probes,
&partition_info, 0); &partition_info, 0);
#endif
if (num_partitions <= 0 && pdata) { if (num_partitions <= 0 && pdata) {
num_partitions = pdata->num_partitions; num_partitions = pdata->num_partitions;
partition_info = pdata->partitions; partition_info = pdata->partitions;
} }
#else
if (pdata) {
num_partitions = pdata->num_partitions;
partition_info = pdata->partitions;
}
#endif
if (num_partitions > 0) if (num_partitions > 0)
ret = add_mtd_partitions(mtd, partition_info, num_partitions); ret = add_mtd_partitions(mtd, partition_info, num_partitions);
@ -349,15 +355,15 @@ static int __devinit jz_nand_probe(struct platform_device *pdev)
ret = add_mtd_device(mtd); ret = add_mtd_device(mtd);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to add mtd device\n"); dev_err(&pdev->dev, "Failed to add mtd device\n");
goto err_nand_release; goto err_nand_release;
} }
dev_info(&pdev->dev, "Successfully registered JZ4740 NAND driver\n"); dev_info(&pdev->dev, "Successfully registered JZ4740 NAND driver\n");
return 0; return 0;
err_nand_release: err_nand_release:
nand_release(&nand->mtd); nand_release(&nand->mtd);
err_gpio_free: err_gpio_free:
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
gpio_free(pdata->busy_gpio); gpio_free(pdata->busy_gpio);

5
target/linux/xburst/files-2.6.31/include/linux/mtd/jz4740_nand.h
View File

@ -25,7 +25,10 @@ struct jz_nand_platform_data {
struct nand_ecclayout *ecc_layout; struct nand_ecclayout *ecc_layout;
unsigned int busy_gpio; unsigned int busy_gpio;
void (*ident_callback)(struct platform_device *, struct nand_chip *,
struct mtd_partition **, int *num_partitions);
}; };
#endif #endif