scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-11 18:35:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

scarlet: Fix SPI master

Browse Source 
Add startup/shutdown code for SPI2.
Fix mapping for DMA channels.
Set the initial level as high for CS pins.

BUG=b:67694935, b:64798990
BRANCH=none
TEST=boot scarlet rev1 without seeing auxiliary watchdog triggered,
see reasonable accel and gyro measurement from 'accelread'

Change-Id: Icb79c3b716adb90804231032505c31148b88a9ee
Signed-off-by: Philip Chen <philipchen@google.com>
Reviewed-on: https://chromium-review.googlesource.com/717735
Commit-Ready: Philip Chen <philipchen@chromium.org>
Tested-by: Alexandru M Stan <amstan@chromium.org>
Tested-by: Philip Chen <philipchen@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>
This commit is contained in:
Philip Chen
2017-10-12 18:29:09 -07:00
committed by chrome-bot
parent ee7716b544
commit ebcbc5d5f2
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
board/scarlet/board.c
View File

@@ -250,6 +250,15 @@ int pd_snk_is_vbus_provided(int port)
static void board_spi_enable(void)
{
gpio_config_module(MODULE_SPI_MASTER, 1);
/* Enable clocks to SPI2 module */
STM32_RCC_APB1ENR |= STM32_RCC_PB1_SPI2;
/* Reset SPI2 */
STM32_RCC_APB1RSTR |= STM32_RCC_PB1_SPI2;
STM32_RCC_APB1RSTR &= ~STM32_RCC_PB1_SPI2;
spi_enable(CONFIG_SPI_ACCEL_PORT, 1);
}
DECLARE_HOOK(HOOK_CHIPSET_STARTUP,
@@ -274,6 +283,11 @@ static void board_spi_disable(void)
msleep(10);
spi_enable(CONFIG_SPI_ACCEL_PORT, 0);
/* Disable clocks to SPI2 module */
STM32_RCC_APB1ENR &= ~STM32_RCC_PB1_SPI2;
gpio_config_module(MODULE_SPI_MASTER, 0);
}
DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN,
board_spi_disable,
@@ -291,6 +305,10 @@ static void board_init(void)
/* Enable interrupts from BMI160 sensor. */
gpio_enable_interrupt(GPIO_ACCEL_INT_L);
/* Set SPI2 pins to high speed */
/* pins D0/D1/D3/D4 */
STM32_GPIO_OSPEEDR(GPIO_D) |= 0x000003cf;
/* Sensor Init */
if (system_jumped_to_this_image() && chipset_in_state(CHIPSET_STATE_ON))
board_spi_enable();
@@ -301,10 +319,14 @@ void board_config_pre_init(void)
{
STM32_RCC_AHBENR |= STM32_RCC_HB_DMA1;
/*
* Remap USART1 DMA:
* Ch4 : USART1_TX / Ch5 : USART1_RX
* Remap USART1 and SPI2 DMA:
*
* Ch4: USART1_TX / Ch5: USART1_RX
* Ch6: SPI2_RX / Ch7: SPI2_TX
*/
STM32_DMA_CSELR(STM32_DMAC_CH4) = (1 << 15) | (1 << 19);
STM32_DMA_CSELR(STM32_DMAC_CH4) = (1 << 15) | (1 << 19) |
(1 << 20) | (1 << 21) |
(1 << 24) | (1 << 25);
}
void board_hibernate(void)

4
board/scarlet/gpio.inc
View File

@@ -59,8 +59,8 @@ GPIO(I2C1_SDA, PIN(B, 11), GPIO_INPUT)
GPIO(BOARD_ID, PIN(C, 0), GPIO_ANALOG)
/* SPI sensors */
GPIO(SPI_BARO_CS_L, PIN(B, 12), GPIO_OUT_LOW)
GPIO(SPI_ACCEL_CS_L, PIN(D, 0), GPIO_OUT_LOW)
GPIO(SPI_BARO_CS_L, PIN(B, 12), GPIO_OUT_HIGH)
GPIO(SPI_ACCEL_CS_L, PIN(D, 0), GPIO_OUT_HIGH)
/* Scarlet LEDs */
GPIO(BAT_LED_GREEN, PIN(E, 9), GPIO_ODR_HIGH)