diff options
| author | Philip Chen <philipchen@google.com> | 2017-08-23 18:02:25 -0700 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2017-08-31 20:03:07 +0000 |
| commit | a0618201d42f4cba1b25ecda9bc11ca41511c206 (patch) | |
| tree | ad9656fdeb11ceb425d92b1c0f671ac5e5325312 /src/mainboard/google/gru/board.h | |
| parent | 662cf7f8a6aefbda084a578ce101e3a8943358b2 (diff) | |
google/gru: Support Nefario rev0
Do not assert GPIO1_B3 otherwise BT would be disabled on Nefario.
Also, remove DVS support for CENTERLOGIC.
BUG=b:64702054, b:63537905
TEST=build coreboot
Change-Id: I350db2c080f2e41ae56413f5f895557978ef0ba8
Signed-off-by: Philip Chen <philipchen@google.com>
Reviewed-on: https://review.coreboot.org/21176
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src/mainboard/google/gru/board.h')
| -rw-r--r-- | src/mainboard/google/gru/board.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mainboard/google/gru/board.h b/src/mainboard/google/gru/board.h index f240dcf0ab..cc7581da65 100644 --- a/src/mainboard/google/gru/board.h +++ b/src/mainboard/google/gru/board.h @@ -33,7 +33,6 @@ #define GPIO_P30V_EN dead_code_t(gpio_t, "PP3000 doesn't exist on Scarlet") #define GPIO_TP_RST_L dead_code_t(gpio_t, "don't need TP_RST_L on Scarlet") #define GPIO_TPM_IRQ GPIO(1, C, 1) -#define GPIO_WLAN_RST_L dead_code_t(gpio_t, "no WLAN reset on Scarlet in FW") #define GPIO_WP GPIO(0, B, 5) #else #define GPIO_BACKLIGHT GPIO(1, C, 1) @@ -44,10 +43,15 @@ #define GPIO_P30V_EN GPIO(0, B, 4) #define GPIO_TP_RST_L GPIO(3, B, 4) /* may also be an I2C pull-up enable */ #define GPIO_TPM_IRQ GPIO(0, A, 5) -#define GPIO_WLAN_RST_L GPIO(1, B, 3) #define GPIO_WP GPIO(1, C, 2) #endif +#if IS_ENABLED(CONFIG_GRU_HAS_WLAN_RESET) +#define GPIO_WLAN_RST_L GPIO(1, B, 3) +#else +#define GPIO_WLAN_RST_L dead_code_t(gpio_t, "no WLAN reset on this board in FW") +#endif + void setup_chromeos_gpios(void); #endif /* ! __COREBOOT_SRC_MAINBOARD_GOOGLE_GRU_BOARD_H */ |