Skip to content

Commit 00eacbf

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#692 from tannewt/latest_m4
Add support for the Metro M4 Rev F and make the SPI flash code more robust
2 parents 0c4bbef + 06b4c83 commit 00eacbf

7 files changed

Lines changed: 59 additions & 20 deletions

File tree

‎ports/atmel-samd/boards/metro_m4_express/mpconfigboard.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33

44
#define CIRCUITPY_MCU_FAMILY samd51
55

6-
// This is for Rev D which is light blue
6+
// This is for Rev F which is green
77

88
#define MICROPY_HW_LED_TX PIN_PA27
99
#define MICROPY_HW_LED_RX PIN_PB06
1010

11-
#define MICROPY_HW_NEOPIXEL (&pin_PB17)
11+
#define MICROPY_HW_NEOPIXEL (&pin_PB22)
1212

1313
// These are pins not to reset.
1414
// QSPI Data pins and TX LED
1515
#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11 | PORT_PA27)
1616
// RX LED, QSPI CS, QSPI SCK and NeoPixel pin
17-
#define MICROPY_PORT_B ( PORT_PB06 | PORT_PB10 | PORT_PB11 | PORT_PB17)
17+
#define MICROPY_PORT_B ( PORT_PB06 | PORT_PB10 | PORT_PB11 | PORT_PB22)
1818
#define MICROPY_PORT_C (0)
1919
#define MICROPY_PORT_D (0)
2020

‎ports/atmel-samd/boards/metro_m4_express/pins.c‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,37 @@ STATIC const mp_map_elem_t board_global_dict_table[] = {
77
{ MP_OBJ_NEW_QSTR(MP_QSTR_A0), (mp_obj_t)&pin_PA02 },
88
{ MP_OBJ_NEW_QSTR(MP_QSTR_A1), (mp_obj_t)&pin_PA05 },
99
{ MP_OBJ_NEW_QSTR(MP_QSTR_A2), (mp_obj_t)&pin_PA06 },
10-
{ MP_OBJ_NEW_QSTR(MP_QSTR_A3), (mp_obj_t)&pin_PB09 },
10+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A3), (mp_obj_t)&pin_PA04 },
1111
{ MP_OBJ_NEW_QSTR(MP_QSTR_A4), (mp_obj_t)&pin_PB08 },
12-
{ MP_OBJ_NEW_QSTR(MP_QSTR_A5), (mp_obj_t)&pin_PA07 },
13-
12+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A5), (mp_obj_t)&pin_PB09 },
1413

1514
{ MP_OBJ_NEW_QSTR(MP_QSTR_D0), (mp_obj_t)&pin_PA23 },
1615
{ MP_OBJ_NEW_QSTR(MP_QSTR_RX), (mp_obj_t)&pin_PA23 },
1716
{ MP_OBJ_NEW_QSTR(MP_QSTR_D1), (mp_obj_t)&pin_PA22 },
1817
{ MP_OBJ_NEW_QSTR(MP_QSTR_TX), (mp_obj_t)&pin_PA22 },
19-
{ MP_OBJ_NEW_QSTR(MP_QSTR_D2), (mp_obj_t)&pin_PA04 },
18+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D2), (mp_obj_t)&pin_PB17 },
2019
{ MP_OBJ_NEW_QSTR(MP_QSTR_D3), (mp_obj_t)&pin_PB16 },
2120
{ MP_OBJ_NEW_QSTR(MP_QSTR_D4), (mp_obj_t)&pin_PB13 },
2221
{ MP_OBJ_NEW_QSTR(MP_QSTR_D5), (mp_obj_t)&pin_PB14 },
2322
{ MP_OBJ_NEW_QSTR(MP_QSTR_D6), (mp_obj_t)&pin_PB15 },
24-
{ MP_OBJ_NEW_QSTR(MP_QSTR_D7), (mp_obj_t)&pin_PA14 },
25-
{ MP_OBJ_NEW_QSTR(MP_QSTR_D8), (mp_obj_t)&pin_PA16 },
26-
{ MP_OBJ_NEW_QSTR(MP_QSTR_D9), (mp_obj_t)&pin_PA17 },
23+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D7), (mp_obj_t)&pin_PB12 },
24+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D8), (mp_obj_t)&pin_PA21 },
25+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D9), (mp_obj_t)&pin_PA20 },
2726
{ MP_OBJ_NEW_QSTR(MP_QSTR_D10), (mp_obj_t)&pin_PA18 },
2827
{ MP_OBJ_NEW_QSTR(MP_QSTR_D11), (mp_obj_t)&pin_PA19 },
29-
{ MP_OBJ_NEW_QSTR(MP_QSTR_D12), (mp_obj_t)&pin_PA20 },
30-
{ MP_OBJ_NEW_QSTR(MP_QSTR_D13), (mp_obj_t)&pin_PA21 },
28+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D12), (mp_obj_t)&pin_PA17 },
29+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D13), (mp_obj_t)&pin_PA16 },
3130

