Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2025-12-16 09:50:15 +01:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

alif/machine_spi: Fix init() to only change requested settings.

Browse Source 
Signed-off-by: Kwabena W. Agyeman <kwagyeman@live.com>
This commit is contained in:
Kwabena W. Agyeman
2025-09-28 20:44:05 -07:00
committed by Damien George
parent a809132921
commit ea63e43faf
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ports/alif/machine_spi.c
View File

@@ -79,8 +79,8 @@ static inline uint32_t spi_get_clk(machine_spi_obj_t *spi) {
return spi->is_lp ? GetSystemCoreClock() : GetSystemAHBClock(); return spi->is_lp ? GetSystemCoreClock() : GetSystemAHBClock();
} }
static void spi_init(machine_spi_obj_t *spi, uint32_t baudrate, static void spi_init(machine_spi_obj_t *spi, int32_t baudrate,
uint32_t polarity, uint32_t phase, uint32_t bits, uint32_t firstbit) { int32_t polarity, int32_t phase, int32_t bits, int32_t firstbit) {
const machine_pin_obj_t *pins[4] = { NULL, NULL, NULL, NULL }; const machine_pin_obj_t *pins[4] = { NULL, NULL, NULL, NULL };
switch (spi->id) { switch (spi->id) {
#if defined(MICROPY_HW_SPI0_SCK) #if defined(MICROPY_HW_SPI0_SCK)
@@ -161,7 +161,9 @@ static void spi_init(machine_spi_obj_t *spi, uint32_t baudrate,
spi_mask_interrupts(spi->inst); spi_mask_interrupts(spi->inst);
// Configure baudrate clock // Configure baudrate clock
if (baudrate > 0) {
spi_set_bus_speed(spi->inst, baudrate, spi_get_clk(spi)); spi_set_bus_speed(spi->inst, baudrate, spi_get_clk(spi));
}
// Configure FIFOs // Configure FIFOs
spi_set_tx_threshold(spi->inst, 0); spi_set_tx_threshold(spi->inst, 0);
@@ -172,6 +174,21 @@ static void spi_init(machine_spi_obj_t *spi, uint32_t baudrate,
} }
// Configure SPI bus mode. // Configure SPI bus mode.
if (!spi->is_lp) {
if (polarity < 0) {
polarity = (spi->inst->SPI_CTRLR0 & SPI_CTRLR0_SCPOL_HIGH) ? 1 : 0;
}
if (phase < 0) {
phase = (spi->inst->SPI_CTRLR0 & SPI_CTRLR0_SCPH_HIGH) ? 1 : 0;
}
} else {
if (polarity < 0) {
polarity = (spi->inst->SPI_CTRLR0 & LPSPI_CTRLR0_SCPOL_HIGH) ? 1 : 0;
}
if (phase < 0) {
phase = (spi->inst->SPI_CTRLR0 & LPSPI_CTRLR0_SCPH_HIGH) ? 1 : 0;
}
}
uint32_t spi_mode = (polarity << 1) | phase; uint32_t spi_mode = (polarity << 1) | phase;
if (!spi->is_lp) { if (!spi->is_lp) {
spi_set_mode(spi->inst, spi_mode); spi_set_mode(spi->inst, spi_mode);
@@ -193,11 +210,13 @@ static void spi_init(machine_spi_obj_t *spi, uint32_t baudrate,
} }
// Configure frame size. // Configure frame size.
if (bits > 0) {
if (!spi->is_lp) { if (!spi->is_lp) {
spi_set_dfs(spi->inst, bits); spi_set_dfs(spi->inst, bits);
} else { } else {
lpspi_set_dfs(spi->inst, bits); lpspi_set_dfs(spi->inst, bits);
} }
}
// Configure slave select pin // Configure slave select pin
spi_control_ss(spi->inst, 0, true); spi_control_ss(spi->inst, 0, true);