From ac4106b673c285af66d72392bd4a8522aba98489 Mon Sep 17 00:00:00 2001 From: Ken Chang Date: Mon, 27 Jan 2014 10:29:05 +0800 Subject: [PATCH] nyan*: Fix SPI pinmux configuration Correct SPI4 pinmux setting. BUG=none BRANCH=none TEST=emerge-nyan chromeos-coreboot-nyan # boots successfully Change-Id: I9e1202e1a9640cb55b90ad293290c57050379f12 Signed-off-by: Ken Chang Signed-off-by: David Hendricks Reviewed-on: https://chromium-review.googlesource.com/184281 Reviewed-by: Julius Werner --- src/mainboard/google/nyan/bootblock.c | 18 ++++++++++-------- src/mainboard/google/nyan_big/bootblock.c | 18 ++++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/mainboard/google/nyan/bootblock.c b/src/mainboard/google/nyan/bootblock.c index 0761aedb7b..c168550541 100644 --- a/src/mainboard/google/nyan/bootblock.c +++ b/src/mainboard/google/nyan/bootblock.c @@ -72,17 +72,19 @@ void bootblock_mainboard_init(void) pmic_init(4); /* SPI4 data out (MOSI) */ - pinmux_set_config(PINMUX_SDMMC1_CMD_INDEX, - PINMUX_SDMMC1_CMD_FUNC_SPI4 | PINMUX_INPUT_ENABLE); + pinmux_set_config(PINMUX_GPIO_PG6_INDEX, + PINMUX_GPIO_PG6_FUNC_SPI4 | PINMUX_INPUT_ENABLE | + PINMUX_PULL_UP); /* SPI4 data in (MISO) */ - pinmux_set_config(PINMUX_SDMMC1_DAT1_INDEX, - PINMUX_SDMMC1_DAT1_FUNC_SPI4 | PINMUX_INPUT_ENABLE); + pinmux_set_config(PINMUX_GPIO_PG7_INDEX, + PINMUX_GPIO_PG7_FUNC_SPI4 | PINMUX_INPUT_ENABLE | + PINMUX_PULL_UP); /* SPI4 clock */ - pinmux_set_config(PINMUX_SDMMC1_DAT2_INDEX, - PINMUX_SDMMC1_DAT2_FUNC_SPI4 | PINMUX_INPUT_ENABLE); + pinmux_set_config(PINMUX_GPIO_PG5_INDEX, + PINMUX_GPIO_PG5_FUNC_SPI4 | PINMUX_INPUT_ENABLE); /* SPI4 chip select 0 */ - pinmux_set_config(PINMUX_SDMMC1_DAT3_INDEX, - PINMUX_SDMMC1_DAT3_FUNC_SPI4 | PINMUX_INPUT_ENABLE); + pinmux_set_config(PINMUX_GPIO_PI3_INDEX, + PINMUX_GPIO_PI3_FUNC_SPI4 | PINMUX_INPUT_ENABLE); tegra_spi_init(4); } diff --git a/src/mainboard/google/nyan_big/bootblock.c b/src/mainboard/google/nyan_big/bootblock.c index f07951a059..e88765fa0d 100644 --- a/src/mainboard/google/nyan_big/bootblock.c +++ b/src/mainboard/google/nyan_big/bootblock.c @@ -72,17 +72,19 @@ void bootblock_mainboard_init(void) pmic_init(4); /* SPI4 data out (MOSI) */ - pinmux_set_config(PINMUX_SDMMC1_CMD_INDEX, - PINMUX_SDMMC1_CMD_FUNC_SPI4 | PINMUX_INPUT_ENABLE); + pinmux_set_config(PINMUX_GPIO_PG6_INDEX, + PINMUX_GPIO_PG6_FUNC_SPI4 | PINMUX_INPUT_ENABLE | + PINMUX_PULL_UP); /* SPI4 data in (MISO) */ - pinmux_set_config(PINMUX_SDMMC1_DAT1_INDEX, - PINMUX_SDMMC1_DAT1_FUNC_SPI4 | PINMUX_INPUT_ENABLE); + pinmux_set_config(PINMUX_GPIO_PG7_INDEX, + PINMUX_GPIO_PG7_FUNC_SPI4 | PINMUX_INPUT_ENABLE | + PINMUX_PULL_UP); /* SPI4 clock */ - pinmux_set_config(PINMUX_SDMMC1_DAT2_INDEX, - PINMUX_SDMMC1_DAT2_FUNC_SPI4 | PINMUX_INPUT_ENABLE); + pinmux_set_config(PINMUX_GPIO_PG5_INDEX, + PINMUX_GPIO_PG5_FUNC_SPI4 | PINMUX_INPUT_ENABLE); /* SPI4 chip select 0 */ - pinmux_set_config(PINMUX_SDMMC1_DAT3_INDEX, - PINMUX_SDMMC1_DAT3_FUNC_SPI4 | PINMUX_INPUT_ENABLE); + pinmux_set_config(PINMUX_GPIO_PI3_INDEX, + PINMUX_GPIO_PI3_FUNC_SPI4 | PINMUX_INPUT_ENABLE); tegra_spi_init(4); }