diff options
| author | Julius Werner <jwerner@chromium.org> | 2017-07-14 14:30:29 -0700 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2017-07-19 18:15:15 +0000 |
| commit | 6486e7819ccf4acf923d934d4293861f394cc065 (patch) | |
| tree | 5b90d178a021829b9e268b9229b5e9e843668b32 /src/mainboard/google/gru/romstage.c | |
| parent | 4ed8b305539f661895d9fa950bb32fc653e37f47 (diff) | |
google/gru: Add support for Scarlet rev1
This patch adds the necessary changes to support Scarlet revision 1.
Since the differences to revision 0 are so deep, we have decided not to
continue support for it in the same image. Therefore, this patch will
break Scarlet rev0.
All the deviations from other Gru boards are currently guarded by
CONFIG_BOARD_GOOGLE_SCARLET. This should be changed later if we
introduce more variants based on the newer Scarlet board design.
Change-Id: I7a7cc11d9387ac1d856663326e35cfa5371e0af2
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/20587
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: David Schneider <dnschneid@chromium.org>
Diffstat (limited to 'src/mainboard/google/gru/romstage.c')
| -rw-r--r-- | src/mainboard/google/gru/romstage.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mainboard/google/gru/romstage.c b/src/mainboard/google/gru/romstage.c index d644f7d7c2..bde61b28aa 100644 --- a/src/mainboard/google/gru/romstage.c +++ b/src/mainboard/google/gru/romstage.c @@ -33,6 +33,7 @@ #include <soc/usb.h> #include <stdlib.h> +#include "board.h" #include "pwm_regulator.h" static void init_dvs_outputs(void) @@ -40,10 +41,11 @@ static void init_dvs_outputs(void) pwm_regulator_configure(PWM_REGULATOR_GPU, 900); pwm_regulator_configure(PWM_REGULATOR_BIG, 900); - /* Kevin's logic rail has some ripple, so up the voltage a bit */ + /* Kevin's logic rail has some ripple, so up the voltage a bit. Scarlet + uses a fixed 900mV regulator for centerlogic. */ if (IS_ENABLED(CONFIG_BOARD_GOOGLE_KEVIN)) pwm_regulator_configure(PWM_REGULATOR_CENTERLOG, 925); - else + else if (!IS_ENABLED(CONFIG_BOARD_GOOGLE_SCARLET)) pwm_regulator_configure(PWM_REGULATOR_CENTERLOG, 900); /* Allow time for the regulators to settle */ @@ -52,9 +54,8 @@ static void init_dvs_outputs(void) static void prepare_sdmmc(void) { - /* Enable main SD rail early to allow ramp time before enabling SDIO - * rail. */ - gpio_output(GPIO(4, D, 5), 1); /* SDMMC_PWR_EN */ + /* Enable main SD rail early to allow ramp time before powering SDIO. */ + gpio_output(GPIO_SDMMC_PWR, 1); } static void prepare_usb(void) |