From 1dd435c630518aac095a012114de2fe65df587c6 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sun, 22 Oct 2023 17:40:15 -0500 Subject: [PATCH] mb/google/hatch/var/helios_diskswap: Use chipset devicetree references Switch helios_diskswap overridetree to use chipset devicetree references. Change-Id: I0a3385139c74a59c2006b8963850d00ee39f70a8 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/78560 Reviewed-by: Martin L Roth Tested-by: build bot (Jenkins) Reviewed-by: Eric Lai --- .../variants/helios_diskswap/overridetree.cb | 37 ++++++++----------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/src/mainboard/google/hatch/variants/helios_diskswap/overridetree.cb b/src/mainboard/google/hatch/variants/helios_diskswap/overridetree.cb index d82cb733b0..3a4fe087ff 100644 --- a/src/mainboard/google/hatch/variants/helios_diskswap/overridetree.cb +++ b/src/mainboard/google/hatch/variants/helios_diskswap/overridetree.cb @@ -76,33 +76,32 @@ chip soc/intel/cannonlake }" device domain 0 on - device pci 02.0 on # Integrated Graphics Device + device ref igpu on register "gfx" = "GMA_DEFAULT_PANEL(0)" end - device pci 14.0 on + device ref xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi # No Type-A port - device usb 2.2 off end + device ref usb2_port3 off end end chip drivers/usb/acpi # No Type-A Port - device usb 2.3 off end + device ref usb2_port4 off end end chip drivers/usb/acpi # No WWAN - device usb 2.5 off end + device ref usb2_port6 off end end chip drivers/usb/acpi # No WWAN - device usb 3.4 off end + device ref usb3_port5 off end end end end end - - device pci 15.0 on + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -111,8 +110,7 @@ chip soc/intel/cannonlake device i2c 15 on end end end - - device pci 15.1 on + device ref i2c1 on chip drivers/i2c/hid register "generic.hid" = ""GDIX0000"" register "generic.desc" = ""Goodix Touchscreen"" @@ -144,8 +142,7 @@ chip soc/intel/cannonlake device generic 0 on end end end # I2C 1 - - device pci 19.0 on + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -187,11 +184,9 @@ chip soc/intel/cannonlake device i2c 3b on end end end #I2C #4 - - device pci 1d.0 on end # PCI Express Port 9 (X2 NVMe) - device pci 1d.2 on end # PCI Express Port 11 (X2 NVMe) - - device pci 1e.3 on + device ref pcie_rp9 on end # (x2 NVMe) + device ref pcie_rp11 on end # (x2 NVMe) + device ref gspi1 on chip drivers/spi/acpi register "name" = ""CRFP"" register "hid" = "ACPI_DT_NAMESPACE_HID" @@ -201,8 +196,8 @@ chip soc/intel/cannonlake register "wake" = "GPE0_DW0_23" device spi 1 on end end # FPMCU - end # GSPI #1 - device pci 1f.3 on + end + device ref hda on chip drivers/generic/max98357a register "hid" = ""MX98357A"" register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_H3)" @@ -215,6 +210,6 @@ chip soc/intel/cannonlake register "mic_tplg" = "_2ch_pdm0" device generic 0 on end end - end # Intel HDA + end end end