3231
{ MP_OBJ_NEW_QSTR(MP_QSTR_SDA), (mp_obj_t)&pin_PB02 },
3332
{ MP_OBJ_NEW_QSTR(MP_QSTR_SCL), (mp_obj_t)&pin_PB03 },
3433

35-
{ MP_OBJ_NEW_QSTR(MP_QSTR_NEOPIXEL), (mp_obj_t)&pin_PB17 },
34+
{ MP_OBJ_NEW_QSTR(MP_QSTR_AREF), (mp_obj_t)&pin_PA03 },
35+
36+
{ MP_OBJ_NEW_QSTR(MP_QSTR_NEOPIXEL), (mp_obj_t)&pin_PB22 },
3637

3738
{ MP_OBJ_NEW_QSTR(MP_QSTR_SCK), (mp_obj_t)&pin_PA13 },
3839
{ MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), (mp_obj_t)&pin_PA12 },
39-
{ MP_OBJ_NEW_QSTR(MP_QSTR_MISO), (mp_obj_t)&pin_PA15 },
40+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MISO), (mp_obj_t)&pin_PA14 },
4041

4142
{ MP_OBJ_NEW_QSTR(MP_QSTR_LED_RX), (mp_obj_t)&pin_PB06 },
4243
{ MP_OBJ_NEW_QSTR(MP_QSTR_LED_TX), (mp_obj_t)&pin_PA27 },

‎ports/atmel-samd/external_flash/common_commands.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@
3535
#define CMD_PAGE_PROGRAM 0x02
3636
// #define CMD_PAGE_PROGRAM CMD_READ_JEDEC_ID
3737
#define CMD_READ_STATUS 0x05
38+
#define CMD_READ_STATUS2 0x35
3839
#define CMD_WRITE_STATUS_BYTE1 0x01
3940
#define CMD_QUAD_READ 0x6b
41+
#define CMD_ENABLE_RESET 0x66
42+
#define CMD_RESET 0x99
4043

4144
#endif // MICROPY_INCLUDED_ATMEL_SAMD_EXTERNAL_FLASH_COMMON_COMMANDS_H

