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

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

mtd: cfi_probe: make the addresses used to enter Auto Select Mode variable 



Make the addresses used to enter Auto Select Mode variable to leave place
for handling chips using non-standard 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 8473044d

drivers/mtd/chips/cfi_probe.c

+4 −3
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ static int __xipram cfi_chip_setup(struct map_info *map, 
	__u32 base = 0;

	int num_erase_regions = cfi_read_query(map, base + (0x10 + 28)*ofs_factor);

	int i;

	int addr_unlock1 = 0x555, addr_unlock2 = 0x2AA;



	xip_enable(base, map, cfi);

#ifdef DEBUG_CFI
@@ -214,9 +215,9 @@ static int __xipram cfi_chip_setup(struct map_info *map, 
	 * 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_send_gen_cmd(0xaa, addr_unlock1, base, map, cfi, cfi->device_type, NULL);

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

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

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

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