summaryrefslogtreecommitdiff
path: root/src/mainboard/google/octopus
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2018-08-21 18:33:36 -0700
committerFurquan Shaikh <furquan@google.com>2018-08-22 06:23:25 +0000
commit19e4f74fc4be153dda8897664f6278c0d51bbf47 (patch)
treeccf6953c5384e5f250fd31dd552bb60e138af4cf /src/mainboard/google/octopus
parent24efe73dfd6bb52cd815513fc27e728db7481fd7 (diff)
mb/google/octopus/variants/bobba: Apply new GPIO configs for bid >= 2
This change updates the board id check for version >=2 to apply new GPIO configs. BUG=b:112618194 Change-Id: I3544c9596c465615818d2040682e554a64fc6b1a Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/28263 Reviewed-by: Justin TerAvest <teravest@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/google/octopus')
-rw-r--r--src/mainboard/google/octopus/variants/bobba/gpio.c5
-rw-r--r--src/mainboard/google/octopus/variants/bobba/variant.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mainboard/google/octopus/variants/bobba/gpio.c b/src/mainboard/google/octopus/variants/bobba/gpio.c
index 4fe5434c72..20e2230da5 100644
--- a/src/mainboard/google/octopus/variants/bobba/gpio.c
+++ b/src/mainboard/google/octopus/variants/bobba/gpio.c
@@ -39,6 +39,7 @@ const struct pad_config *variant_override_gpio_table(size_t *num)
const struct pad_config *c = NULL;
switch (board_id()) {
case 0:
+ case 1:
case UNDEFINED_STRAPPING_ID:
*num = 0;
break;
@@ -81,11 +82,11 @@ 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.
+ * board id 0/1 is deprecated, we can get rid of this.
*/
uint32_t bid = board_id();
- if (bid == UNDEFINED_STRAPPING_ID || bid < 1)
+ if (bid == UNDEFINED_STRAPPING_ID || bid < 2)
gpio_output(GPIO_178, 1);
else
gpio_output(GPIO_178, 0);
diff --git a/src/mainboard/google/octopus/variants/bobba/variant.c b/src/mainboard/google/octopus/variants/bobba/variant.c
index 1ead5e230c..07545dc2d9 100644
--- a/src/mainboard/google/octopus/variants/bobba/variant.c
+++ b/src/mainboard/google/octopus/variants/bobba/variant.c
@@ -38,7 +38,7 @@ void variant_update_devtree(struct device *dev)
bid = board_id();
/* Nothing to update. */
- if (bid == UNDEFINED_STRAPPING_ID || bid < 1)
+ if (bid == UNDEFINED_STRAPPING_ID || bid < 2)
return;
touchscreen_i2c_host = dev_find_slot(0, PCH_DEVFN_I2C7);