summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/google/dedede/variants/drawcia/gpio.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/mainboard/google/dedede/variants/drawcia/gpio.c b/src/mainboard/google/dedede/variants/drawcia/gpio.c
index 863d289a70..96b64cc4fe 100644
--- a/src/mainboard/google/dedede/variants/drawcia/gpio.c
+++ b/src/mainboard/google/dedede/variants/drawcia/gpio.c
@@ -2,18 +2,19 @@
#include <baseboard/gpio.h>
#include <baseboard/variants.h>
+#include <boardid.h>
#include <fw_config.h>
#include <ec/google/chromeec/ec.h>
/* Pad configuration in ramstage*/
-static const struct pad_config pre_board6_gpio_table[] = {
+static const struct pad_config not_board6or8_gpio_table[] = {
/* C12 : AP_PEN_DET_ODL */
PAD_CFG_GPI_GPIO_DRIVER(GPP_C12, UP_20K, DEEP),
};
-/* bid6: Pad configuration for board version 6 afterward in ramstage*/
-static const struct pad_config board6_gpio_table[] = {
+/* bid6: Pad configuration for board version 6 or 8 in ramstage*/
+static const struct pad_config board6or8_gpio_table[] = {
/* C12 : AP_PEN_DET_ODL has an external pull-up and hence no pad termination.*/
PAD_CFG_GPI_GPIO_DRIVER(GPP_C12, NONE, DEEP),
@@ -21,15 +22,13 @@ static const struct pad_config board6_gpio_table[] = {
const struct pad_config *variant_override_gpio_table(size_t *num)
{
- uint32_t board_version;
- *num = ARRAY_SIZE(pre_board6_gpio_table);
-
- if (!google_chromeec_cbi_get_board_version(&board_version)) {
- if (board_version >= 6) {
- *num = ARRAY_SIZE(board6_gpio_table);
- return board6_gpio_table;
- }
+ uint32_t board_version = board_id();
+ *num = ARRAY_SIZE(not_board6or8_gpio_table);
+
+ if (board_version == 6 || board_version >= 8) {
+ *num = ARRAY_SIZE(board6or8_gpio_table);
+ return board6or8_gpio_table;
}
- return pre_board6_gpio_table;
+ return not_board6or8_gpio_table;
}