Change in coreboot[master]: mb/google/octopus/variants/bobba: Apply new GPIO configs for bid >= 2

[Furquan Shaikh (Code Review)]

Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/28263

Change subject: mb/google/octopus/variants/bobba: Apply new GPIO configs for bid >= 2
......................................................................

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 
---
M src/mainboard/google/octopus/variants/bobba/gpio.c
M src/mainboard/google/octopus/variants/bobba/variant.c
2 files changed, 4 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/63/28263/1

diff --git a/src/mainboard/google/octopus/variants/bobba/gpio.c b/src/mainboard/google/octopus/variants/bobba/gpio.c
index 4fe5434..20e2230 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 *c = NULL;
    switch (board_id()) {
    case 0:
+	case 1:
    case UNDEFINED_STRAPPING_ID:
    	*num = 0;
    	break;
@@ -81,11 +82,11 @@
 {
    /*
     * 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 1ead5e2..07545dc 100644
--- a/src/mainboard/google/octopus/variants/bobba/variant.c
+++ b/src/mainboard/google/octopus/variants/bobba/variant.c
@@ -38,7 +38,7 @@
    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);