AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-30 23:26:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

mtd: nand: vf610: switch to mtd_ooblayout_ops

Browse Source 
Implementing the mtd_ooblayout_ops interface is the new way of exposing
ECC/OOB layout to MTD users.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Tested-by: Stefan Agner <stefan@agner.ch>
Acked-by: Stefan Agner <stefan@agner.ch>
This commit is contained in:
Boris Brezillon 2016-02-03 20:05:45 +01:00
parent c66811e6d3
commit 3cf32d1802
1 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/mtd/nand/vf610_nfc.c
View File

@ -174,34 +174,6 @@ static inline struct vf610_nfc *mtd_to_nfc(struct mtd_info *mtd)
return container_of(mtd_to_nand(mtd), struct vf610_nfc, chip); return container_of(mtd_to_nand(mtd), struct vf610_nfc, chip);
} }
static struct nand_ecclayout vf610_nfc_ecc45 = {
.eccbytes = 45,
.eccpos = {19, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 31,
32, 33, 34, 35, 36, 37, 38, 39,
40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 53, 54, 55,
56, 57, 58, 59, 60, 61, 62, 63},
.oobfree = {
{.offset = 2,
.length = 17} }
};
static struct nand_ecclayout vf610_nfc_ecc60 = {
.eccbytes = 60,
.eccpos = { 4, 5, 6, 7, 8, 9, 10, 11,
12, 13, 14, 15, 16, 17, 18, 19,
20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35,
36, 37, 38, 39, 40, 41, 42, 43,
44, 45, 46, 47, 48, 49, 50, 51,
52, 53, 54, 55, 56, 57, 58, 59,
60, 61, 62, 63 },
.oobfree = {
{.offset = 2,
.length = 2} }
};
static inline u32 vf610_nfc_read(struct vf610_nfc *nfc, uint reg) static inline u32 vf610_nfc_read(struct vf610_nfc *nfc, uint reg)
{ {
return readl(nfc->regs + reg); return readl(nfc->regs + reg);
@ -780,14 +752,16 @@ static int vf610_nfc_probe(struct platform_device *pdev)
if (mtd->oobsize > 64) if (mtd->oobsize > 64)
mtd->oobsize = 64; mtd->oobsize = 64;
/*
* mtd->ecclayout is not specified here because we're using the
* default large page ECC layout defined in NAND core.
*/
if (chip->ecc.strength == 32) { if (chip->ecc.strength == 32) {
nfc->ecc_mode = ECC_60_BYTE; nfc->ecc_mode = ECC_60_BYTE;
chip->ecc.bytes = 60; chip->ecc.bytes = 60;
chip->ecc.layout = &vf610_nfc_ecc60;
} else if (chip->ecc.strength == 24) { } else if (chip->ecc.strength == 24) {
nfc->ecc_mode = ECC_45_BYTE; nfc->ecc_mode = ECC_45_BYTE;
chip->ecc.bytes = 45; chip->ecc.bytes = 45;
chip->ecc.layout = &vf610_nfc_ecc45;
} else { } else {
dev_err(nfc->dev, "Unsupported ECC strength\n"); dev_err(nfc->dev, "Unsupported ECC strength\n");
err = -ENXIO; err = -ENXIO;