Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fd02d10 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mtd: msm_qpic_nand: get ecc correctable bits"

parents 9fc9a214 1ebb5681

drivers/mtd/devices/msm_qpic_nand.c

+4 −0
Original line number Diff line number Diff line
@@ -2382,6 +2382,10 @@ int msm_nand_scan(struct mtd_info *mtd) 
			supported_flash->pagesize = flashdev->pagesize;

			supported_flash->blksize = flashdev->erasesize;

			supported_flash->oobsize = flashdev->oobsize;

			supported_flash->ecc_correctability =

					flashdev->ecc_correctable_bits;

			if (!flashdev->ecc_correctable_bits)

				pr_err("num ecc correctable bit not specified and defaults to 4 bit BCH\n");

		}

		supported_flash->flash_id = flash_id;

		supported_flash->density = ((uint64_t)flashdev->chipsize) << 20;

drivers/mtd/nand/nand_ids.c

+3 −3
Original line number Diff line number Diff line
@@ -33,13 +33,13 @@ struct nand_flash_dev nand_flash_ids[] = { 
	 */

	{"TC58NYG1S3H 2G 1.8V 8-bit",

		{ .id = {0x98, 0xaa, 0x90, 0x15, 0x00, 0x00, 0x00, 0x00} },

		  SZ_2K, SZ_256, SZ_128K, 0, 4, 128},

		  SZ_2K, SZ_256, SZ_128K, 0, 4, 128, 8},

	{"MT29F4G08ABBDAHC 4G 3.3V 8-bit",

		{ .id = {0x2c, 0xac, 0x90, 0x15, 0x00, 0x00, 0x00, 0x00} },

		  SZ_2K, SZ_512, SZ_128K, 0, 4, 64},

		  SZ_2K, SZ_512, SZ_128K, 0, 4, 64, 4},

	{"MT29RZ4B2DZZHGSK 4G 3.3V 8-bit",

		{ .id = {0x2c, 0xac, 0x90, 0x26, 0x00, 0x00, 0x00, 0x00} },

		  SZ_4K, SZ_512, SZ_256K, 0, 4, 224},

		  SZ_4K, SZ_512, SZ_256K, 0, 4, 224, 8},

	{"TC58NVG2S0F 4G 3.3V 8-bit",

		{ .id = {0x98, 0xdc, 0x90, 0x26, 0x76, 0x15, 0x01, 0x08} },

		  SZ_4K, SZ_512, SZ_256K, 0, 8, 224},

include/linux/mtd/nand.h

+1 −0
Original line number Diff line number Diff line
@@ -610,6 +610,7 @@ struct nand_flash_dev { 
	unsigned int options;

	uint16_t id_len;

	uint16_t oobsize;

	unsigned int ecc_correctable_bits;

};



/**