mb/google/hatch/var/kohaku: Use chipset devicetree references
Switch kohaku overridetree to use chipset devicetree references.
Drop USB port overrides which are identical to the baseboard.
Change-Id: Idcfde6882fc433e6a248aff6baf23b1a5bf7d201
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78566
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
diff --git a/src/mainboard/google/hatch/variants/kohaku/overridetree.cb b/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
index 94dd024..9b55d90 100644
--- a/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
@@ -73,85 +73,55 @@
}"
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
- register "desc" = ""Left Type-C Port""
- register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
- register "group" = "ACPI_PLD_GROUP(1, 1)"
- device usb 2.0 on end
- end
- chip drivers/usb/acpi
- register "desc" = ""Right Type-C Port""
- register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
- register "group" = "ACPI_PLD_GROUP(2, 1)"
- device usb 2.1 on end
- end
- chip drivers/usb/acpi
- device usb 2.2 off end
+ device ref usb2_port3 off end
end
chip drivers/usb/acpi
register "desc" = ""Micro SD Card""
register "type" = "UPC_TYPE_INTERNAL"
- device usb 2.3 on end
+ device ref usb2_port4 on end
end
chip drivers/usb/acpi
- device usb 2.4 off end
+ device ref usb2_port5 off end
end
chip drivers/usb/acpi
- device usb 2.5 off end
+ device ref usb2_port6 off end
end
chip drivers/usb/acpi
- register "desc" = ""Camera""
- register "type" = "UPC_TYPE_INTERNAL"
- device usb 2.6 on end
+ device ref usb2_port8 off end
end
chip drivers/usb/acpi
- device usb 2.7 off end
- end
- chip drivers/usb/acpi
- device usb 2.8 off end
+ device ref usb2_port9 off end
end
chip drivers/usb/acpi
register "desc" = ""Bluetooth""
register "type" = "UPC_TYPE_INTERNAL"
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)"
- device usb 2.9 on end
- end
- chip drivers/usb/acpi
- register "desc" = ""Left Type-C Port""
- register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
- register "group" = "ACPI_PLD_GROUP(1, 1)"
- device usb 3.0 on end
- end
- chip drivers/usb/acpi
- register "desc" = ""Right Type-C Port""
- register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
- register "group" = "ACPI_PLD_GROUP(2, 1)"
- device usb 3.1 on end
+ device ref usb2_port10 on end
end
chip drivers/usb/acpi
register "desc" = ""WF Camera""
register "type" = "UPC_TYPE_INTERNAL"
- device usb 3.2 on end
+ device ref usb3_port3 on end
end
chip drivers/usb/acpi
register "desc" = ""Micro SD card""
register "type" = "UPC_TYPE_INTERNAL"
- device usb 3.3 on end
+ device ref usb3_port4 on end
end
chip drivers/usb/acpi
- device usb 3.4 off end
+ device ref usb3_port5 off end
end
end
end
- end
-
- device pci 15.0 on
+ end # XHCI
+ device ref i2c0 on
chip drivers/i2c/hid
register "generic.hid" = ""SYNA0000""
register "generic.cid" = ""ACPI0C50""
@@ -162,9 +132,8 @@
register "hid_desc_reg_offset" = "0x20"
device i2c 0x20 on end
end
- end # I2C 0
-
- device pci 15.1 on
+ end
+ device ref i2c1 on
chip drivers/i2c/generic
register "hid" = "ACPI_DT_NAMESPACE_HID"
register "compat_string" = ""atmel,maxtouch""
@@ -194,8 +163,7 @@
device i2c 10 on end
end
end # I2C #1
-
- device pci 15.2 on
+ device ref i2c2 on
chip drivers/i2c/hid
register "generic.hid" = ""WCOM50C1""
register "generic.desc" = ""WCOM Digitizer""
@@ -221,8 +189,8 @@
register "key.label" = ""pen_eject""
device generic 0 on end
end
- end # I2C #2
- device pci 19.0 on
+ end
+ device ref i2c4 on
chip drivers/i2c/da7219
# TODO: these settings were copied from another board
# with the same chip. verify the settings
@@ -243,10 +211,9 @@
device i2c 0x1a on end
end
end
-
# No PCIe WiFi
- device pci 1d.5 off end
- device pci 1e.3 on
+ device ref pcie_rp14 off end
+ device ref gspi1 on
chip drivers/spi/acpi
register "name" = ""CRFP""
register "hid" = "ACPI_DT_NAMESPACE_HID"
@@ -256,8 +223,8 @@
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)"
@@ -270,6 +237,6 @@
register "mic_tplg" = "_2ch_pdm0"
device generic 0 on end
end
- end # Intel HDA
- end # domain
+ end
+ end
end