From 0b153bdda97fad6033a1d5aea58af1dd9df6125d Mon Sep 17 00:00:00 2001 From: David Hendricks Date: Sat, 9 Feb 2013 17:24:17 -0800 Subject: exynos/snow: move SPI GPIO setup to mainboard bootblock code This moves GPIO setup from chip-specific SPI code to mainboard- specific bootblock code. This makes exynos_spi_open a bit more generic so it can eventually be used for any SPI channel. This also benefits CBFS since the user can set media->context to to any set of SPI registers. Change-Id: I2bcb9de370df0a79353c14b4d021b471ddebfacd Signed-off-by: David Hendricks Reviewed-on: http://review.coreboot.org/2347 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- src/cpu/samsung/exynos5-common/spi.c | 11 +---------- src/mainboard/google/snow/bootblock.c | 1 + 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/cpu/samsung/exynos5-common/spi.c b/src/cpu/samsung/exynos5-common/spi.c index 0e5d5e51f3..81927370e6 100644 --- a/src/cpu/samsung/exynos5-common/spi.c +++ b/src/cpu/samsung/exynos5-common/spi.c @@ -81,20 +81,11 @@ static void exynos_spi_rx_tx(struct exynos_spi *regs, int todo, } } +/* set up SPI channel */ int exynos_spi_open(struct exynos_spi *regs) { /* set the spi1 GPIO */ - // TODO Some of these should be done in board's bootblock file. - // We should fix-up the mainboard-specific vs. exynos-specific parts in a - // follow-up CL. - -// exynos_pinmux_config(PERIPH_ID_SPI1, PINMUX_FLAG_NONE); - gpio_cfg_pin(GPIO_A24, 0x2); - gpio_cfg_pin(GPIO_A25, 0x2); - gpio_cfg_pin(GPIO_A26, 0x2); - gpio_cfg_pin(GPIO_A27, 0x2); - /* set pktcnt and enable it */ writel(4 | SPI_PACKET_CNT_EN, ®s->pkt_cnt); /* set FB_CLK_SEL */ diff --git a/src/mainboard/google/snow/bootblock.c b/src/mainboard/google/snow/bootblock.c index 9725af3dae..17a3267a6e 100644 --- a/src/mainboard/google/snow/bootblock.c +++ b/src/mainboard/google/snow/bootblock.c @@ -30,6 +30,7 @@ void bootblock_mainboard_init(void); void bootblock_mainboard_init(void) { + exynos_pinmux_config(PERIPH_ID_SPI1, PINMUX_FLAG_NONE); #if CONFIG_EARLY_CONSOLE exynos_pinmux_config(PERIPH_ID_UART3, PINMUX_FLAG_NONE); console_init(); -- cgit v1.2.3