[MTD] jedec_probe: Fix SST 16-bit chip detection

The unlock_addr rework in kernel 2.6.25 breaks 16-bit SST chips. SST
39LF160 and SST 39VF1601 are both 16-bit only chip (do not have BYTE#
pin) and new uaddr value is not correct for them. Add
MTD_UADDR_0xAAAA_0x5555 for those chips. Tested with SST 39VF1601
chip.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

authored by

Atsushi Nemoto and committed by
David Woodhouse
ca6f12c6 f636ffb4

+10 -4
+10 -4
drivers/mtd/chips/jedec_probe.c
··· 200 MTD_UADDR_0x0555_0x0AAA, 201 MTD_UADDR_0x5555_0x2AAA, 202 MTD_UADDR_0x0AAA_0x0555, 203 MTD_UADDR_DONT_CARE, /* Requires an arbitrary address */ 204 MTD_UADDR_UNNECESSARY, /* Does not require any address */ 205 }; ··· 246 [MTD_UADDR_0x0AAA_0x0555] = { 247 .addr1 = 0x0AAA, 248 .addr2 = 0x0555 249 }, 250 251 [MTD_UADDR_DONT_CARE] = { ··· 1467 .mfr_id = MANUFACTURER_SST, /* should be CFI */ 1468 .dev_id = SST39LF160, 1469 .name = "SST 39LF160", 1470 - .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1471 - .uaddr = MTD_UADDR_0x5555_0x2AAA, /* ???? */ 1472 .dev_size = SIZE_2MiB, 1473 .cmd_set = P_ID_AMD_STD, 1474 .nr_regions = 2, ··· 1480 .mfr_id = MANUFACTURER_SST, /* should be CFI */ 1481 .dev_id = SST39VF1601, 1482 .name = "SST 39VF1601", 1483 - .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1484 - .uaddr = MTD_UADDR_0x5555_0x2AAA, /* ???? */ 1485 .dev_size = SIZE_2MiB, 1486 .cmd_set = P_ID_AMD_STD, 1487 .nr_regions = 2,
··· 200 MTD_UADDR_0x0555_0x0AAA, 201 MTD_UADDR_0x5555_0x2AAA, 202 MTD_UADDR_0x0AAA_0x0555, 203 + MTD_UADDR_0xAAAA_0x5555, 204 MTD_UADDR_DONT_CARE, /* Requires an arbitrary address */ 205 MTD_UADDR_UNNECESSARY, /* Does not require any address */ 206 }; ··· 245 [MTD_UADDR_0x0AAA_0x0555] = { 246 .addr1 = 0x0AAA, 247 .addr2 = 0x0555 248 + }, 249 + 250 + [MTD_UADDR_0xAAAA_0x5555] = { 251 + .addr1 = 0xaaaa, 252 + .addr2 = 0x5555 253 }, 254 255 [MTD_UADDR_DONT_CARE] = { ··· 1461 .mfr_id = MANUFACTURER_SST, /* should be CFI */ 1462 .dev_id = SST39LF160, 1463 .name = "SST 39LF160", 1464 + .devtypes = CFI_DEVICETYPE_X16, 1465 + .uaddr = MTD_UADDR_0xAAAA_0x5555, 1466 .dev_size = SIZE_2MiB, 1467 .cmd_set = P_ID_AMD_STD, 1468 .nr_regions = 2, ··· 1474 .mfr_id = MANUFACTURER_SST, /* should be CFI */ 1475 .dev_id = SST39VF1601, 1476 .name = "SST 39VF1601", 1477 + .devtypes = CFI_DEVICETYPE_X16, 1478 + .uaddr = MTD_UADDR_0xAAAA_0x5555, 1479 .dev_size = SIZE_2MiB, 1480 .cmd_set = P_ID_AMD_STD, 1481 .nr_regions = 2,