[coreboot-gerrit] Change in ...coreboot[master]: mb/google/octopus/var/bobba: Deprecate board id < 2
Furquan Shaikh (Code Review)
gerrit at coreboot.org
Wed Nov 21 23:52:49 CET 2018
Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/29786
Change subject: mb/google/octopus/var/bobba: Deprecate board id < 2
......................................................................
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 <furquan at google.com>
---
M src/mainboard/google/octopus/variants/bobba/Makefile.inc
M src/mainboard/google/octopus/variants/bobba/gpio.c
M src/mainboard/google/octopus/variants/bobba/overridetree.cb
D src/mainboard/google/octopus/variants/bobba/variant.c
4 files changed, 7 insertions(+), 88 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/29786/1
diff --git a/src/mainboard/google/octopus/variants/bobba/Makefile.inc b/src/mainboard/google/octopus/variants/bobba/Makefile.inc
index d54ed40..9fb63f5 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 1b5c0bb..acdcf97 100644
--- a/src/mainboard/google/octopus/variants/bobba/gpio.c
+++ b/src/mainboard/google/octopus/variants/bobba/gpio.c
@@ -32,20 +32,13 @@
/* 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 dab13a5..c0f37e2 100644
--- a/src/mainboard/google/octopus/variants/bobba/overridetree.cb
+++ b/src/mainboard/google/octopus/variants/bobba/overridetree.cb
@@ -102,7 +102,7 @@
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 @@
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 200f460..0000000
--- 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 <arch/acpi_device.h>
-#include <baseboard/variants.h>
-#include <boardid.h>
-#include <device/device.h>
-#include <drivers/i2c/generic/chip.h>
-#include <drivers/i2c/hid/chip.h>
-#include <soc/gpio.h>
-#include <soc/pci_devs.h>
-#include <string.h>
-
-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));
- }
-}
--
To view, visit https://review.coreboot.org/c/coreboot/+/29786
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I42fb7ef90e421118a8fdfa0d343d0bcf4a9bc087
Gerrit-Change-Number: 29786
Gerrit-PatchSet: 1
Gerrit-Owner: Furquan Shaikh <furquan at google.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181121/56c1faa0/attachment-0001.html>
More information about the coreboot-gerrit
mailing list