From a0618201d42f4cba1b25ecda9bc11ca41511c206 Mon Sep 17 00:00:00 2001 From: Philip Chen Date: Wed, 23 Aug 2017 18:02:25 -0700 Subject: 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 Reviewed-on: https://review.coreboot.org/21176 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- src/mainboard/google/gru/mainboard.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/mainboard/google/gru/mainboard.c') diff --git a/src/mainboard/google/gru/mainboard.c b/src/mainboard/google/gru/mainboard.c index 77c185cb3d..df3df4fcae 100644 --- a/src/mainboard/google/gru/mainboard.c +++ b/src/mainboard/google/gru/mainboard.c @@ -44,7 +44,7 @@ static void configure_touchpad(void) /* * Wifi's PDN/RST line is pulled down by its (unpowered) voltage rails, but * this reset pin is pulled up by default. Let's drive it low as early as we - * can. Scarlet uses a different WiFi chip that doesn't have this pin anymore. + * can. This only applies to boards with Marvell 8997 WiFi. */ static void assert_wifi_reset(void) { @@ -349,8 +349,9 @@ static void mainboard_init(device_t dev) if (display_init_required()) configure_display(); setup_usb(0); + if (IS_ENABLED(CONFIG_GRU_HAS_WLAN_RESET)) + assert_wifi_reset(); if (!IS_ENABLED(CONFIG_BOARD_GOOGLE_SCARLET)) { - assert_wifi_reset(); /* Scarlet: no WIFI_PD# line */ configure_touchpad(); /* Scarlet: works differently */ setup_usb(1); /* Scarlet: only one USB port */ register_gpio_suspend(); /* Scarlet: all EC-controlled */ -- cgit v1.2.3