diff options
| author | ian <ian@FreeBSD.org> | 2014-05-14 18:16:32 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2014-05-14 18:16:32 +0000 |
| commit | 0fce07b314e30ad58f2ceca66ff72537964c8b06 (patch) | |
| tree | 172e26cbf159da0d998392f540aa3d6d2f6eefcc /sys/dev/nand | |
| parent | 835175f3b80497bad3d7472e919302dbaf94c287 (diff) | |
| download | FreeBSD-src-0fce07b314e30ad58f2ceca66ff72537964c8b06.zip FreeBSD-src-0fce07b314e30ad58f2ceca66ff72537964c8b06.tar.gz | |
MFC r260092, r260093, r260121, r260180,
Allow AT91_MCI_ALLOW_OVERCLOCK to be an option in kernel config files.
Set the SoC name for the atmelbus name.
Add support for Samsung K9F2G08U0A (256MiB SLC) NAND
Comment updates.
Diffstat (limited to 'sys/dev/nand')
| -rw-r--r-- | sys/dev/nand/nand_id.c | 2 | ||||
| -rw-r--r-- | sys/dev/nand/nandbus.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/nand/nand_id.c b/sys/dev/nand/nand_id.c index 8900808..2b90eea 100644 --- a/sys/dev/nand/nand_id.c +++ b/sys/dev/nand/nand_id.c @@ -39,6 +39,8 @@ struct nand_params nand_ids[] = { 0x400, 0x800, 0x40, 0x40, 0 }, { { NAND_MAN_SAMSUNG, 0xdc }, "Samsung NAND 512MiB 3,3V 8-bit", 0x200, 0x800, 0x40, 0x40, 0 }, + { { NAND_MAN_SAMSUNG, 0xda }, "Samsung NAND 256MiB 3,3V 8-bit", + 0x100, 0x800, 0x40, 0x40, 0 }, { { NAND_MAN_HYNIX, 0x76 }, "Hynix NAND 64MiB 3,3V 8-bit", 0x40, 0x200, 0x10, 0x20, 0 }, { { NAND_MAN_HYNIX, 0xdc }, "Hynix NAND 512MiB 3,3V 8-bit", diff --git a/sys/dev/nand/nandbus.c b/sys/dev/nand/nandbus.c index fe77b62..893b628 100644 --- a/sys/dev/nand/nandbus.c +++ b/sys/dev/nand/nandbus.c @@ -503,7 +503,7 @@ nandbus_wait_ready(device_t dev, uint8_t *status) struct timeval tv, tv2; tv2.tv_sec = 0; - tv2.tv_usec = 50 * 5000; /* 10ms */ + tv2.tv_usec = 50 * 5000; /* 250ms */ getmicrotime(&tv); timevaladd(&tv, &tv2); |
