summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2015-11-20 20:36:03 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2015-11-23 08:00:09 +0100
commit0ba69063096e721ef144589d5fd31cff2f995422 (patch)
tree418cf2104c68baebbf3a8fa23f62053a9a24ef72 /drivers
parent81a0cfce8d2ccf85bfaaef4c0f2b450f0329d9bb (diff)
downloadbarebox-0ba69063096e721ef144589d5fd31cff2f995422.tar.gz
barebox-0ba69063096e721ef144589d5fd31cff2f995422.tar.xz
mtd: nand_mrvl_nfc: Fix num-cs property parsing
The "num-cs" property does not encode flashes CS line but number of available CS signals. Fix wrong property parsing to ->cs by adding proper ->num_cs variable to host struct. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/nand/nand_mrvl_nfc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nand_mrvl_nfc.c b/drivers/mtd/nand/nand_mrvl_nfc.c
index 95abd4ddf2..5374e64965 100644
--- a/drivers/mtd/nand/nand_mrvl_nfc.c
+++ b/drivers/mtd/nand/nand_mrvl_nfc.c
@@ -153,6 +153,7 @@ struct mrvl_nand_host {
int ecc_strength;
int ecc_step;
+ int num_cs; /* avaiable CS signals */
int cs; /* selected chip 0/1 */
int use_ecc; /* use HW ECC ? */
int use_spare; /* use spare ? */
@@ -929,6 +930,7 @@ static struct mrvl_nand_host *alloc_nand_resource(struct device_d *dev)
pdata = dev->platform_data;
host = xzalloc(sizeof(*host));
+ host->num_cs = 1;
host->cs = 0;
mtd = &host->mtd;
mtd->priv = &host->chip;
@@ -988,7 +990,7 @@ static int mrvl_nand_probe_dt(struct mrvl_nand_host *host)
if (of_get_property(np, "marvell,nand-keep-config", NULL))
host->keep_config = 1;
- of_property_read_u32(np, "num-cs", &host->cs);
+ of_property_read_u32(np, "num-cs", &host->num_cs);
if (of_get_nand_on_flash_bbt(np))
host->flash_bbt = 1;