Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 153797
b: refs/heads/master
c: f36e20c
h: refs/heads/master
i:
  153795: 7e6c680
v: v3
  • Loading branch information
H Hartley Sweeten authored and David Woodhouse committed Jun 5, 2009
1 parent d3def60 commit 40b9ab7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bf95efd41b1a760128eb25402791b0a4941eb655
refs/heads/master: f36e20c01ad0104688f2eaebdf2213e749929c97
2 changes: 2 additions & 0 deletions trunk/drivers/mtd/nand/plat_nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ static int __devinit plat_nand_probe(struct platform_device *pdev)
return 0;
}
}
if (pdata->chip.set_parts)
pdata->chip.set_parts(data->mtd.size, &pdata->chip);
if (pdata->chip.partitions) {
data->parts = pdata->chip.partitions;
res = add_mtd_partitions(&data->mtd, data->parts,
Expand Down
3 changes: 3 additions & 0 deletions trunk/include/linux/mtd/nand.h
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,7 @@ extern int nand_do_read(struct mtd_info *mtd, loff_t from, size_t len,
* @options: Option flags, e.g. 16bit buswidth
* @ecclayout: ecc layout info structure
* @part_probe_types: NULL-terminated array of probe types
* @set_parts: platform specific function to set partitions
* @priv: hardware controller specific settings
*/
struct platform_nand_chip {
Expand All @@ -574,6 +575,8 @@ struct platform_nand_chip {
int chip_delay;
unsigned int options;
const char **part_probe_types;
void (*set_parts)(uint64_t size,
struct platform_nand_chip *chip);
void *priv;
};

Expand Down

0 comments on commit 40b9ab7

Please sign in to comment.