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

Commit 8473044d authored by Guillaume LECERF's avatar Guillaume LECERF Committed by David Woodhouse
Browse files

mtd: cfi_probe: enter Auto Select Mode after filling cfi->cfiq members 



Move the code to enter Auto Select Mode down to be able to use cfi->cfiq
members to add support for chips using alternative sequence / unlock
addresses.

Signed-off-by: default avatarGuillaume LECERF <glecerf@gmail.com>
Reviewed-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 010937ec

drivers/mtd/chips/cfi_probe.c

+24 −23
Original line number Diff line number Diff line
@@ -181,29 +181,6 @@ static int __xipram cfi_chip_setup(struct map_info *map, 
	for (i=0; i<(sizeof(struct cfi_ident) + num_erase_regions * 4); i++)

		((unsigned char *)cfi->cfiq)[i] = cfi_read_query(map,base + (0x10 + i)*ofs_factor);



	/* Note we put the device back into Read Mode BEFORE going into Auto

	 * Select Mode, as some devices support nesting of modes, others

	 * don't. This way should always work.

	 * On cmdset 0001 the writes of 0xaa and 0x55 are not needed, and

	 * so should be treated as nops or illegal (and so put the device

	 * back into Read Mode, which is a nop in this case).

	 */

	cfi_send_gen_cmd(0xf0,     0, base, map, cfi, cfi->device_type, NULL);

	cfi_send_gen_cmd(0xaa, 0x555, base, map, cfi, cfi->device_type, NULL);

	cfi_send_gen_cmd(0x55, 0x2aa, base, map, cfi, cfi->device_type, NULL);

	cfi_send_gen_cmd(0x90, 0x555, base, map, cfi, cfi->device_type, NULL);

	cfi->mfr = cfi_read_query16(map, base);

	cfi->id = cfi_read_query16(map, base + ofs_factor);



	/* Get AMD/Spansion extended JEDEC ID */

	if (cfi->mfr == CFI_MFR_AMD && (cfi->id & 0xff) == 0x7e)

		cfi->id = cfi_read_query(map, base + 0xe * ofs_factor) << 8 |

			  cfi_read_query(map, base + 0xf * ofs_factor);



	/* Put it back into Read Mode */

	cfi_qry_mode_off(base, map, cfi);

	xip_allowed(base, map);



	/* Do any necessary byteswapping */

	cfi->cfiq->P_ID = le16_to_cpu(cfi->cfiq->P_ID);
@@ -228,6 +205,30 @@ static int __xipram cfi_chip_setup(struct map_info *map, 
#endif

	}



	/*

	 * Note we put the device back into Read Mode BEFORE going into Auto

	 * Select Mode, as some devices support nesting of modes, others

	 * don't. This way should always work.

	 * On cmdset 0001 the writes of 0xaa and 0x55 are not needed, and

	 * so should be treated as nops or illegal (and so put the device

	 * back into Read Mode, which is a nop in this case).

	 */

	cfi_send_gen_cmd(0xf0,     0, base, map, cfi, cfi->device_type, NULL);

	cfi_send_gen_cmd(0xaa, 0x555, base, map, cfi, cfi->device_type, NULL);

	cfi_send_gen_cmd(0x55, 0x2aa, base, map, cfi, cfi->device_type, NULL);

	cfi_send_gen_cmd(0x90, 0x555, base, map, cfi, cfi->device_type, NULL);

	cfi->mfr = cfi_read_query16(map, base);

	cfi->id = cfi_read_query16(map, base + ofs_factor);



	/* Get AMD/Spansion extended JEDEC ID */

	if (cfi->mfr == CFI_MFR_AMD && (cfi->id & 0xff) == 0x7e)

		cfi->id = cfi_read_query(map, base + 0xe * ofs_factor) << 8 |

			  cfi_read_query(map, base + 0xf * ofs_factor);



	/* Put it back into Read Mode */

	cfi_qry_mode_off(base, map, cfi);

	xip_allowed(base, map);



	printk(KERN_INFO "%s: Found %d x%d devices at 0x%x in %d-bit bank\n",

	       map->name, cfi->interleave, cfi->device_type*8, base,

	       map->bankwidth*8);