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

Commit edb44b9b authored by Roman Tereshonkov's avatar Roman Tereshonkov Committed by David Woodhouse
Browse files

mtd: onenand: fix 4KiB page onenand chip recognition 



For 4Gib non-DDP chip it does not follow that it is always 4KiB page chip.
The number of data buffers is checked and if it is equal to 1
we suppose that it is 4KiB page onenand chip.

Signed-off-by: default avatarRoman Tereshonkov <roman.tereshonkov@nokia.com>
Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 940fe282

drivers/mtd/onenand/onenand_base.c

+3 −2
Original line number Diff line number Diff line
@@ -3365,18 +3365,19 @@ static int onenand_lock_user_prot_reg(struct mtd_info *mtd, loff_t from, 
static void onenand_check_features(struct mtd_info *mtd)

{

	struct onenand_chip *this = mtd->priv;

	unsigned int density, process;

	unsigned int density, process, numbufs;



	/* Lock scheme depends on density and process */

	density = onenand_get_density(this->device_id);

	process = this->version_id >> ONENAND_VERSION_PROCESS_SHIFT;

	numbufs = this->read_word(this->base + ONENAND_REG_NUM_BUFFERS) >> 8;



	/* Lock scheme */

	switch (density) {

	case ONENAND_DEVICE_DENSITY_4Gb:

		if (ONENAND_IS_DDP(this))

			this->options |= ONENAND_HAS_2PLANE;

		else

		else if (numbufs == 1)

			this->options |= ONENAND_HAS_4KB_PAGE;



	case ONENAND_DEVICE_DENSITY_2Gb: