From e166ea4d2a0c3233d0bc8bb0e93061951005337d Mon Sep 17 00:00:00 2001 From: Wisley Chen Date: Tue, 21 Aug 2018 21:06:56 +0800 Subject: mb/google/octopus/var/meep: Update GPIO config for meep The change updates GPIO configuration for meep. 1. Update touchscreen power enable GPIO in devicetree. 2. Provide default override tables for GPIO configuration. BUG=b:112955087 TEST=Boot on meep proto board with Intel (Jefferson Peak) wifi card. Change-Id: Idb4e7a510eef15c2e118058d5848080782f4f665 Signed-off-by: Wisley Chen Reviewed-on: https://review.coreboot.org/28252 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Furquan Shaikh --- .../google/octopus/variants/meep/Makefile.inc | 3 + src/mainboard/google/octopus/variants/meep/gpio.c | 76 ++++++++++++++++++++++ .../google/octopus/variants/meep/overridetree.cb | 2 +- 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 src/mainboard/google/octopus/variants/meep/Makefile.inc create mode 100644 src/mainboard/google/octopus/variants/meep/gpio.c (limited to 'src/mainboard/google/octopus/variants') diff --git a/src/mainboard/google/octopus/variants/meep/Makefile.inc b/src/mainboard/google/octopus/variants/meep/Makefile.inc new file mode 100644 index 0000000000..9fb63f5f43 --- /dev/null +++ b/src/mainboard/google/octopus/variants/meep/Makefile.inc @@ -0,0 +1,3 @@ +bootblock-y += gpio.c + +ramstage-y += gpio.c diff --git a/src/mainboard/google/octopus/variants/meep/gpio.c b/src/mainboard/google/octopus/variants/meep/gpio.c new file mode 100644 index 0000000000..0f313885b9 --- /dev/null +++ b/src/mainboard/google/octopus/variants/meep/gpio.c @@ -0,0 +1,76 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2018 Google LLC. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include + +static const struct pad_config default_override_table[] = { + PAD_NC(GPIO_104, UP_20K), + + /* CAM_SOC_EC_SYNC */ + PAD_CFG_GPI_APIC_IOS(GPIO_134, NONE, DEEP, EDGE_SINGLE, INVERT, TxDRxE, + DISPUPD), + + /* 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) +{ + *num = ARRAY_SIZE(default_override_table); + return default_override_table; +} + +/* GPIOs needed prior to ramstage. */ +static const struct pad_config early_gpio_table[] = { + /* PCH_WP_OD */ + PAD_CFG_GPI(GPIO_190, NONE, DEEP), + /* H1_PCH_INT_ODL */ + PAD_CFG_GPI_APIC_IOS(GPIO_63, NONE, DEEP, EDGE_SINGLE, INVERT, TxDRxE, + DISPUPD), + /* H1_SLAVE_SPI_CLK_R */ + PAD_CFG_NF(GPIO_79, NONE, DEEP, NF1), + /* H1_SLAVE_SPI_CS_L_R */ + PAD_CFG_NF(GPIO_80, NONE, DEEP, NF1), + /* H1_SLAVE_SPI_MISO */ + PAD_CFG_NF(GPIO_82, NONE, DEEP, NF1), + /* H1_SLAVE_SPI_MOSI_R */ + PAD_CFG_NF(GPIO_83, NONE, DEEP, NF1), + + PAD_CFG_GPO(GPIO_178, 0, DEEP), + + /* WLAN_PE_RST */ + PAD_CFG_GPO(GPIO_164, 0, DEEP), + + /* + * ESPI_IO1 acts as ALERT# (which is open-drain) and requies a weak + * pull-up for proper operation. Since there is no external pull present + * on this platform, configure an internal weak pull-up. + */ + PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_151, UP_20K, DEEP, NF2, HIZCRx1, + ENPU), +}; + +const struct pad_config *variant_early_gpio_table(size_t *num) +{ + *num = ARRAY_SIZE(early_gpio_table); + return early_gpio_table; +} diff --git a/src/mainboard/google/octopus/variants/meep/overridetree.cb b/src/mainboard/google/octopus/variants/meep/overridetree.cb index d29e6c1e4c..20cd9d127c 100644 --- a/src/mainboard/google/octopus/variants/meep/overridetree.cb +++ b/src/mainboard/google/octopus/variants/meep/overridetree.cb @@ -49,7 +49,7 @@ chip soc/intel/apollolake register "probed" = "1" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_105)" register "reset_delay_ms" = "20" - register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_213)" + register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)" register "enable_delay_ms" = "1" register "has_power_resource" = "1" device i2c 10 on end -- cgit v1.2.3