Fix cfi failure with Spansion Flash (Spansion Flash Devices have a different off…

…set to go into CFI mode)

Fix cfi failure with Spansion Flash (Spansion Flash Devices have a different off…
…set to go into CFI mode)
Stefano Babic · Wolfgang Denk
1 parent 1b3c360c23
Showing 2 changed files with 3 additions and 1 deletions Side-by-side Diff
drivers/cfi_flash.c
include/flash.h
@@ -1149,6 +1149,7 @@
 			    && flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP + 1, 'R')
 			    && flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP + 2, 'Y')) {
 				info->interface = flash_read_ushort (info, 0, FLASH_OFFSET_INTERFACE);
+				info->cfi_offset=flash_offset_cfi[cfi_offset];
 				debug ("device interface is %d\n",
 				       info->interface);
 				debug ("found port %d chip %d ",
@@ -1193,7 +1194,7 @@
 		info->vendor = flash_read_ushort (info, 0,
 					FLASH_OFFSET_PRIMARY_VENDOR);
 		flash_read_jedec_ids (info);
-		flash_write_cmd (info, 0, FLASH_OFFSET_CFI, FLASH_CMD_CFI);
+		flash_write_cmd (info, 0, info->cfi_offset, FLASH_CMD_CFI);
 		num_erase_regions = flash_read_uchar (info,
 					FLASH_OFFSET_NUM_ERASE_REGIONS);
 		info->ext_addr = flash_read_ushort (info, 0,
@@ -51,6 +51,7 @@
 	ushort	device_id2;		/* extended device id			*/
 	ushort	ext_addr;		/* extended query table address		*/
 	ushort	cfi_version;		/* cfi version				*/
+	ushort	cfi_offset;		/* offset for cfi query 		*/
 #endif
 } flash_info_t;
...	...	@@ -1149,6 +1149,7 @@
1149	1149	&& flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP + 1, 'R')
1150	1150	&& flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP + 2, 'Y')) {
1151	1151	info->interface = flash_read_ushort (info, 0, FLASH_OFFSET_INTERFACE);
	1152	+ info->cfi_offset=flash_offset_cfi[cfi_offset];
1152	1153	debug ("device interface is %d\n",
1153	1154	info->interface);
1154	1155	debug ("found port %d chip %d ",
...	...	@@ -1193,7 +1194,7 @@
1193	1194	info->vendor = flash_read_ushort (info, 0,
1194	1195	FLASH_OFFSET_PRIMARY_VENDOR);
1195	1196	flash_read_jedec_ids (info);
1196		- flash_write_cmd (info, 0, FLASH_OFFSET_CFI, FLASH_CMD_CFI);
	1197	+ flash_write_cmd (info, 0, info->cfi_offset, FLASH_CMD_CFI);
1197	1198	num_erase_regions = flash_read_uchar (info,
1198	1199	FLASH_OFFSET_NUM_ERASE_REGIONS);
1199	1200	info->ext_addr = flash_read_ushort (info, 0,
...	...	@@ -51,6 +51,7 @@
51	51	ushort device_id2; /* extended device id */
52	52	ushort ext_addr; /* extended query table address */
53	53	ushort cfi_version; /* cfi version */
	54	+ ushort cfi_offset; /* offset for cfi query */
54	55	#endif
55	56	} flash_info_t;
56	57