diff --git a/[refs] b/[refs] index 45db9c6523f6..40e9af752735 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3611570ddf601609f8803574ea83889ff969aa0 +refs/heads/master: eedfea252690435858722a8da1109d104d639087 diff --git a/trunk/arch/arm/plat-orion/include/plat/orion_nand.h b/trunk/arch/arm/plat-orion/include/plat/orion_nand.h index d6a4cfa37785..9f3c180834d1 100644 --- a/trunk/arch/arm/plat-orion/include/plat/orion_nand.h +++ b/trunk/arch/arm/plat-orion/include/plat/orion_nand.h @@ -14,6 +14,7 @@ */ struct orion_nand_data { struct mtd_partition *parts; + int (*dev_ready)(struct mtd_info *mtd); u32 nr_parts; u8 ale; /* address line number connected to ALE */ u8 cle; /* address line number connected to CLE */ diff --git a/trunk/drivers/mtd/nand/orion_nand.c b/trunk/drivers/mtd/nand/orion_nand.c index f4444fe960a1..da6e75343052 100644 --- a/trunk/drivers/mtd/nand/orion_nand.c +++ b/trunk/drivers/mtd/nand/orion_nand.c @@ -126,6 +126,9 @@ static int __init orion_nand_probe(struct platform_device *pdev) if (board->width == 16) nc->options |= NAND_BUSWIDTH_16; + if (board->dev_ready) + nc->dev_ready = board->dev_ready; + platform_set_drvdata(pdev, mtd); if (nand_scan(mtd, 1)) {