summaryrefslogtreecommitdiff
path: root/include/linux/fsl_ifc.h
diff options
context:
space:
mode:
authorMark Marshall <mark.marshall@omicronenergy.com>2017-01-26 18:18:27 +0300
committerBoris Brezillon <boris.brezillon@free-electrons.com>2017-02-06 10:54:01 +0300
commit656441478ed55d960df5f3ccdf5a0f8c61dfd0b3 (patch)
tree53489d3b2f6e4d81678336528638c7bd70ec3a93 /include/linux/fsl_ifc.h
parent07f76443ef81e2b76bb6f7858ba183cd60357ada (diff)
downloadlinux-656441478ed55d960df5f3ccdf5a0f8c61dfd0b3.tar.xz
mtd: nand: ifc: Fix location of eccstat registers for IFC V1.0
The commit 7a654172161c ("mtd/ifc: Add support for IFC controller version 2.0") added support for version 2.0 of the IFC controller. The version 2.0 controller has the ECC status registers at a different location to the previous versions. Correct the fsl_ifc_nand structure so that the ECC status can be read from the correct location for both version 1.0 and 2.0 of the controller. Cc: stable@vger.kernel.org Fixes: 7a654172161c ("mtd/ifc: Add support for IFC controller version 2.0") Signed-off-by: Mark Marshall <mark.marshall@omicronenergy.com> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Diffstat (limited to 'include/linux/fsl_ifc.h')
-rw-r--r--include/linux/fsl_ifc.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/fsl_ifc.h b/include/linux/fsl_ifc.h
index 3f9778cbc79d..c332f0a45607 100644
--- a/include/linux/fsl_ifc.h
+++ b/include/linux/fsl_ifc.h
@@ -733,8 +733,12 @@ struct fsl_ifc_nand {
__be32 nand_erattr1;
u32 res19[0x10];
__be32 nand_fsr;
- u32 res20[0x3];
- __be32 nand_eccstat[6];
+ u32 res20;
+ /* The V1 nand_eccstat is actually 4 words that overlaps the
+ * V2 nand_eccstat.
+ */
+ __be32 v1_nand_eccstat[2];
+ __be32 v2_nand_eccstat[6];
u32 res21[0x1c];
__be32 nanndcr;
u32 res22[0x2];