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>
This commit is contained in:
Furquan Shaikh 2018-08-21 18:33:36 -07:00
parent 24efe73dfd
commit 19e4f74fc4
2 changed files with 4 additions and 3 deletions

View File

@ -39,6 +39,7 @@ const struct pad_config *variant_override_gpio_table(size_t *num)
const struct pad_config *c = NULL; const struct pad_config *c = NULL;
switch (board_id()) { switch (board_id()) {
case 0: case 0:
case 1:
case UNDEFINED_STRAPPING_ID: case UNDEFINED_STRAPPING_ID:
*num = 0; *num = 0;
break; 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 * 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(); uint32_t bid = board_id();
if (bid == UNDEFINED_STRAPPING_ID || bid < 1) if (bid == UNDEFINED_STRAPPING_ID || bid < 2)
gpio_output(GPIO_178, 1); gpio_output(GPIO_178, 1);
else else
gpio_output(GPIO_178, 0); gpio_output(GPIO_178, 0);

View File

@ -38,7 +38,7 @@ void variant_update_devtree(struct device *dev)
bid = board_id(); bid = board_id();
/* Nothing to update. */ /* Nothing to update. */
if (bid == UNDEFINED_STRAPPING_ID || bid < 1) if (bid == UNDEFINED_STRAPPING_ID || bid < 2)
return; return;
touchscreen_i2c_host = dev_find_slot(0, PCH_DEVFN_I2C7); touchscreen_i2c_host = dev_find_slot(0, PCH_DEVFN_I2C7);