[coreboot-gerrit] Change in ...coreboot[master]: mb/google/octopus: Update GPIO_178 in early_gpio_table in baseboard
Furquan Shaikh (Code Review)
gerrit at coreboot.org
Wed Nov 21 23:52:48 CET 2018
Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/29784
Change subject: mb/google/octopus: Update GPIO_178 in early_gpio_table in baseboard
......................................................................
mb/google/octopus: Update GPIO_178 in early_gpio_table in baseboard
This change updates the configuration of GPIO_178 to be active low as
per latest revision on different octopus variants. This effectively:
1. Gets rid of early_gpio_table in different variants -- phaser, meep,
fleex, bobba.
2. Deprecates board id < 2 for bobba, board id < 1 for fleex and
phaser.
3. Adds special early_gpio_table in yorp which has GPIO_178 as an
active high signal.
BUG=b:119885949
Change-Id: I024199a8f1f96db57f8fa60c4d265789cd3a0493
Signed-off-by: Furquan Shaikh <furquan at google.com>
---
M src/mainboard/google/octopus/variants/baseboard/gpio.c
M src/mainboard/google/octopus/variants/bobba/gpio.c
M src/mainboard/google/octopus/variants/fleex/gpio.c
M src/mainboard/google/octopus/variants/meep/gpio.c
M src/mainboard/google/octopus/variants/phaser/gpio.c
A src/mainboard/google/octopus/variants/yorp/Makefile.inc
A src/mainboard/google/octopus/variants/yorp/gpio.c
7 files changed, 55 insertions(+), 172 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/29784/1
diff --git a/src/mainboard/google/octopus/variants/baseboard/gpio.c b/src/mainboard/google/octopus/variants/baseboard/gpio.c
index 28dfaef..877cd76 100644
--- a/src/mainboard/google/octopus/variants/baseboard/gpio.c
+++ b/src/mainboard/google/octopus/variants/baseboard/gpio.c
@@ -308,7 +308,7 @@
PAD_CFG_NF(GPIO_83, NONE, DEEP, NF1), /* H1_SLAVE_SPI_MOSI_R */
/* Enable power to wifi early in bootblock and de-assert PERST#. */
- PAD_CFG_GPO(GPIO_178, 1, DEEP), /* EN_PP3300_WLAN */
+ PAD_CFG_GPO(GPIO_178, 0, DEEP), /* EN_PP3300_WLAN_L */
PAD_CFG_GPO(GPIO_164, 0, DEEP), /* WLAN_PE_RST */
/*
diff --git a/src/mainboard/google/octopus/variants/bobba/gpio.c b/src/mainboard/google/octopus/variants/bobba/gpio.c
index 6b471e5..1b5c0bb 100644
--- a/src/mainboard/google/octopus/variants/bobba/gpio.c
+++ b/src/mainboard/google/octopus/variants/bobba/gpio.c
@@ -49,48 +49,3 @@
}
return c;
}
-
-/* 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, LEVEL, 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),
-
- /* 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)
-{
- /*
- * This is a hack to configure EN_PP3300_WLAN based on board id. Once
- * board id 0/1 is deprecated, we can get rid of this.
- */
- uint32_t bid = board_id();
-
- if (bid == UNDEFINED_STRAPPING_ID || bid < 2)
- gpio_output(GPIO_178, 1);
- else
- gpio_output(GPIO_178, 0);
-
- *num = ARRAY_SIZE(early_gpio_table);
- return early_gpio_table;
-}
diff --git a/src/mainboard/google/octopus/variants/fleex/gpio.c b/src/mainboard/google/octopus/variants/fleex/gpio.c
index ea7faf3..920d2c2 100644
--- a/src/mainboard/google/octopus/variants/fleex/gpio.c
+++ b/src/mainboard/google/octopus/variants/fleex/gpio.c
@@ -86,48 +86,3 @@
return c;
}
-
-/* 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, LEVEL, 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),
-
- /* 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)
-{
- /*
- * This is a hack to configure EN_PP3300_WLAN based on board id. Once
- * board id 0 is deprecated, we can get rid of this.
- */
- uint32_t bid = board_id();
-
- if (bid == UNDEFINED_STRAPPING_ID || bid < 1)
- gpio_output(GPIO_178, 1);
- else
- gpio_output(GPIO_178, 0);
-
- *num = ARRAY_SIZE(early_gpio_table);
- return early_gpio_table;
-}
diff --git a/src/mainboard/google/octopus/variants/meep/gpio.c b/src/mainboard/google/octopus/variants/meep/gpio.c
index 823224c..7e57287 100644
--- a/src/mainboard/google/octopus/variants/meep/gpio.c
+++ b/src/mainboard/google/octopus/variants/meep/gpio.c
@@ -38,39 +38,3 @@
*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, LEVEL, 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/phaser/gpio.c b/src/mainboard/google/octopus/variants/phaser/gpio.c
index 4d3210c..2a5dfbc 100644
--- a/src/mainboard/google/octopus/variants/phaser/gpio.c
+++ b/src/mainboard/google/octopus/variants/phaser/gpio.c
@@ -101,48 +101,3 @@
}
return c;
}
-
-/* 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, LEVEL, 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),
-
- /* 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)
-{
- /*
- * This is a hack to configure EN_PP3300_WLAN based on board id. Once
- * board id 0 is deprecated, we can get rid of this.
- */
- uint32_t bid = board_id();
-
- if (bid == UNDEFINED_STRAPPING_ID || bid < 1)
- gpio_output(GPIO_178, 1);
- else
- gpio_output(GPIO_178, 0);
-
- *num = ARRAY_SIZE(early_gpio_table);
- return early_gpio_table;
-}
diff --git a/src/mainboard/google/octopus/variants/yorp/Makefile.inc b/src/mainboard/google/octopus/variants/yorp/Makefile.inc
new file mode 100644
index 0000000..4b48156
--- /dev/null
+++ b/src/mainboard/google/octopus/variants/yorp/Makefile.inc
@@ -0,0 +1 @@
+bootblock-y += gpio.c
diff --git a/src/mainboard/google/octopus/variants/yorp/gpio.c b/src/mainboard/google/octopus/variants/yorp/gpio.c
new file mode 100644
index 0000000..5719888
--- /dev/null
+++ b/src/mainboard/google/octopus/variants/yorp/gpio.c
@@ -0,0 +1,53 @@
+/*
+ * 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 <baseboard/gpio.h>
+#include <baseboard/variants.h>
+#include <gpio.h>
+#include <soc/gpio.h>
+
+/* GPIOs needed prior to ramstage. */
+static const struct pad_config early_gpio_table[] = {
+ PAD_CFG_GPI(GPIO_190, NONE, DEEP), /* PCH_WP_OD */
+ /* GSPI0_INT */
+ PAD_CFG_GPI_APIC_IOS(GPIO_63, NONE, DEEP, LEVEL, INVERT, TxDRxE,
+ DISPUPD), /* H1_PCH_INT_ODL */
+ /* GSPI0_CLK */
+ PAD_CFG_NF(GPIO_79, NONE, DEEP, NF1), /* H1_SLAVE_SPI_CLK_R */
+ /* GSPI0_CS# */
+ PAD_CFG_NF(GPIO_80, NONE, DEEP, NF1), /* H1_SLAVE_SPI_CS_L_R */
+ /* GSPI0_MISO */
+ PAD_CFG_NF(GPIO_82, NONE, DEEP, NF1), /* H1_SLAVE_SPI_MISO */
+ /* GSPI0_MOSI */
+ PAD_CFG_NF(GPIO_83, NONE, DEEP, NF1), /* H1_SLAVE_SPI_MOSI_R */
+
+ /* Enable power to wifi early in bootblock and de-assert PERST#. */
+ PAD_CFG_GPO(GPIO_178, 1, DEEP), /* EN_PP3300_WLAN */
+ PAD_CFG_GPO(GPIO_164, 0, DEEP), /* WLAN_PE_RST */
+
+ /*
+ * 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), /* ESPI_IO1 */
+};
+
+const struct pad_config *variant_early_gpio_table(size_t *num)
+{
+ *num = ARRAY_SIZE(early_gpio_table);
+ return early_gpio_table;
+}
--
To view, visit https://review.coreboot.org/c/coreboot/+/29784
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I024199a8f1f96db57f8fa60c4d265789cd3a0493
Gerrit-Change-Number: 29784
Gerrit-PatchSet: 1
Gerrit-Owner: Furquan Shaikh <furquan at google.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181121/07d8aa35/attachment-0001.html>
More information about the coreboot-gerrit
mailing list