‎ports/atmel-samd/external_flash/external_flash.c‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,15 @@ void external_flash_init(void) {
199199

200200
spi_flash_init();
201201

202+
// The response will be 0xff if the flash needs more time to start up.
203+
uint8_t jedec_id_response[3] = {0xff, 0xff, 0xff};
204+
while (jedec_id_response[0] == 0xff) {
205+
spi_flash_read_command(CMD_READ_JEDEC_ID, jedec_id_response, 3);
206+
}
207+
202208
for (uint8_t i = 0; i < num_possible_devices; i++) {
203209
const external_flash_device* possible_device = &possible_devices[i];
204-
uint8_t jedec_id_response[3] = {0x00, 0x00, 0x00};
205-
spi_flash_read_command(CMD_READ_JEDEC_ID, jedec_id_response, 3);
210+
206211
if (jedec_id_response[0] == possible_device->manufacturer_id &&
207212
jedec_id_response[1] == possible_device->memory_type &&
208213
jedec_id_response[2] == possible_device->capacity) {
@@ -215,6 +220,26 @@ void external_flash_init(void) {
215220
return;
216221
}
217222

223+
// We don't know what state the flash is in so wait for any remaining writes and then reset.
224+
uint8_t read_status_response[1] = {0x00};
225+
// The write in progress bit should be low.
226+
do {
227+
spi_flash_read_command(CMD_READ_STATUS, read_status_response, 1);
228+
} while ((read_status_response[0] & 0x1) != 0);
229+
// The suspended write/erase bit should be low.
230+
do {
231+
spi_flash_read_command(CMD_READ_STATUS2, read_status_response, 1);
232+
} while ((read_status_response[0] & 0x80) != 0);
233+
234+
235+
spi_flash_command(CMD_ENABLE_RESET);
236+
spi_flash_command(CMD_RESET);
237+
238+
// Wait 30us for the reset
239+
common_hal_mcu_delay_us(30);
240+
241+
spi_flash_init_device(flash_device);
242+
218243
// Activity LED for flash writes.
219244
#ifdef MICROPY_HW_LED_MSC
220245
gpio_set_pin_function(SPI_FLASH_CS_PIN, GPIO_PIN_FUNCTION_OFF);

‎ports/atmel-samd/external_flash/qspi_flash.c‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ void spi_flash_init(void) {
174174

175175
// Slow, good for debugging with Saleae
176176
// QSPI->BAUD.bit.BAUD = 32;
177-
// Super fast
177+
// Super fast, may be unreliable when Saleae is connected to high speed lines.
178178
QSPI->BAUD.bit.BAUD = 2;
179179
QSPI->CTRLB.reg = QSPI_CTRLB_MODE_MEMORY |
180180
QSPI_CTRLB_DATALEN_8BITS |
@@ -189,14 +189,17 @@ void spi_flash_init(void) {
189189
gpio_set_pin_pull_mode(pins[i], GPIO_PULL_OFF);
190190
gpio_set_pin_function(pins[i], GPIO_PIN_FUNCTION_H);
191191
}
192+
}
192193

194+
void spi_flash_init_device(const external_flash_device* device) {
193195
// Verify that QSPI mode is enabled.
194196
uint8_t status;
195-
spi_flash_read_command(0x35, &status, 1);
197+
spi_flash_read_command(CMD_READ_STATUS2, &status, 1);
196198

199+
// Bit 1 is Quad Enable
197200
if ((status & 0x2) == 0) {
198-
uint8_t full_status[3] = { 0, status | 0x2, 0x70};
201+
uint8_t full_status[2] = { 0x0, 0x2};
199202
spi_flash_command(CMD_ENABLE_WRITE);
200-
spi_flash_write_command(0x01, full_status, 3);
203+
spi_flash_write_command(CMD_WRITE_STATUS_BYTE1, full_status, 2);
201204
}
202205
}

‎ports/atmel-samd/external_flash/spi_flash.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,3 +152,7 @@ void spi_flash_init(void) {
152152

153153
spi_m_sync_enable(&spi_flash_desc);
154154
}
155+
156+
void spi_flash_init_device(const external_flash_device* device) {
157+
158+
}

‎ports/atmel-samd/external_flash/spi_flash_api.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
#include <stdbool.h>
3030
#include <stdint.h>
3131

32+
#include "external_flash/devices.h"
33+
3234
// This API is implemented for both normal SPI peripherals and QSPI peripherals.
3335

3436
bool spi_flash_command(uint8_t command);
@@ -38,5 +40,6 @@ bool spi_flash_sector_command(uint8_t command, uint32_t address);
3840
bool spi_flash_write_data(uint32_t address, uint8_t* data, uint32_t data_length);
3941
bool spi_flash_read_data(uint32_t address, uint8_t* data, uint32_t data_length);
4042
void spi_flash_init(void);
43+
void spi_flash_init_device(const external_flash_device* device);
4144

4245
#endif // MICROPY_INCLUDED_ATMEL_SAMD_SPI_FLASH_H

0 commit comments

Comments
 (0)