diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2018-08-14 10:40:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-14 10:40:56 -0700 |
| commit | 5f08ebdfc80ecc40260240ac5fb4ed72aafc6381 (patch) | |
| tree | 7240a4c262ea491f1a745e9e54aec632400cda74 | |
| parent | 3700bc83b39ebbf54259d0daebbadd422452fd6b (diff) | |
| parent | d8f2a61c399dcda2170d7267b025265be1ff656e (diff) | |
Merge pull request #1115 from ladyada/master
Change hallowing to shipping flash type W25Q64JV-IQ. tested!
| -rw-r--r-- | ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.h | 2 | ||||
| -rw-r--r-- | ports/atmel-samd/external_flash/devices.h | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.h b/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.h index 618fbfbe9..34e9ac327 100644 --- a/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.h +++ b/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.h @@ -43,7 +43,7 @@ #define EXTERNAL_FLASH_DEVICE_COUNT 2 -#define EXTERNAL_FLASH_DEVICES W25Q64JV_IM, \ +#define EXTERNAL_FLASH_DEVICES W25Q64JV_IQ, \ GD25Q64C #include "external_flash/external_flash.h" diff --git a/ports/atmel-samd/external_flash/devices.h b/ports/atmel-samd/external_flash/devices.h index 330d3e3b6..87df83676 100644 --- a/ports/atmel-samd/external_flash/devices.h +++ b/ports/atmel-samd/external_flash/devices.h @@ -217,6 +217,22 @@ typedef struct { .supports_qspi_writes = true, \ } +// Settings for the Winbond W25Q64JV-IQ 8MiB SPI flash. Note that JV-IM has a different .memory_type (0x70) +// Datasheet: http://www.winbond.com/resource-files/w25q64jv%20revj%2003272018%20plus.pdf +#define W25Q64JV_IQ {\ + .total_size = (1 << 23), /* 8 MiB */ \ + .start_up_time_us = 5000, \ + .manufacturer_id = 0xef, \ + .memory_type = 0x40, \ + .capacity = 0x17, \ + .max_clock_speed_mhz = 133, \ + .has_sector_protection = false, \ + .supports_fast_read = true, \ + .supports_qspi = true, \ + .has_quad_enable = true, \ + .supports_qspi_writes = true, \ +} + // Settings for the Winbond W25Q80DL 1MiB SPI flash. // Datasheet: https://www.winbond.com/resource-files/w25q80dv%20dl_revh_10022015.pdf #define W25Q80DL {\ |