Commit 50533187 authored by Boris Brezillon's avatar Boris Brezillon
Browse files

mtd: nand: jz4740: switch to mtd_ooblayout_ops 



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

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
parent e5b2d30e

arch/mips/include/asm/mach-jz4740/jz4740_nand.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ struct jz_nand_platform_data { 


	unsigned char banks[JZ_NAND_NUM_BANKS];



	void (*ident_callback)(struct platform_device *, struct nand_chip *,

	void (*ident_callback)(struct platform_device *, struct mtd_info *,

				struct mtd_partition **, int *num_partitions);

};

arch/mips/jz4740/board-qi_lb60.c

+51 −36
Original line number Diff line number Diff line
@@ -50,20 +50,6 @@ static bool is_avt2; 
#define QI_LB60_GPIO_KEYIN8		JZ_GPIO_PORTD(26)



/* NAND */

static struct nand_ecclayout qi_lb60_ecclayout_1gb = {

	.eccbytes = 36,

	.eccpos = {

		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

	},

	.oobfree = {

		{ .offset = 2, .length = 4 },

		{ .offset = 42, .length = 22 }

	},

};



/* Early prototypes of the QI LB60 had only 1GB of NAND.

 * In order to support these devices as well the partition and ecc layout is
@@ -86,25 +72,6 @@ static struct mtd_partition qi_lb60_partitions_1gb[] = { 
	},

};



static struct nand_ecclayout qi_lb60_ecclayout_2gb = {

	.eccbytes = 72,

	.eccpos = {

		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, 64, 65, 66, 67,

		68, 69, 70, 71, 72, 73, 74, 75,

		76, 77, 78, 79, 80, 81, 82, 83

	},

	.oobfree = {

		{ .offset = 2, .length = 10 },

		{ .offset = 84, .length = 44 },

	},

};



static struct mtd_partition qi_lb60_partitions_2gb[] = {

	{

		.name = "NAND BOOT partition",
@@ -123,19 +90,67 @@ static struct mtd_partition qi_lb60_partitions_2gb[] = { 
	},

};



static int qi_lb60_ooblayout_ecc(struct mtd_info *mtd, int section,

				 struct mtd_oob_region *oobregion)

{

	if (section)

		return -ERANGE;



	oobregion->length = 36;

	oobregion->offset = 6;



	if (mtd->oobsize == 128) {

		oobregion->length *= 2;

		oobregion->offset *= 2;

	}



	return 0;

}



static int qi_lb60_ooblayout_free(struct mtd_info *mtd, int section,

				  struct mtd_oob_region *oobregion)

{

	int eccbytes = 36, eccoff = 6;



	if (section > 1)

		return -ERANGE;



	if (mtd->oobsize == 128) {

		eccbytes *= 2;

		eccoff *= 2;

	}



	if (!section) {

		oobregion->offset = 2;

		oobregion->length = eccoff - 2;

	} else {

		oobregion->offset = eccoff + eccbytes;

		oobregion->length = mtd->oobsize - oobregion->offset;

	}



	return 0;

}



static const struct mtd_ooblayout_ops qi_lb60_ooblayout_ops = {

	.ecc = qi_lb60_ooblayout_ecc,

	.free = qi_lb60_ooblayout_free,

};



static void qi_lb60_nand_ident(struct platform_device *pdev,

		struct nand_chip *chip, struct mtd_partition **partitions,

		struct mtd_info *mtd, struct mtd_partition **partitions,

		int *num_partitions)

{

	struct nand_chip *chip = mtd_to_nand(mtd);



	if (chip->page_shift == 12) {

		chip->ecc.layout = &qi_lb60_ecclayout_2gb;

		*partitions = qi_lb60_partitions_2gb;

		*num_partitions = ARRAY_SIZE(qi_lb60_partitions_2gb);

	} else {

		chip->ecc.layout = &qi_lb60_ecclayout_1gb;

		*partitions = qi_lb60_partitions_1gb;

		*num_partitions = ARRAY_SIZE(qi_lb60_partitions_1gb);

	}



	mtd_set_ooblayout(mtd, &qi_lb60_ooblayout_ops);

}



static struct jz_nand_platform_data qi_lb60_nand_pdata = {

drivers/mtd/nand/jz4740_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ static int jz_nand_probe(struct platform_device *pdev) 
	}



	if (pdata && pdata->ident_callback) {

		pdata->ident_callback(pdev, chip, &pdata->partitions,

		pdata->ident_callback(pdev, mtd, &pdata->partitions,

					&pdata->num_partitions);

	}