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

daisy: Plumb in SPI support

Browse Source 
This adds support for setting up the SPI pins and driver, as well as the
required SPI work task.

BUG=chromium-os:28925
TEST=build on daisy and discovery; run on daisy

Change-Id: Ie73560356fc8e4fcec0773c4692ecd6a7ba7affa
Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
David Hendricks
2012-04-07 21:51:33 -07:00
committed by Simon Glass
parent 335af85983
commit 826d334633
3 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
board/daisy/board.c
View File

@@ -9,6 +9,7 @@
#include "dma.h"
#include "gpio.h"
#include "registers.h"
#include "spi.h"
#include "util.h"
/*
@@ -45,6 +46,8 @@ const struct gpio_info gpio_list[GPIO_COUNT] = {
{"KB_COL06", GPIO_C, (1<<15), GPIO_INT_BOTH, matrix_interrupt},
{"KB_COL07", GPIO_D, (1<<2), GPIO_INT_BOTH, matrix_interrupt},
/* Other inputs */
{"SPI1_NSS", GPIO_A, (1<<4), GPIO_INT_RISING, NULL},
/* Outputs */
{"EN_PP1350", GPIO_A, (1<<2), GPIO_OUT_LOW, NULL},
{"EN_PP5000", GPIO_A, (1<<3), GPIO_OUT_LOW, NULL},
@@ -57,6 +60,9 @@ const struct gpio_info gpio_list[GPIO_COUNT] = {
void configure_board(void)
{
/* Required to configure external IRQ lines (SYSCFG_EXTICRn) */
STM32L_RCC_APB2ENR |= 1 << 0;
dma_init();
/* Enable all GPIOs clocks
@@ -64,8 +70,35 @@ void configure_board(void)
*/
STM32L_RCC_AHBENR |= 0x3f;
/* Enable SPI */
STM32L_RCC_APB2ENR |= (1<<12);
/*| (1 << 0); - removed since this breaks USB download? */
/* SPI1 on pins PA4-7 (push-pull, no pullup/down, 10MHz) */
STM32L_GPIO_PUPDR_OFF(GPIO_A) &= ~((2 << (7 * 2)) |
(2 << (6 * 2)) |
(2 << (5 * 2)) |
(2 << (4 * 2)));
STM32L_GPIO_OTYPER_OFF(GPIO_A) &= ~((1 << 7) |
(1 << 6) |
(1 << 5) |
(1 << 4));
gpio_set_alternate_function(GPIO_A, (1<<7) |
(1<<6) |
(1<<5) |
(1<<4), GPIO_ALT_SPI);
STM32L_GPIO_OSPEEDR_OFF(GPIO_A) |= 0xff00;
/* Select Alternate function for USART1 on pins PA9/PA10 */
gpio_set_alternate_function(GPIO_A, (1<<9) | (1<<10), GPIO_ALT_USART);
gpio_set_alternate_function(GPIO_A, (1<<9) | (1<<10), GPIO_ALT_USART);
/* EC_INT is output, open-drain */
STM32L_GPIO_OTYPER_OFF(GPIO_B) |= (1<<9);
STM32L_GPIO_PUPDR_OFF(GPIO_B) &= ~(0x3 << (2*9));
STM32L_GPIO_MODER_OFF(GPIO_B) &= ~(0x3 << (2*9));
STM32L_GPIO_MODER_OFF(GPIO_B) |= 0x1 << (2*9);
/* put GPIO in Hi-Z state */
gpio_set_level(GPIO_EC_INT, 1);
}
void board_keyboard_scan_ready(void)

3
board/daisy/board.h
View File

@@ -14,6 +14,8 @@
/* Use USART1 as console serial port */
#define CONFIG_CONSOLE_UART 1
#define CONFIG_SPI
#define USB_CHARGE_PORT_COUNT 0
/* GPIO signal list */
@@ -34,6 +36,7 @@ enum gpio_signal {
KB_COL06,
KB_COL07,
/* Other inputs */
GPIO_SPI1_NSS,
/* Outputs */
GPIO_EN_PP1350, /* DDR 1.35v rail enable */
GPIO_EN_PP5000, /* 5.0v rail enable */

3
board/daisy/ec.tasklist
View File

@@ -17,4 +17,5 @@
TASK(WATCHDOG, watchdog_task, NULL) \
TASK(KEYSCAN, keyboard_scan_task, NULL) \
TASK(GAIAPOWER, gaia_power_task, NULL) \
TASK(CONSOLE, console_task, NULL)
TASK(CONSOLE, console_task, NULL) \
TASK(SPI_WORK, spi_work_task, NULL)