summaryrefslogtreecommitdiff
path: root/src/mainboard/google/volteer/mainboard.c
diff options
context:
space:
mode:
authorJes Klinke <jbk@google.com>2020-12-01 15:21:38 -0800
committerPatrick Georgi <pgeorgi@google.com>2020-12-08 16:59:37 +0000
commit6e929acb73fd861c45f2b013a0d64f77b247b124 (patch)
treec123cd7eeebb9281a59dd00d479aadb1fac80a0f /src/mainboard/google/volteer/mainboard.c
parenta97fb7f9604ea9d90865c577d37376b82c915fb9 (diff)
mb/google/volteer: ACPI nodes for volteer2_ti50
Unique among the Volteer devices, the volteer2_ti50 variant connects to the TPM via I2C. This CL introduces the proper devicestree declarations for the Linux kernel to recognize that. overridetree.cb is shared between "sub"-variants volteer2 and volteer2_ti50, so both will have two TPM nodes, the I2C being disabled by default. The odd _ti50 variant then has code in variant.c to enable the I2C node and disable the SPI node. BUG=b:173461736 TEST=abuild -t GOOGLE_VOLTEER2{_TI50,} -c max -x Change-Id: I5576a595bbabc34c62b768f8b3439e35ff6bcf7b Signed-off-by: Jes Bodi Klinke <jbk@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/48223 Reviewed-by: Duncan Laurie <dlaurie@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/google/volteer/mainboard.c')
-rw-r--r--src/mainboard/google/volteer/mainboard.c20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/mainboard/google/volteer/mainboard.c b/src/mainboard/google/volteer/mainboard.c
index ea9e08f294..1f20e18ec7 100644
--- a/src/mainboard/google/volteer/mainboard.c
+++ b/src/mainboard/google/volteer/mainboard.c
@@ -23,8 +23,8 @@ extern struct chip_operations drivers_intel_pmc_mux_conn_ops;
static bool is_port1(struct device *dev)
{
- return dev->path.type == DEVICE_PATH_GENERIC && dev->path.generic.id == 1 &&
- dev->chip_ops == &drivers_intel_pmc_mux_conn_ops;
+ return dev->path.type == DEVICE_PATH_GENERIC && dev->path.generic.id == 1
+ && dev->chip_ops == &drivers_intel_pmc_mux_conn_ops;
}
static void typec_orientation_fixup(void)
@@ -53,14 +53,15 @@ static void typec_orientation_fixup(void)
if (!conn)
return;
- if (fw_config_probe(FW_CONFIG(DB_USB, USB4_GEN2)) ||
- fw_config_probe(FW_CONFIG(DB_USB, USB3_ACTIVE)) ||
- fw_config_probe(FW_CONFIG(DB_USB, USB4_GEN3)) ||
- fw_config_probe(FW_CONFIG(DB_USB, USB3_NO_A))) {
+ if (fw_config_probe(FW_CONFIG(DB_USB, USB4_GEN2))
+ || fw_config_probe(FW_CONFIG(DB_USB, USB3_ACTIVE))
+ || fw_config_probe(FW_CONFIG(DB_USB, USB4_GEN3))
+ || fw_config_probe(FW_CONFIG(DB_USB, USB3_NO_A))) {
struct drivers_intel_pmc_mux_conn_config *config = conn->chip_info;
if (config) {
- printk(BIOS_INFO, "Configure Right Type-C port orientation for retimer\n");
+ printk(BIOS_INFO,
+ "Configure Right Type-C port orientation for retimer\n");
config->sbu_orientation = TYPEC_ORIENTATION_NORMAL;
}
}
@@ -70,6 +71,11 @@ static void mainboard_init(struct device *dev)
{
mainboard_ec_init();
typec_orientation_fixup();
+ variant_devtree_update();
+}
+
+void __weak variant_devtree_update(void)
+{
}
static void add_fw_config_oem_string(const struct fw_config *config, void *arg)