vhad/RIOT
1
0
Fork 0
mirror of https://github.com/gosticks/RIOT.git synced 2025-10-16 12:05:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup spi run mode

Browse Source
This commit is contained in:
Wlad Meixner 2020-05-30 22:41:37 +02:00
parent 78045ebec2
commit 1bd7b5ce1d
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boards/cc3200-launchxl/include/periph_conf.h
View File

@ -59,15 +59,14 @@ static const spi_conf_t spi_config[] = {
.gpio_port = 0,
.pins = (spi_pins_t){ .miso = 05, .sck = 04, .mosi = 06, .cs = 07 },
.config = (SPI_HW_CTRL_CS | SPI_4PIN_MODE | SPI_TURBO_OFF |
SPI_CS_ACTIVELOW | SPI_WL_8 | PRCM_RUN_MODE_CLK),
SPI_CS_ACTIVELOW | SPI_WL_8),
},
{
.base_addr = LSPI_BASE,
.gpio_port = 1,
.pins = (spi_pins_t){ .miso = 0, .sck = 0, .mosi = 0, .cs = 0 },
.config = (SPI_SW_CTRL_CS | SPI_4PIN_MODE | SPI_TURBO_OFF |
SPI_CS_ACTIVEHIGH | SPI_WL_32 | PRCM_RUN_MODE_CLK |
PRCM_SLP_MODE_CLK),
SPI_CS_ACTIVEHIGH | SPI_WL_32),
}
};

12
cpu/cc3200/periph/spi.c
View File

@ -173,9 +173,12 @@ void spi_init(spi_t bus)
}
/* enable/configure SPI clock */
(*cc3200_arcm_reg_t)(&ARCM->MCSPI_A1 + bus *
0x1C)->clk_gating |= spi_config[bus].config &
PRCM_MODE_CLK_MASK;
if (spi(bus) == GSPI_BASE) {
ARCM->MCSPI_A1.clk_gating |= PRCM_RUN_MODE_CLK;
}
else if (spi(bus) == LSPI_BASE) {
ARCM->MCSPI_A2.clk_gating |= PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK;
}
/* reset spi for the changes to take effect */
spi_reset(bus);
@ -227,7 +230,8 @@ void spi_transfer_bytes(spi_t bus, spi_cs_t cs, bool cont, const void *out,
spi(bus)->ch0_conf |= MCSPI_CH0CONF_FORCE;
/* perform transfer */
if (ROM_SPITransfer((uint32_t)spi(bus), (uint8_t *)out, (uint8_t *)in, len,
if (ROM_SPITransfer((uint32_t)spi(bus), (uint8_t *)out, (uint8_t *)in,
len,
0) != SPI_OK) {
DEBUG("SPI: Transfer failed \n");
/* check that len and word length combination is valid */