google/gru: Add support for rainier

Rainier is a scarlet-derived board but uses eDP as opposed to MIPI. Using
GRU_BASEBOARD_SCARLET is enough, except for display related logic. In
those cases, use board specific logic instead of baseboard. 


Change-Id: I596f7ca6bc26312ecaeb261c96cebd46974c2cdf
Signed-off-by: Ege Mihmanli <egemih@google.com>
Reviewed-on: https://review.coreboot.org/22542
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Ege Mihmanli 2017-11-20 11:54:02 -08:00 committed by Julius Werner
parent ae01634e47
commit beb0468fce
3 changed files with 12 additions and 2 deletions

View File

@ -37,7 +37,7 @@ config GRU_HAS_WLAN_RESET
config GRU_BASEBOARD_SCARLET config GRU_BASEBOARD_SCARLET
bool bool
default y if BOARD_GOOGLE_SCARLET default y if BOARD_GOOGLE_SCARLET || BOARD_GOOGLE_RAINIER
default n default n
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
@ -115,6 +115,7 @@ config MAINBOARD_PART_NUMBER
default "Gru" if BOARD_GOOGLE_GRU default "Gru" if BOARD_GOOGLE_GRU
default "Kevin" if BOARD_GOOGLE_KEVIN default "Kevin" if BOARD_GOOGLE_KEVIN
default "Nefario" if BOARD_GOOGLE_NEFARIO default "Nefario" if BOARD_GOOGLE_NEFARIO
default "Rainier" if BOARD_GOOGLE_RAINIER
config GBB_HWID config GBB_HWID
string string
@ -124,5 +125,6 @@ config GBB_HWID
default "GRU TEST 5431" if BOARD_GOOGLE_GRU default "GRU TEST 5431" if BOARD_GOOGLE_GRU
default "KEVIN TEST 1422" if BOARD_GOOGLE_KEVIN default "KEVIN TEST 1422" if BOARD_GOOGLE_KEVIN
default "NEFARIO TEST 3735" if BOARD_GOOGLE_NEFARIO default "NEFARIO TEST 3735" if BOARD_GOOGLE_NEFARIO
default "RAINIER TEST 9752" if BOARD_GOOGLE_RAINIER
endif # BOARD_GOOGLE_GRU_COMMON endif # BOARD_GOOGLE_GRU_COMMON

View File

@ -17,3 +17,7 @@ config BOARD_GOOGLE_SCARLET
config BOARD_GOOGLE_NEFARIO config BOARD_GOOGLE_NEFARIO
bool "Nefario" bool "Nefario"
select BOARD_GOOGLE_GRU_COMMON select BOARD_GOOGLE_GRU_COMMON
config BOARD_GOOGLE_RAINIER
bool "Rainier"
select BOARD_GOOGLE_GRU_COMMON

View File

@ -237,7 +237,11 @@ static void configure_codec(void)
static void configure_display(void) static void configure_display(void)
{ {
if (IS_ENABLED(CONFIG_GRU_BASEBOARD_SCARLET)) { /*
* Rainier is Scarlet-derived, but uses EDP so use board-specific
* config rather than baseboard.
*/
if (IS_ENABLED(CONFIG_BOARD_GOOGLE_SCARLET)) {
gpio_output(GPIO(4, D, 1), 0); /* DISPLAY_RST_L */ gpio_output(GPIO(4, D, 1), 0); /* DISPLAY_RST_L */
gpio_output(GPIO(4, D, 3), 1); /* PPVARP_LCD */ gpio_output(GPIO(4, D, 3), 1); /* PPVARP_LCD */
mdelay(10); mdelay(10);