From 654289993b8d3a01701dafb76bc552f1ed4d60d5 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Thu, 9 Aug 2018 10:11:26 -0700 Subject: mb/google/octopus: Configure WiFi wake as NC when using CNVi When CNVi is being used, external wake using GPIO_119 is not required. This change configures GPIO_119 as PAD_NC if CNVi is taken out of reset. BUG=b:112371978 Change-Id: Ifee90f428ed43c4d7c612c170476aff43b4a33ce Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/27993 Tested-by: build bot (Jenkins) Reviewed-by: Justin TerAvest Reviewed-by: Aaron Durbin --- src/mainboard/google/octopus/mainboard.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/mainboard/google/octopus/mainboard.c b/src/mainboard/google/octopus/mainboard.c index 61baa33f4b..61d254ee5a 100644 --- a/src/mainboard/google/octopus/mainboard.c +++ b/src/mainboard/google/octopus/mainboard.c @@ -50,6 +50,15 @@ static bool is_cnvi_held_in_reset(void) return false; } +static void disable_wifi_wake(void) +{ + static const struct pad_config wifi_wake_gpio[] = { + PAD_NC(GPIO_119, UP_20K), + }; + + gpio_configure_pads(wifi_wake_gpio, ARRAY_SIZE(wifi_wake_gpio)); +} + static void mainboard_init(void *chip_info) { int boardid; @@ -66,6 +75,9 @@ static void mainboard_init(void *chip_info) gpio_configure_pads_with_override(base_pads, base_num, override_pads, override_num); + if (!is_cnvi_held_in_reset()) + disable_wifi_wake(); + mainboard_ec_init(); } -- cgit v1.2.3