diff options
| author | martin coulon <martinusbe@gmail.com> | 2018-07-11 23:20:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-11 23:20:51 +0200 |
| commit | 14c6f2d81a3d3f0ab7e3a8a73714d16a64bd420d (patch) | |
| tree | 9216b5b9335d52a6134c26b5bf54ef2e5c7fdf13 /drivers/mtd/nand/mxc_nand.c | |
| parent | 32769b627546b549eaaa5e60dfa761a38f87da88 (diff) | |
| parent | 29b340530c2f792a824afdbcd3b1cc0a47e9b631 (diff) | |
Merge 3.18.115 into 8.1
Diffstat (limited to 'drivers/mtd/nand/mxc_nand.c')
| -rw-r--r-- | drivers/mtd/nand/mxc_nand.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index dba262bf766f..7cf0473c79e8 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c @@ -49,7 +49,7 @@ #define NFC_V1_V2_CONFIG (host->regs + 0x0a) #define NFC_V1_V2_ECC_STATUS_RESULT (host->regs + 0x0c) #define NFC_V1_V2_RSLTMAIN_AREA (host->regs + 0x0e) -#define NFC_V1_V2_RSLTSPARE_AREA (host->regs + 0x10) +#define NFC_V21_RSLTSPARE_AREA (host->regs + 0x10) #define NFC_V1_V2_WRPROT (host->regs + 0x12) #define NFC_V1_UNLOCKSTART_BLKADDR (host->regs + 0x14) #define NFC_V1_UNLOCKEND_BLKADDR (host->regs + 0x16) @@ -958,6 +958,9 @@ static void preset_v2(struct mtd_info *mtd) writew(config1, NFC_V1_V2_CONFIG1); /* preset operation */ + /* spare area size in 16-bit half-words */ + writew(mtd->oobsize / 2, NFC_V21_RSLTSPARE_AREA); + /* Unlock the internal RAM Buffer */ writew(0x2, NFC_V1_V2_CONFIG); |