From 8f8cf4d3369ef9d4391dc96215832aad1f5fda67 Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Sun, 22 May 2016 16:25:29 -0700 Subject: gru: kevin: enable EC SPI interface This configures and enables SPI interface #5 used for EC communications on Gru/Kevin. BRANCH=none BUG=chrome-os-partner:51537 TEST=with the appropriate depthcharge change it is possible to trigger booting Chrome OS from the SD card by pressing '^U' on Gru keyboard at the right time. Change-Id: I5304bf47e030c0b9b7794752f30ffdca6c03a4f4 Signed-off-by: Martin Roth Original-Commit-Id: b5cc177 Original-Change-Id: I99883daa60562ccddfaeb858c1957d497f05a501 Original-Signed-off-by: Vadim Bendebury Original-Reviewed-on: https://chromium-review.googlesource.com/346632 Reviewed-on: https://review.coreboot.org/15032 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/mainboard/google/gru/Kconfig | 2 +- src/mainboard/google/gru/bootblock.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig index 48ae698b6b..39cbf081ec 100644 --- a/src/mainboard/google/gru/Kconfig +++ b/src/mainboard/google/gru/Kconfig @@ -56,7 +56,7 @@ config DRAM_SIZE_MB config EC_GOOGLE_CHROMEEC_SPI_BUS hex - default 0 + default 5 config BOOT_MEDIA_SPI_BUS int diff --git a/src/mainboard/google/gru/bootblock.c b/src/mainboard/google/gru/bootblock.c index a048188e0a..19e2cdebbb 100644 --- a/src/mainboard/google/gru/bootblock.c +++ b/src/mainboard/google/gru/bootblock.c @@ -59,11 +59,14 @@ void bootblock_mainboard_early_init(void) void bootblock_mainboard_init(void) { - /* select the pinmux for spi flashrom */ + /* Set pinmux and configure spi flashrom. */ write32(&rk3399_pmugrf->spi1_rxd, IOMUX_SPI1_RX); write32(&rk3399_pmugrf->spi1_csclktx, IOMUX_SPI1_CSCLKTX); - rockchip_spi_init(CONFIG_BOOT_MEDIA_SPI_BUS, 24750*KHz); + /* Set pinmux and configure EC flashrom. */ + write32(&rk3399_grf->iomux_spi5, IOMUX_SPI5); + rockchip_spi_init(CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS, 3093750); + setup_chromeos_gpios(); } -- cgit v1.2.3