From 63445298aca9c8dbe960ea773c49f9e63bc8ead2 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Wed, 21 Nov 2018 14:35:02 -0800 Subject: mb/google/octopus/var/bobba: Deprecate board id < 2 This change deprecates boards with id < 2. It updates touchscreen enable GPIO in overridetree and gets rid of variant.c to update enable GPIO at runtime. Additionally, it configures old enable GPIO as NC. BUG=b:119885949 Change-Id: I42fb7ef90e421118a8fdfa0d343d0bcf4a9bc087 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/c/29786 Tested-by: build bot (Jenkins) Reviewed-by: Karthik Ramasubramanian Reviewed-by: Aaron Durbin Reviewed-by: Justin TerAvest --- .../google/octopus/variants/bobba/Makefile.inc | 1 - src/mainboard/google/octopus/variants/bobba/gpio.c | 17 ++--- .../google/octopus/variants/bobba/overridetree.cb | 4 +- .../google/octopus/variants/bobba/variant.c | 73 ---------------------- 4 files changed, 7 insertions(+), 88 deletions(-) delete mode 100644 src/mainboard/google/octopus/variants/bobba/variant.c (limited to 'src/mainboard/google/octopus/variants/bobba') diff --git a/src/mainboard/google/octopus/variants/bobba/Makefile.inc b/src/mainboard/google/octopus/variants/bobba/Makefile.inc index d54ed40095..9fb63f5f43 100644 --- a/src/mainboard/google/octopus/variants/bobba/Makefile.inc +++ b/src/mainboard/google/octopus/variants/bobba/Makefile.inc @@ -1,4 +1,3 @@ bootblock-y += gpio.c -ramstage-y += variant.c ramstage-y += gpio.c diff --git a/src/mainboard/google/octopus/variants/bobba/gpio.c b/src/mainboard/google/octopus/variants/bobba/gpio.c index 1b5c0bb069..acdcf975e4 100644 --- a/src/mainboard/google/octopus/variants/bobba/gpio.c +++ b/src/mainboard/google/octopus/variants/bobba/gpio.c @@ -32,20 +32,13 @@ static const struct pad_config default_override_table[] = { /* EN_PP3300_WLAN_L */ PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_178, 0, DEEP, NONE, Tx0RxDCRx0, DISPUPD), + + PAD_NC(GPIO_213, DN_20K), }; 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; - default: - c = default_override_table; - *num = ARRAY_SIZE(default_override_table); - } - return c; + *num = ARRAY_SIZE(default_override_table); + + return default_override_table; } diff --git a/src/mainboard/google/octopus/variants/bobba/overridetree.cb b/src/mainboard/google/octopus/variants/bobba/overridetree.cb index dab13a582d..c0f37e2ec3 100644 --- a/src/mainboard/google/octopus/variants/bobba/overridetree.cb +++ b/src/mainboard/google/octopus/variants/bobba/overridetree.cb @@ -102,7 +102,7 @@ chip soc/intel/apollolake register "probed" = "1" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_105)" register "reset_delay_ms" = "20" - register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_213)" + register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)" register "enable_delay_ms" = "1" register "has_power_resource" = "1" device i2c 10 on end @@ -114,7 +114,7 @@ chip soc/intel/apollolake register "probed" = "1" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_105)" register "reset_delay_ms" = "1" - register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_213)" + register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)" register "enable_delay_ms" = "50" register "has_power_resource" = "1" device i2c 39 on end diff --git a/src/mainboard/google/octopus/variants/bobba/variant.c b/src/mainboard/google/octopus/variants/bobba/variant.c deleted file mode 100644 index 200f460e39..0000000000 --- a/src/mainboard/google/octopus/variants/bobba/variant.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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 -#include -#include -#include -#include -#include -#include -#include -#include - -extern struct chip_operations drivers_i2c_generic_ops; -extern struct chip_operations drivers_i2c_hid_ops; - -void variant_update_devtree(struct device *dev) -{ - uint32_t bid; - struct device *touchscreen_i2c_host; - struct device *child; - const struct bus *children_bus; - static const struct acpi_gpio new_enable_gpio = - ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146); - - bid = board_id(); - - /* Nothing to update. */ - if (bid == UNDEFINED_STRAPPING_ID || bid < 2) - return; - - touchscreen_i2c_host = dev_find_slot(0, PCH_DEVFN_I2C7); - - if (touchscreen_i2c_host == NULL) - return; - - children_bus = touchscreen_i2c_host->link_list; - child = NULL; - - /* Find all children on bus to update touchscreen enable gpio. */ - while ((child = dev_bus_each_child(children_bus, child)) != NULL) { - struct drivers_i2c_generic_config *cfg; - - /* No configration to change. */ - if (child->chip_info == NULL) - continue; - - if (child->chip_ops == &drivers_i2c_generic_ops) - cfg = child->chip_info; - else if (child->chip_ops == &drivers_i2c_hid_ops) { - struct drivers_i2c_hid_config *hid_cfg; - hid_cfg = child->chip_info; - cfg = &hid_cfg->generic; - } else - continue; - - /* Update the enable gpio. */ - memcpy(&cfg->enable_gpio, &new_enable_gpio, - sizeof(new_enable_gpio)); - } -} -- cgit v1.2.3