From 8de7bcc78c6c48c251c85185e238cea7812f7a28 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Fri, 29 Jul 2016 16:15:04 -0700 Subject: [PATCH] google/gru: Add support for Gru rev1 This patch adds support for the Gru rev1 board. This board differs from rev0 by no longer relying on the I2C backlight booster and requiring the same ODT SDRAM settings as newer Kevin boards. BRANCH=None BUG=chrome-os-partner:55087 TEST=None Change-Id: I3cb49bc644190f35300e6c618b2934956fa88e5b Signed-off-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/364624 Reviewed-by: Douglas Anderson --- src/mainboard/google/gru/mainboard.c | 2 +- src/mainboard/google/gru/sdram_configs.c | 27 +++++++++++++++--------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/mainboard/google/gru/mainboard.c b/src/mainboard/google/gru/mainboard.c index 68a38fde1f..8335b65221 100644 --- a/src/mainboard/google/gru/mainboard.c +++ b/src/mainboard/google/gru/mainboard.c @@ -231,7 +231,7 @@ void mainboard_power_on_backlight(void) { gpio_output(GPIO_BACKLIGHT, 1); /* BL_EN */ - if (IS_ENABLED(CONFIG_BOARD_GOOGLE_GRU)) + if (IS_ENABLED(CONFIG_BOARD_GOOGLE_GRU) && board_id() == 0) enable_backlight_booster(); } diff --git a/src/mainboard/google/gru/sdram_configs.c b/src/mainboard/google/gru/sdram_configs.c index 709156f8a4..6403e98cdc 100644 --- a/src/mainboard/google/gru/sdram_configs.c +++ b/src/mainboard/google/gru/sdram_configs.c @@ -51,18 +51,25 @@ static enum dram_speeds get_sdram_index(void) id = board_id(); - if (IS_ENABLED(CONFIG_BOARD_GOOGLE_KEVIN)) { - if (id < 3) + if (IS_ENABLED(CONFIG_BOARD_GOOGLE_KEVIN)) + switch (id) { + case 0: + case 1: + case 2: return dram_200MHz; - else if (id == 3) + case 3: return dram_666MHz_NO_ODT; - else - return dram_800MHz; - } - else if (IS_ENABLED(CONFIG_BOARD_GOOGLE_GRU)) - return dram_800MHz_NO_ODT; - else - return dram_200MHz; + default: + return dram_800MHz; + } + + if (IS_ENABLED(CONFIG_BOARD_GOOGLE_GRU)) + switch (id) { + case 0: + return dram_800MHz_NO_ODT; + default: + return dram_800MHz; + } } const struct rk3399_sdram_params *get_sdram_config()