Skip to content

GitLab

M
micropython
Commit e3eed26d authored by Damien George's avatar Damien George
Browse files
Options

stm32/boards/LEGO_HUB_NO6: Change SPI flash storage to use hardware SPI. 

Signed-off-by: default avatarDamien George <damien@micropython.org>
parent 6936f410
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 15 deletions
ports/stm32/boards/LEGO_HUB_NO6/bdev.c
View file @ e3eed26d
...@@ -26,25 +26,26 @@ ...@@ -26,25 +26,26 @@
#include "py/obj.h" #include "py/obj.h"
#include "storage.h" #include "storage.h"
#include "spi.h"
#define CMD_EXIT_4_BYTE_ADDRESS_MODE (0xE9) #define CMD_EXIT_4_BYTE_ADDRESS_MODE (0xE9)
STATIC const mp_soft_spi_obj_t soft_spi_bus = { STATIC const spi_proto_cfg_t spi_bus = {
.delay_half = MICROPY_HW_SOFTSPI_MIN_DELAY, .spi = &spi_obj[1], // SPI2 hardware peripheral
.baudrate = 25000000,
.polarity = 0, .polarity = 0,
.phase = 0, .phase = 0,
.sck = MICROPY_HW_SPIFLASH_SCK, .bits = 8,
.mosi = MICROPY_HW_SPIFLASH_MOSI, .firstbit = SPI_FIRSTBIT_MSB,
.miso = MICROPY_HW_SPIFLASH_MISO,
}; };
STATIC mp_spiflash_cache_t spi_bdev_cache; STATIC mp_spiflash_cache_t spi_bdev_cache;
const mp_spiflash_config_t spiflash_config = { const mp_spiflash_config_t spiflash_config = {
.bus_kind = MP_SPIFLASH_BUS_SPI, .bus_kind = MP_SPIFLASH_BUS_SPI,
.bus.u_spi.cs = MICROPY_HW_SPIFLASH_NSS, .bus.u_spi.cs = MICROPY_HW_SPIFLASH_CS,
.bus.u_spi.data = (void *)&soft_spi_bus, .bus.u_spi.data = (void *)&spi_bus,
.bus.u_spi.proto = &mp_soft_spi_proto, .bus.u_spi.proto = &spi_proto,
.cache = &spi_bdev_cache, .cache = &spi_bdev_cache,
}; };
...@@ -55,9 +56,9 @@ int32_t board_bdev_ioctl(void) { ...@@ -55,9 +56,9 @@ int32_t board_bdev_ioctl(void) {
// Exit 4-byte address mode // Exit 4-byte address mode
uint8_t cmd = CMD_EXIT_4_BYTE_ADDRESS_MODE; uint8_t cmd = CMD_EXIT_4_BYTE_ADDRESS_MODE;
mp_hal_pin_write(MICROPY_HW_SPIFLASH_NSS, 0); mp_hal_pin_write(MICROPY_HW_SPIFLASH_CS, 0);
mp_soft_spi_proto.transfer(MP_OBJ_FROM_PTR(&soft_spi_bus), 1, &cmd, NULL); spi_proto.transfer(MP_OBJ_FROM_PTR(&spi_bus), 1, &cmd, NULL);
mp_hal_pin_write(MICROPY_HW_SPIFLASH_NSS, 1); mp_hal_pin_write(MICROPY_HW_SPIFLASH_CS, 1);
return ret; return ret;
} }
ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
View file @ e3eed26d
...@@ -61,6 +61,10 @@ ...@@ -61,6 +61,10 @@
#define MICROPY_HW_SPI1_SCK (pin_A5) // shared with DAC #define MICROPY_HW_SPI1_SCK (pin_A5) // shared with DAC
#define MICROPY_HW_SPI1_MISO (pin_A6) #define MICROPY_HW_SPI1_MISO (pin_A6)
#define MICROPY_HW_SPI1_MOSI (pin_A7) #define MICROPY_HW_SPI1_MOSI (pin_A7)
#define MICROPY_HW_SPI2_NSS (pin_B12)
#define MICROPY_HW_SPI2_SCK (pin_B13)
#define MICROPY_HW_SPI2_MISO (pin_C2)
#define MICROPY_HW_SPI2_MOSI (pin_C3)
// USB config // USB config
#define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_A9) #define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_A9)
...@@ -76,10 +80,10 @@ ...@@ -76,10 +80,10 @@
// SPI flash, for R/W storage // SPI flash, for R/W storage
#define MICROPY_HW_SPIFLASH_ENABLE_CACHE (1) #define MICROPY_HW_SPIFLASH_ENABLE_CACHE (1)
#define MICROPY_HW_SPIFLASH_SIZE_BITS (256 * 1024 * 1024) #define MICROPY_HW_SPIFLASH_SIZE_BITS (256 * 1024 * 1024)
#define MICROPY_HW_SPIFLASH_NSS (pin_B12) #define MICROPY_HW_SPIFLASH_CS (MICROPY_HW_SPI2_NSS)
#define MICROPY_HW_SPIFLASH_SCK (pin_B13) #define MICROPY_HW_SPIFLASH_SCK (MICROPY_HW_SPI2_SCK)
#define MICROPY_HW_SPIFLASH_MISO (pin_C2) #define MICROPY_HW_SPIFLASH_MISO (MICROPY_HW_SPI2_MISO)
#define MICROPY_HW_SPIFLASH_MOSI (pin_C3) #define MICROPY_HW_SPIFLASH_MOSI (MICROPY_HW_SPI2_MOSI)
// SPI flash, block device config // SPI flash, block device config
extern int32_t board_bdev_ioctl(void); extern int32_t board_bdev_ioctl(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment