Skip to content

alif/machine_spi: Fix init defaults to match new defaults. #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kwagyeman wants to merge 1 commit into from
Closed

alif/machine_spi: Fix init defaults to match new defaults. #138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions ports/alif/machine_spi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ static inline uint32_t spi_get_clk(machine_spi_obj_t *spi) {
return spi->is_lp ? GetSystemCoreClock() : GetSystemAHBClock();
}

static void spi_init(machine_spi_obj_t *spi, uint32_t baudrate,
uint32_t polarity, uint32_t phase, uint32_t bits, uint32_t firstbit) {
static void spi_init(machine_spi_obj_t *spi, int32_t baudrate,
int32_t polarity, int32_t phase, int32_t bits, int32_t firstbit) {
const machine_pin_obj_t *pins[4] = { NULL, NULL, NULL, NULL };
switch (spi->id) {
#if defined(MICROPY_HW_SPI0_SCK)
Expand Down Expand Up @@ -161,7 +161,9 @@ static void spi_init(machine_spi_obj_t *spi, uint32_t baudrate,
spi_mask_interrupts(spi->inst);

// Configure baudrate clock
spi_set_bus_speed(spi->inst, baudrate, spi_get_clk(spi));
if (baudrate > 0) {
spi_set_bus_speed(spi->inst, baudrate, spi_get_clk(spi));
}

// Configure FIFOs
spi_set_tx_threshold(spi->inst, 0);
Expand All @@ -172,6 +174,21 @@ static void spi_init(machine_spi_obj_t *spi, uint32_t baudrate,
}

// 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;
if (!spi->is_lp) {
spi_set_mode(spi->inst, spi_mode);
Expand All @@ -193,10 +210,12 @@ static void spi_init(machine_spi_obj_t *spi, uint32_t baudrate,
}

// Configure frame size.
if (!spi->is_lp) {
spi_set_dfs(spi->inst, bits);
} else {
lpspi_set_dfs(spi->inst, bits);
if (bits > 0) {
if (!spi->is_lp) {
spi_set_dfs(spi->inst, bits);
} else {
lpspi_set_dfs(spi->inst, bits);
}
}

// Configure slave select pin
Expand Down
Loading