From 757bdbef97350a858a49c73e7e01384230f91d0c Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 30 Apr 2012 19:30:47 +0200 Subject: [PATCH] --- yaml --- r: 310217 b: refs/heads/master c: b4f7aa84d6ff44327ab91a2973ebf0c2a7797d24 h: refs/heads/master i: 310215: 3c4ef05d77381f9351be7e5dd12537909012163c v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/plat_nand.c | 1 + trunk/include/linux/mtd/nand.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 51f16bf1d853..5f3e0835572d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4f203512be974dbd7425f8f1d3d40720bf36997 +refs/heads/master: b4f7aa84d6ff44327ab91a2973ebf0c2a7797d24 diff --git a/trunk/drivers/mtd/nand/plat_nand.c b/trunk/drivers/mtd/nand/plat_nand.c index fd2d2a1b78ba..1bcb52040422 100644 --- a/trunk/drivers/mtd/nand/plat_nand.c +++ b/trunk/drivers/mtd/nand/plat_nand.c @@ -79,6 +79,7 @@ static int __devinit plat_nand_probe(struct platform_device *pdev) data->chip.select_chip = pdata->ctrl.select_chip; data->chip.write_buf = pdata->ctrl.write_buf; data->chip.read_buf = pdata->ctrl.read_buf; + data->chip.read_byte = pdata->ctrl.read_byte; data->chip.chip_delay = pdata->chip.chip_delay; data->chip.options |= pdata->chip.options; data->chip.bbt_options |= pdata->chip.bbt_options; diff --git a/trunk/include/linux/mtd/nand.h b/trunk/include/linux/mtd/nand.h index 627f0c575ac4..94a6679bfc2e 100644 --- a/trunk/include/linux/mtd/nand.h +++ b/trunk/include/linux/mtd/nand.h @@ -654,6 +654,7 @@ struct platform_nand_ctrl { void (*cmd_ctrl)(struct mtd_info *mtd, int dat, unsigned int ctrl); void (*write_buf)(struct mtd_info *mtd, const uint8_t *buf, int len); void (*read_buf)(struct mtd_info *mtd, uint8_t *buf, int len); + unsigned char (*read_byte)(struct mtd_info *mtd); void *priv; };