diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2016-04-22 12:25:07 -0700 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2016-05-09 08:49:55 +0200 |
| commit | 8e8a00cabfacb3c0c4f16465c94386bfdb615a47 (patch) | |
| tree | 3ea3855f00d3a76ad9e54800a75607e4aa613640 /src | |
| parent | 04884b65cc3967245cf4599bc5e9e83811afc45d (diff) | |
google/gru: kevin: use board version specific SD detect GPIO pin
This change reflects Kevin schematics differences, Gru will have to be
addressed separately.
BRANCH=None
BUG=None
TEST=the code still works fine on Kevin proto 1.
Change-Id: Iecae0e82e6bd4d185b49587b6053dcef8ad2162d
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: e821bbebe902a293b1e78cdd868f6bf3548ddd30
Original-Change-Id: Icd606285aeca1e19189f5e3d24c09b376942708b
Original-Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/340429
Original-Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: https://review.coreboot.org/14728
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainboard/google/gru/mainboard.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/mainboard/google/gru/mainboard.c b/src/mainboard/google/gru/mainboard.c index c24584e1b5..e91f289759 100644 --- a/src/mainboard/google/gru/mainboard.c +++ b/src/mainboard/google/gru/mainboard.c @@ -14,6 +14,7 @@ * */ +#include <boardid.h> #include <device/device.h> #include <gpio.h> #include <soc/clock.h> @@ -23,8 +24,21 @@ static void configure_sdmmc(void) { gpio_output(GPIO(4, D, 5), 1); /* SDMMC_PWR_EN */ gpio_output(GPIO(2, A, 2), 1); /* SDMMC_SDIO_PWR_EN */ - gpio_input(GPIO(4, D, 2)); /* SDMMC_DET_L */ + /* + * SDMMC_DET_L is different on different board revisions. + * Ideally this and other deviations should come from a table + * which could be looked up by board revision. + */ + switch (board_id()) { + case 0: /* This is for Kevin proto 1. */ + gpio_input(GPIO(4, D, 2)); + break; + default: + gpio_input(GPIO(4, D, 0)); + break; + } gpio_output(GPIO(2, D, 4), 0); /* Keep the max voltage */ + write32(&rk3399_grf->iomux_sdmmc, IOMUX_SDMMC); } |