djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1638 from dhalbert/disable-SPIM3

Browse Source 
nrf: Disable SPIM3; add SPIM1; remove TWIM1
This commit is contained in:
Scott Shawcroft 2019-03-12 10:57:56 -07:00 committed by GitHub
commit cfb54f0263
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ports/nrf/nrfx_config.h
View File

@ -10,9 +10,10 @@
#define NRFX_SPIS_NRF52_ANOMALY_109_WORKAROUND_ENABLED 1 #define NRFX_SPIS_NRF52_ANOMALY_109_WORKAROUND_ENABLED 1
#endif #endif
// NOTE: THIS WORKAROUND CAUSES BLE CODE TO CRASH; tested on 2019-03-11.
// Turn on nrfx supported workarounds for errata in Rev1 of nRF52840 // Turn on nrfx supported workarounds for errata in Rev1 of nRF52840
#ifdef NRF52840_XXAA #ifdef NRF52840_XXAA
#define NRFX_SPIM3_NRF52840_ANOMALY_198_WORKAROUND_ENABLED 1 // #define NRFX_SPIM3_NRF52840_ANOMALY_198_WORKAROUND_ENABLED 1
#endif #endif
// SPI // SPI
@ -25,13 +26,17 @@
// We could write an interrupt handler that checks whether it's // We could write an interrupt handler that checks whether it's
// being used for SPI or I2C, but perhaps two I2C's and 1-2 SPI's are good enough for now. // being used for SPI or I2C, but perhaps two I2C's and 1-2 SPI's are good enough for now.
// Enable SPIM2 and SPIM3 (if available) // Enable SPIM1, SPIM2 and SPIM3 (if available)
// No conflict with TWIM0.
#define NRFX_SPIM1_ENABLED 1
#define NRFX_SPIM2_ENABLED 1 #define NRFX_SPIM2_ENABLED 1
#ifdef NRF_SPIM3 // DON'T ENABLE SPIM3 DUE TO ANOMALY WORKAROUND FAILURE (SEE ABOVE).
#define NRFX_SPIM3_ENABLED 1 // #ifdef NRF52840_XXAA
#else // #define NRFX_SPIM_EXTENDED_ENABLED 1
#define NRFX_SPIM3_ENABLED 0 // #define NRFX_SPIM3_ENABLED 1
#endif // #else
// #define NRFX_SPIM3_ENABLED 0
// #endif
#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY 7 #define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY 7
@ -40,10 +45,10 @@
// QSPI // QSPI
#define NRFX_QSPI_ENABLED 1 #define NRFX_QSPI_ENABLED 1
// TWI aka. I2C; enable TWIM0 and TWIM1 (no conflict with SPIM choices) // TWI aka. I2C; enable a single bus: TWIM0 (no conflict with SPIM1 and SPIM2)
#define NRFX_TWIM_ENABLED 1 #define NRFX_TWIM_ENABLED 1
#define NRFX_TWIM0_ENABLED 1 #define NRFX_TWIM0_ENABLED 1
#define NRFX_TWIM1_ENABLED 1 //#define NRFX_TWIM1_ENABLED 1
#define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY 7 #define NRFX_TWIM_DEFAULT_CONFIG_IRQ_PRIORITY 7
#define NRFX_TWIM_DEFAULT_CONFIG_FREQUENCY NRF_TWIM_FREQ_400K #define NRFX_TWIM_DEFAULT_CONFIG_FREQUENCY NRF_TWIM_FREQ_400K