From 4d8b81717c366d19b43964bed3c4047598db4495 Mon Sep 17 00:00:00 2001 From: Tom Warren Date: Wed, 30 Jul 2014 16:26:21 -0700 Subject: [PATCH] ryu: Add mainboard_init_xxx functions to get it building again Rush has its EC on SPI, and Ryu has it on I2C, so need both mainboard_init_ec_spi and mainboard_init_ec_i2c in both builds, due to romstage.c being in the common tegra132 subdir. BUG=none BRANCH=rush_ryu TEST=Built both rush and rush_ryu images OK. Will try to boot on Ryu later. Change-Id: I48d9530697d5669177ecd9ba3c34360197002003 Signed-off-by: Tom Warren Reviewed-on: https://chromium-review.googlesource.com/210595 Reviewed-by: Aaron Durbin Commit-Queue: Aaron Durbin --- src/mainboard/google/rush/romstage.c | 5 ++ src/mainboard/google/rush_ryu/mainboard.c | 45 +++++++++++++++ src/mainboard/google/rush_ryu/romstage.c | 55 +++++++++++++++++++ .../nvidia/tegra132/include/soc/romstage.h | 1 + src/soc/nvidia/tegra132/romstage.c | 1 + 5 files changed, 107 insertions(+) diff --git a/src/mainboard/google/rush/romstage.c b/src/mainboard/google/rush/romstage.c index 5e74e71afb..8edcba8d6a 100644 --- a/src/mainboard/google/rush/romstage.c +++ b/src/mainboard/google/rush/romstage.c @@ -75,6 +75,11 @@ void mainboard_init_ec_spi(void) clock_configure_source(sbc1, CLK_M, 500); } +void mainboard_init_ec_i2c(void) +{ + /* Empty - Rush uses SPI to communicate with the EC */ +} + void mainboard_configure_pmc(void) { } diff --git a/src/mainboard/google/rush_ryu/mainboard.c b/src/mainboard/google/rush_ryu/mainboard.c index dff5954466..140ca5f63e 100644 --- a/src/mainboard/google/rush_ryu/mainboard.c +++ b/src/mainboard/google/rush_ryu/mainboard.c @@ -20,8 +20,53 @@ #include #include +#include +#include +#include +#include + +static struct clk_rst_ctlr *clk_rst = (void *)TEGRA_CLK_RST_BASE; + +static void init_mmc(void) +{ + clock_configure_source(sdmmc4, PLLP, 48000); + + uint32_t pin_up = PINMUX_PULL_UP | PINMUX_INPUT_ENABLE, + pin_none = PINMUX_PULL_NONE | PINMUX_INPUT_ENABLE; + + // MMC4 (eMMC) + pinmux_set_config(PINMUX_SDMMC4_CLK_INDEX, + PINMUX_SDMMC4_CLK_FUNC_SDMMC4 | pin_none); + pinmux_set_config(PINMUX_SDMMC4_CMD_INDEX, + PINMUX_SDMMC4_CMD_FUNC_SDMMC4 | pin_up); + pinmux_set_config(PINMUX_SDMMC4_DAT0_INDEX, + PINMUX_SDMMC4_DAT0_FUNC_SDMMC4 | pin_up); + pinmux_set_config(PINMUX_SDMMC4_DAT1_INDEX, + PINMUX_SDMMC4_DAT1_FUNC_SDMMC4 | pin_up); + pinmux_set_config(PINMUX_SDMMC4_DAT2_INDEX, + PINMUX_SDMMC4_DAT2_FUNC_SDMMC4 | pin_up); + pinmux_set_config(PINMUX_SDMMC4_DAT3_INDEX, + PINMUX_SDMMC4_DAT3_FUNC_SDMMC4 | pin_up); + pinmux_set_config(PINMUX_SDMMC4_DAT4_INDEX, + PINMUX_SDMMC4_DAT4_FUNC_SDMMC4 | pin_up); + pinmux_set_config(PINMUX_SDMMC4_DAT5_INDEX, + PINMUX_SDMMC4_DAT5_FUNC_SDMMC4 | pin_up); + pinmux_set_config(PINMUX_SDMMC4_DAT6_INDEX, + PINMUX_SDMMC4_DAT6_FUNC_SDMMC4 | pin_up); + pinmux_set_config(PINMUX_SDMMC4_DAT7_INDEX, + PINMUX_SDMMC4_DAT7_FUNC_SDMMC4 | pin_up); +} + +static void setup_ec_i2c(void) +{ +} + static void mainboard_init(device_t dev) { + clock_enable_clear_reset(CLK_L_SDMMC4, 0, 0, 0, 0, 0); + + init_mmc(); + setup_ec_i2c(); } static void mainboard_enable(device_t dev) diff --git a/src/mainboard/google/rush_ryu/romstage.c b/src/mainboard/google/rush_ryu/romstage.c index bb173c09d6..a72d4ec8ae 100644 --- a/src/mainboard/google/rush_ryu/romstage.c +++ b/src/mainboard/google/rush_ryu/romstage.c @@ -19,6 +19,61 @@ #include +#include +#include +#include +#include +#include + +static struct clk_rst_ctlr *clk_rst = (void *)TEGRA_CLK_RST_BASE; + +static void configure_tpm_i2c_bus(void) +{ + clock_configure_i2c_scl_freq(i2c3, PLLP, 19); + i2c_init(2); +} + +static void configure_ec_i2c_bus(void) +{ + clock_configure_i2c_scl_freq(i2c2, PLLP, 100); + i2c_init(1); +} + +void mainboard_init_tpm_i2c(void) +{ + clock_enable_clear_reset(0, 0, CLK_U_I2C3, 0, 0, 0); + + gpio_output(GPIO(I5), 1); + + /* I2C3 (cam) clock */ + pinmux_set_config(PINMUX_CAM_I2C_SCL_INDEX, + PINMUX_CAM_I2C_SCL_FUNC_I2C3 | PINMUX_INPUT_ENABLE); + /* I2C3 (cam) data */ + pinmux_set_config(PINMUX_CAM_I2C_SDA_INDEX, + PINMUX_CAM_I2C_SDA_FUNC_I2C3 | PINMUX_INPUT_ENABLE); + + configure_tpm_i2c_bus(); +} + +void mainboard_init_ec_spi(void) +{ + /* Empty - Ryu uses I2C to communicate with the EC */ +} + +void mainboard_init_ec_i2c(void) +{ + clock_enable_clear_reset(0, CLK_H_I2C2, 0, 0, 0, 0); + + /* I2C2 (GEN2) clock */ + pinmux_set_config(PINMUX_GEN2_I2C_SCL_INDEX, + PINMUX_GEN2_I2C_SCL_FUNC_I2C2 | PINMUX_INPUT_ENABLE); + /* I2C2 (GEN2) data */ + pinmux_set_config(PINMUX_GEN2_I2C_SDA_INDEX, + PINMUX_GEN2_I2C_SDA_FUNC_I2C2 | PINMUX_INPUT_ENABLE); + + configure_ec_i2c_bus(); +} + void mainboard_configure_pmc(void) { } diff --git a/src/soc/nvidia/tegra132/include/soc/romstage.h b/src/soc/nvidia/tegra132/include/soc/romstage.h index d5fabd2878..dcf6ad6079 100644 --- a/src/soc/nvidia/tegra132/include/soc/romstage.h +++ b/src/soc/nvidia/tegra132/include/soc/romstage.h @@ -24,5 +24,6 @@ void mainboard_configure_pmc(void); void mainboard_enable_vdd_cpu(void); void mainboard_init_tpm_i2c(void); void mainboard_init_ec_spi(void); +void mainboard_init_ec_i2c(void); #endif /* __SOC_NVIDIA_TEGRA132_SOC_ROMSTAGE_H__ */ diff --git a/src/soc/nvidia/tegra132/romstage.c b/src/soc/nvidia/tegra132/romstage.c index 150bcfc825..9a2423eb1e 100644 --- a/src/soc/nvidia/tegra132/romstage.c +++ b/src/soc/nvidia/tegra132/romstage.c @@ -88,6 +88,7 @@ void romstage(void) mainboard_init_tpm_i2c(); mainboard_init_ec_spi(); + mainboard_init_ec_i2c(); entry = load_ramstage();