summaryrefslogtreecommitdiff
path: root/drivers/mtd/nand/am335x_spl_bch.c
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-06-08 09:14:19 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-06-08 09:14:19 +0200
commit5ed28948a3ffe6c735386e59c132989869beaa3e (patch)
treecbb940a4fa90b89abdd57d6b13d64351cfce839c /drivers/mtd/nand/am335x_spl_bch.c
parente6607cffef965011ef0ddc0fbe6f4b7c0d53aeec (diff)
parent83bad1026b9e3a4f6b7783cc1cbb434c1bbd3fa2 (diff)
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/mtd/nand/am335x_spl_bch.c')
-rw-r--r--drivers/mtd/nand/am335x_spl_bch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/am335x_spl_bch.c b/drivers/mtd/nand/am335x_spl_bch.c
index bd89b067d5..ce65d8e12b 100644
--- a/drivers/mtd/nand/am335x_spl_bch.c
+++ b/drivers/mtd/nand/am335x_spl_bch.c
@@ -55,7 +55,7 @@ static int nand_command(int block, int page, uint32_t offs,
}
/* Shift the offset from byte addressing to word addressing. */
- if (this->options & NAND_BUSWIDTH_16)
+ if ((this->options & NAND_BUSWIDTH_16) && !nand_opcode_8bits(cmd))
offs >>= 1;
/* Set ALE and clear CLE to start address cycle */