mb/google/volteer: Use device aliases
Use the device aliases provided by tigerlake chipset.cb instead of
the raw pci device+function. Take advantage of the default states
in chipset.cb and only list the devices that are enabled for all
volteer variants.
Change-Id: I5620004afd7fa4d50389f32dd79148960a2b2662
Signed-off-by: Duncan Laurie <dlaurie@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44039
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/mainboard/google/volteer/variants/halvor/overridetree.cb b/src/mainboard/google/volteer/variants/halvor/overridetree.cb
index 73767c6..f8b2921 100644
--- a/src/mainboard/google/volteer/variants/halvor/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/halvor/overridetree.cb
@@ -8,9 +8,10 @@
register "SaGv" = "SaGv_Disabled"
device domain 0 on
- device pci 07.2 on end # TBT_PCIe2
- device pci 0d.3 on end # TBT DMA1 0x9A1D
- device pci 15.0 on
+ # Baseboard does not have these on, so they must be enabled here.
+ device ref tbt_pcie_rp2 on end # TBT_PCIe2
+ device ref tbt_dma1 on end # TBT DMA1 0x9A1D
+ device ref i2c0 on
chip drivers/i2c/generic
register "hid" = ""10EC5682""
register "name" = ""RT58""
@@ -43,8 +44,8 @@
probe AUDIO MAX98373_ALC5682I_I2S_UP4
end
end
- end # I2C #0 0xA0E8
- device pci 15.1 on
+ end
+ device ref i2c1 on
chip drivers/i2c/hid
register "generic.hid" = ""GDIX0000""
register "generic.desc" = ""Goodix Touchscreen""
@@ -74,8 +75,8 @@
register "hid_desc_reg_offset" = "0x01"
device i2c 10 on end
end
- end # I2C1 0xA0E9
- device pci 15.2 on
+ end
+ device ref i2c2 on
chip drivers/i2c/sx9310
register "desc" = ""SAR0 Proximity Sensor""
register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F14_IRQ)"
@@ -106,8 +107,8 @@
register "reg_sar_ctrl2" = "0x3c"
device i2c 28 on end
end
- end # I2C2 0xA0EA
- device pci 19.1 on
+ end
+ device ref i2c5 on
chip drivers/i2c/generic
register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad""
@@ -116,7 +117,7 @@
register "probed" = "1"
device i2c 15 on end
end
- end # I2C5 0xA0C6
- device pci 1f.3 on end # Intel HD audio 0xA0C8-A0CF
+ end
+ device ref hda on end
end
end