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

Commit de7921f0 authored by Bartlomiej Sieka's avatar Bartlomiej Sieka Committed by David Woodhouse
Browse files

[MTD] [NOR] Fix incorrect interface code for x16/x32 chips 



According to "Common Flash Memory Interface Publication 100" dated December 1,
2001, the interface code for x16/x32 chips is 0x0005, and not 0x0004 used so
far.

Signed-off-by: default avatarBartlomiej Sieka <tur@semihalf.com>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 78b65179

drivers/mtd/chips/cfi_cmdset_0002.c

+4 −2
Original line number Diff line number Diff line
@@ -342,10 +342,12 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary) 
		/* Modify the unlock address if we are in compatibility mode */

		if (	/* x16 in x8 mode */

			((cfi->device_type == CFI_DEVICETYPE_X8) &&

				(cfi->cfiq->InterfaceDesc == 2)) ||

				(cfi->cfiq->InterfaceDesc ==

					CFI_INTERFACE_X8_BY_X16_ASYNC)) ||

			/* x32 in x16 mode */

			((cfi->device_type == CFI_DEVICETYPE_X16) &&

				(cfi->cfiq->InterfaceDesc == 4)))

				(cfi->cfiq->InterfaceDesc ==

					CFI_INTERFACE_X16_BY_X32_ASYNC)))

		{

			cfi->addr_unlock1 = 0xaaa;

			cfi->addr_unlock2 = 0x555;

drivers/mtd/chips/cfi_probe.c

+6 −6
Original line number Diff line number Diff line
@@ -370,27 +370,27 @@ static void print_cfi_ident(struct cfi_ident *cfip) 
	printk("Device size: 0x%X bytes (%d MiB)\n", 1 << cfip->DevSize, 1<< (cfip->DevSize - 20));

	printk("Flash Device Interface description: 0x%4.4X\n", cfip->InterfaceDesc);

	switch(cfip->InterfaceDesc) {

	case 0:

	case CFI_INTERFACE_X8_ASYNC:

		printk("  - x8-only asynchronous interface\n");

		break;



	case 1:

	case CFI_INTERFACE_X16_ASYNC:

		printk("  - x16-only asynchronous interface\n");

		break;



	case 2:

	case CFI_INTERFACE_X8_BY_X16_ASYNC:

		printk("  - supports x8 and x16 via BYTE# with asynchronous interface\n");

		break;



	case 3:

	case CFI_INTERFACE_X32_ASYNC:

		printk("  - x32-only asynchronous interface\n");

		break;



	case 4:

	case CFI_INTERFACE_X16_BY_X32_ASYNC:

		printk("  - supports x16 and x32 via Word# with asynchronous interface\n");

		break;



	case 65535:

	case CFI_INTERFACE_NOT_ALLOWED:

		printk("  - Not Allowed / Reserved\n");

		break;

drivers/mtd/maps/scb2_flash.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ scb2_fixup_mtd(struct mtd_info *mtd) 
	struct cfi_private *cfi = map->fldrv_priv;



	/* barf if this doesn't look right */

	if (cfi->cfiq->InterfaceDesc != 1) {

	if (cfi->cfiq->InterfaceDesc != CFI_INTERFACE_X16_ASYNC) {

		printk(KERN_ERR MODNAME ": unsupported InterfaceDesc: %#x\n",

		    cfi->cfiq->InterfaceDesc);

		return -1;

include/linux/mtd/cfi.h

+12 −0
Original line number Diff line number Diff line
@@ -98,6 +98,18 @@ static inline int cfi_interleave_supported(int i) 
#define CFI_DEVICETYPE_X32 (32 / 8)

#define CFI_DEVICETYPE_X64 (64 / 8)





/* Device Interface Code Assignments from the "Common Flash Memory Interface

 * Publication 100" dated December 1, 2001.

 */

#define CFI_INTERFACE_X8_ASYNC		0x0000

#define CFI_INTERFACE_X16_ASYNC		0x0001

#define CFI_INTERFACE_X8_BY_X16_ASYNC	0x0002

#define CFI_INTERFACE_X32_ASYNC		0x0003

#define CFI_INTERFACE_X16_BY_X32_ASYNC	0x0005

#define CFI_INTERFACE_NOT_ALLOWED	0xffff





/* NB: We keep these structures in memory in HOST byteorder, except

 * where individually noted.

 */