From cbf27fd8998bf8125de8407b4e64ab726a738962 Mon Sep 17 00:00:00 2001 From: Wisley Chen Date: Mon, 1 Apr 2019 13:21:01 +0800 Subject: mb/google/octopus: Set default configuration to low for gpio_178 Set default configuration to low for gpio_178, and can remove the override setting for bobba/bloog/fleex/meep/phaser. For ampton, Change-Id I64a67f73564188ad0548a1a770169ef2bca47453 ( mb/google/ampton: Fix polarity of EN_PP3300_WLAN_L signal.) modified the pin setting. TEST=verified that boot into OS on meep board. suspend/resume, reboot, and no failure found. Change-Id: I7668ff4817edfca5c6cea63db779fcea21c7af92 Signed-off-by: Wisley Chen Reviewed-on: https://review.coreboot.org/c/coreboot/+/32247 Reviewed-by: Paul Menzel Reviewed-by: Justin TerAvest Reviewed-by: Furquan Shaikh Tested-by: build bot (Jenkins) --- src/mainboard/google/octopus/variants/baseboard/gpio.c | 3 ++- src/mainboard/google/octopus/variants/bloog/gpio.c | 3 --- src/mainboard/google/octopus/variants/bobba/gpio.c | 3 --- src/mainboard/google/octopus/variants/fleex/gpio.c | 3 --- src/mainboard/google/octopus/variants/meep/gpio.c | 3 --- src/mainboard/google/octopus/variants/phaser/gpio.c | 3 --- 6 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/mainboard/google/octopus/variants/baseboard/gpio.c b/src/mainboard/google/octopus/variants/baseboard/gpio.c index 3305c02a0d..febf7792e7 100644 --- a/src/mainboard/google/octopus/variants/baseboard/gpio.c +++ b/src/mainboard/google/octopus/variants/baseboard/gpio.c @@ -249,7 +249,8 @@ static const struct pad_config gpio_table[] = { /* SCC COMMUNITY GPIOS */ PAD_NC(GPIO_176, UP_20K), /* SMB_ALERTB -- unused */ PAD_NC(GPIO_177, UP_20K), /* SMB_CLK -- unused */ - PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_178, 1, DEEP, NONE, Tx1RxDCRx0, DISPUPD), /* EN_PP3300_WLAN */ + PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_178, 0, DEEP, NONE, Tx0RxDCRx0, DISPUPD), /* EN_PP3300_WLAN_L */ + PAD_NC(GPIO_179, NONE), /* SDCARD_CLK -- unused */ PAD_NC(GPIO_180, NONE), /* SDCARD_CMD -- unused */ PAD_NC(GPIO_181, UP_20K), /* SDCARD_D0 -- unused */ diff --git a/src/mainboard/google/octopus/variants/bloog/gpio.c b/src/mainboard/google/octopus/variants/bloog/gpio.c index 2b29cba06c..cf3bc4caf7 100644 --- a/src/mainboard/google/octopus/variants/bloog/gpio.c +++ b/src/mainboard/google/octopus/variants/bloog/gpio.c @@ -42,9 +42,6 @@ static const struct pad_config default_override_table[] = { /* EN_PP3300_TOUCHSCREEN */ PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_146, 0, DEEP, NONE, Tx0RxDCRx0, DISPUPD), - - /* EN_PP3300_WLAN_L */ - PAD_CFG_GPO(GPIO_178, 0, DEEP), }; const struct pad_config *variant_override_gpio_table(size_t *num) diff --git a/src/mainboard/google/octopus/variants/bobba/gpio.c b/src/mainboard/google/octopus/variants/bobba/gpio.c index e11f6cf341..6bfe54aec7 100644 --- a/src/mainboard/google/octopus/variants/bobba/gpio.c +++ b/src/mainboard/google/octopus/variants/bobba/gpio.c @@ -26,9 +26,6 @@ static const struct pad_config default_override_table[] = { PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_146, 0, DEEP, NONE, Tx0RxDCRx0, DISPUPD), - /* EN_PP3300_WLAN_L */ - PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_178, 0, DEEP, NONE, Tx0RxDCRx0, DISPUPD), - PAD_NC(GPIO_213, DN_20K), }; diff --git a/src/mainboard/google/octopus/variants/fleex/gpio.c b/src/mainboard/google/octopus/variants/fleex/gpio.c index 6bb78aa373..89adfb8cb6 100644 --- a/src/mainboard/google/octopus/variants/fleex/gpio.c +++ b/src/mainboard/google/octopus/variants/fleex/gpio.c @@ -41,9 +41,6 @@ static const struct pad_config default_override_table[] = { PAD_NC(GPIO_161, UP_20K), - /* EN_PP3300_WLAN_L */ - PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_178, 0, DEEP, NONE, Tx0RxDCRx0, DISPUPD), - PAD_NC(GPIO_213, DN_20K), PAD_NC(GPIO_214, DN_20K), }; diff --git a/src/mainboard/google/octopus/variants/meep/gpio.c b/src/mainboard/google/octopus/variants/meep/gpio.c index 001a48856c..7b47bf1217 100644 --- a/src/mainboard/google/octopus/variants/meep/gpio.c +++ b/src/mainboard/google/octopus/variants/meep/gpio.c @@ -24,9 +24,6 @@ static const struct pad_config default_override_table[] = { /* EN_PP3300_TOUCHSCREEN */ PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_146, 0, DEEP, NONE, Tx0RxDCRx0, DISPUPD), - - /* EN_PP3300_WLAN_L */ - PAD_CFG_GPO(GPIO_178, 0, DEEP), }; const struct pad_config *variant_override_gpio_table(size_t *num) diff --git a/src/mainboard/google/octopus/variants/phaser/gpio.c b/src/mainboard/google/octopus/variants/phaser/gpio.c index 6883ab0831..076476bbdd 100644 --- a/src/mainboard/google/octopus/variants/phaser/gpio.c +++ b/src/mainboard/google/octopus/variants/phaser/gpio.c @@ -36,9 +36,6 @@ static const struct pad_config default_override_table[] = { PAD_NC(GPIO_161, DN_20K), - /* EN_PP3300_WLAN_L */ - PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_178, 0, DEEP, NONE, Tx0RxDCRx0, DISPUPD), - PAD_NC(GPIO_213, DN_20K), PAD_NC(GPIO_214, DN_20K), }; -- cgit v1.2.3