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