diff options
| author | Mike Causer <mcauser@gmail.com> | 2021-07-09 11:07:37 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2021-07-19 23:16:11 +1000 |
| commit | cc77b306396ce7979baaac69b5d7abef7da29110 (patch) | |
| tree | 73add606b0cc2a80214da4ab875f4e9e4f38c9e5 | |
| parent | 79da7757cc942f202b2f6a276ddcc1d42b484328 (diff) | |
rp2/machine_spi: Allow boards to configure SPI pins using new macros.
| -rw-r--r-- | ports/rp2/machine_spi.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/ports/rp2/machine_spi.c b/ports/rp2/machine_spi.c index 478c06145..332f44694 100644 --- a/ports/rp2/machine_spi.c +++ b/ports/rp2/machine_spi.c @@ -38,12 +38,18 @@ #define DEFAULT_SPI_PHASE (0) #define DEFAULT_SPI_BITS (8) #define DEFAULT_SPI_FIRSTBIT (SPI_MSB_FIRST) -#define DEFAULT_SPI0_SCK (6) -#define DEFAULT_SPI0_MOSI (7) -#define DEFAULT_SPI0_MISO (4) -#define DEFAULT_SPI1_SCK (10) -#define DEFAULT_SPI1_MOSI (11) -#define DEFAULT_SPI1_MISO (8) + +#ifndef MICROPY_HW_SPI0_SCK +#define MICROPY_HW_SPI0_SCK (6) +#define MICROPY_HW_SPI0_MOSI (7) +#define MICROPY_HW_SPI0_MISO (4) +#endif + +#ifndef MICROPY_HW_SPI1_SCK +#define MICROPY_HW_SPI1_SCK (10) +#define MICROPY_HW_SPI1_MOSI (11) +#define MICROPY_HW_SPI1_MISO (8) +#endif #define IS_VALID_PERIPH(spi, pin) ((((pin) & 8) >> 3) == (spi)) #define IS_VALID_SCK(spi, pin) (((pin) & 3) == 2 && IS_VALID_PERIPH(spi, pin)) @@ -68,13 +74,13 @@ STATIC machine_spi_obj_t machine_spi_obj[] = { { {&machine_spi_type}, spi0, 0, DEFAULT_SPI_POLARITY, DEFAULT_SPI_PHASE, DEFAULT_SPI_BITS, DEFAULT_SPI_FIRSTBIT, - DEFAULT_SPI0_SCK, DEFAULT_SPI0_MOSI, DEFAULT_SPI0_MISO, + MICROPY_HW_SPI0_SCK, MICROPY_HW_SPI0_MOSI, MICROPY_HW_SPI0_MISO, 0, }, { {&machine_spi_type}, spi1, 1, DEFAULT_SPI_POLARITY, DEFAULT_SPI_PHASE, DEFAULT_SPI_BITS, DEFAULT_SPI_FIRSTBIT, - DEFAULT_SPI1_SCK, DEFAULT_SPI1_MOSI, DEFAULT_SPI1_MISO, + MICROPY_HW_SPI1_SCK, MICROPY_HW_SPI1_MOSI, MICROPY_HW_SPI1_MISO, 0, }, }; |