From 8cf6088ba563b62d4539660ddb019be71a77fa78 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Mon, 26 Jan 2026 11:47:28 -0600 Subject: [PATCH] mb/google/octopus: Use aliases in device/overridetrees Convert all PCI device and USB port references in octopus baseboard devicetree and variant overridetrees to use aliases from the Geminilake chipset.cb instead of direct device/function numbers. This improves maintainability by using symbolic names, and reduces file size by eliminating entries which match those in the chipset or baseboard devicetrees. TEST=Build all octopus variants Change-Id: Ic4f93608234b52d548d8e5f94b137754e8924484 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/90925 Tested-by: build bot (Jenkins) Reviewed-by: Sean Rhodes --- .../octopus/variants/ampton/overridetree.cb | 16 +-- .../octopus/variants/baseboard/devicetree.cb | 112 +++++++----------- .../octopus/variants/bloog/overridetree.cb | 14 +-- .../octopus/variants/bobba/overridetree.cb | 20 ++-- .../octopus/variants/casta/overridetree.cb | 22 ++-- .../octopus/variants/dood/overridetree.cb | 14 +-- .../octopus/variants/fleex/overridetree.cb | 18 +-- .../octopus/variants/foob/overridetree.cb | 16 +-- .../octopus/variants/garg/overridetree.cb | 16 +-- .../octopus/variants/lick/overridetree.cb | 8 +- .../octopus/variants/meep/overridetree.cb | 38 +++--- .../octopus/variants/phaser/overridetree.cb | 16 +-- .../octopus/variants/yorp/overridetree.cb | 16 +-- 13 files changed, 153 insertions(+), 173 deletions(-) diff --git a/src/mainboard/google/octopus/variants/ampton/overridetree.cb b/src/mainboard/google/octopus/variants/ampton/overridetree.cb index ee607aa6f0..2647d518e6 100644 --- a/src/mainboard/google/octopus/variants/ampton/overridetree.cb +++ b/src/mainboard/google/octopus/variants/ampton/overridetree.cb @@ -71,7 +71,7 @@ chip soc/intel/apollolake }, }" device domain 0 on - device pci 16.0 on + device ref i2c0 on chip drivers/i2c/hid register "generic.hid" = ""WCOM50C1"" register "generic.desc" = ""WCOM Digitizer"" @@ -83,8 +83,8 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x1" device i2c 0x9 on end end - end # - I2C 0 - device pci 17.1 on + end + device ref i2c5 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -98,8 +98,8 @@ chip soc/intel/apollolake register "property_list[0].integer" = "1" device i2c 1a on end end - end # - I2C 5 - device pci 17.2 on + end + device ref i2c6 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -108,8 +108,8 @@ chip soc/intel/apollolake register "detect" = "1" device i2c 15 on end end - end # - I2C 6 - device pci 17.3 on + end + device ref i2c7 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" @@ -135,6 +135,6 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x01" device i2c 40 on end end - end # - I2C 7 + end end end diff --git a/src/mainboard/google/octopus/variants/baseboard/devicetree.cb b/src/mainboard/google/octopus/variants/baseboard/devicetree.cb index 671150d656..21c68bab82 100644 --- a/src/mainboard/google/octopus/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/octopus/variants/baseboard/devicetree.cb @@ -106,168 +106,148 @@ chip soc/intel/apollolake register "pnp_settings" = "PNP_PERF_POWER" device domain 0 on - device pci 00.0 on end # - Host Bridge - device pci 00.1 on end # - DPTF - device pci 00.2 off end # - NPK - device pci 02.0 on # - Gen + device ref igd on register "gfx" = "GMA_DEFAULT_PANEL(0)" end - device pci 03.0 off end # - Gaussian Mixture Model (GMM) - device pci 0c.0 on + device ref cnvi on chip drivers/wifi/generic register "wake" = "GPE0A_CNVI_PME_STS" device generic 0 on end end - end # - CNVi - device pci 0d.0 on end # - P2SB - device pci 0d.1 on end # - PMC - device pci 0d.2 on end # - Fast SPI - device pci 0d.3 on end # - Shared SRAM - device pci 0e.0 on + end + device ref p2sb on end + device ref pmc on end + device ref fast_spi on end + device ref sram on end + device ref hda on chip drivers/generic/max98357a register "hid" = ""MX98357A"" register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_91)" register "sdmode_delay" = "5" device generic 0 on end end - end # - Audio - device pci 0f.0 on end # - Heci1 - device pci 0f.1 on end # - Heci2 - device pci 0f.2 on end # - Heci3 - device pci 11.0 off end # - ISH - device pci 12.0 off end # - SATA - device pci 13.0 on + end + device ref heci1 on end + device ref heci2 on end + device ref heci3 on end + device ref pcie_rp01 on chip drivers/wifi/generic register "wake" = "GPE0_DW3_11" device pci 00.0 on end end - end # - PCIe-A 0 Onboard M2 Slot(Wifi) - device pci 13.1 off end # - PCIe-A 1 - device pci 13.2 off end # - PCIe-A 2 - device pci 13.3 off end # - PCIe-A 3 - device pci 14.0 off end # - PCIe-B 0 - device pci 14.1 off end # - PCIe-B 1 - device pci 15.0 on + end + device ref xhci on chip drivers/usb/acpi register "desc" = ""Root Hub"" register "type" = "UPC_TYPE_HUB" - 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 + device ref usb2_port1 on end end chip drivers/usb/acpi register "desc" = ""Left Type-A Port"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(1, 2)" - device usb 2.1 on end + device ref usb2_port2 on end end chip drivers/usb/acpi register "desc" = ""Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPIO_109)" - device usb 2.2 on end + device ref usb2_port3 on end end chip drivers/usb/acpi register "desc" = ""Right Type-A Port"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(2, 2)" - device usb 2.3 on end + device ref usb2_port4 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.4 on end + device ref usb2_port5 on end end chip drivers/usb/acpi register "desc" = ""SDCard"" register "type" = "UPC_TYPE_EXPRESSCARD" - device usb 2.5 on end + device ref usb2_port6 on end end chip drivers/usb/acpi register "desc" = ""User Facing Camera"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.6 on end + device ref usb2_port7 on end end chip drivers/usb/acpi register "desc" = ""World Facing Camera"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.7 on end + device ref usb2_port8 on end end chip drivers/usb/acpi register "desc" = ""Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPIO_109)" - device usb 2.8 on end + device ref usb2_port9 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 + device ref usb3_port1 on end end chip drivers/usb/acpi register "desc" = ""Left Type-A Port"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(1, 2)" - device usb 3.1 on end + device ref usb3_port2 on end end chip drivers/usb/acpi register "desc" = ""Right Type-A Port"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(2, 2)" - device usb 3.3 on end + device ref usb3_port4 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.4 on end + device ref usb3_port5 on end end chip drivers/usb/acpi register "desc" = ""SDCard"" register "type" = "UPC_TYPE_EXPRESSCARD" - device usb 3.5 on end + device ref usb3_port6 on end end end end - end # - XHCI - device pci 15.1 off end # - XDCI - device pci 16.0 on end # - I2C 0 - device pci 16.1 off end # - I2C 1 - device pci 16.2 off end # - I2C 2 - device pci 16.3 off end # - I2C 3 - device pci 17.0 on end # - I2C 4 - device pci 17.1 on end # - I2C 5 - device pci 17.2 on end # - I2C 6 - device pci 17.3 off end # - I2C 7 - device pci 18.0 on end # - UART 0 - device pci 18.1 off end # - UART 1 - device pci 18.2 on end # - UART 2 - device pci 18.3 off end # - UART 3 - device pci 19.0 on + end + device ref i2c0 on end + device ref i2c4 on end + device ref i2c5 on end + device ref i2c6 on end + device ref uart0 on end + device ref uart2 on end + device ref spi0 on chip drivers/spi/acpi register "hid" = "ACPI_DT_NAMESPACE_HID" register "compat_string" = ""google,cr50"" register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_63_IRQ)" device spi 0 on end end - end # - GSPI 0 - device pci 19.1 off end # - SPI 1 - device pci 19.2 on end # - SPI 2 - device pci 1a.0 on end # - PWM - device pci 1c.0 on end # - eMMC - device pci 1d.0 on end # - UFS - device pci 1e.0 off end # - SDIO - device pci 1f.0 on + end + device ref spi2 on end + device ref pwm on end + device ref emmc on end + device ref ufs on end + device ref lpc_espi on chip ec/google/chromeec device pnp 0c09.0 on end end - end # - ESPI - device pci 1f.1 on end # - SMBUS + end + device ref smbus on end end # FSP provides UPD interface to execute IPC command. PMIC has diff --git a/src/mainboard/google/octopus/variants/bloog/overridetree.cb b/src/mainboard/google/octopus/variants/bloog/overridetree.cb index 32e17cbb1a..5b3db19d90 100644 --- a/src/mainboard/google/octopus/variants/bloog/overridetree.cb +++ b/src/mainboard/google/octopus/variants/bloog/overridetree.cb @@ -81,8 +81,8 @@ chip soc/intel/apollolake }" device domain 0 on - device pci 16.0 off end # - I2C 0 - device pci 17.1 on + device ref i2c0 off end + device ref i2c5 on chip drivers/i2c/da7219 register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_137_IRQ)" register "btn_cfg" = "50" @@ -113,8 +113,8 @@ chip soc/intel/apollolake register "property_list[0].integer" = "1" device i2c 1a on end end - end # - I2C 5 - device pci 17.2 on + end + device ref i2c6 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -123,8 +123,8 @@ chip soc/intel/apollolake register "detect" = "1" device i2c 15 on end end - end # - I2C 6 - device pci 17.3 on + end + device ref i2c7 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" @@ -164,7 +164,7 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x01" device i2c 40 on end end - end # - I2C 7 + end end # Disable compliance mode diff --git a/src/mainboard/google/octopus/variants/bobba/overridetree.cb b/src/mainboard/google/octopus/variants/bobba/overridetree.cb index a79d15e2f1..d466695eb3 100644 --- a/src/mainboard/google/octopus/variants/bobba/overridetree.cb +++ b/src/mainboard/google/octopus/variants/bobba/overridetree.cb @@ -92,7 +92,7 @@ chip soc/intel/apollolake }" device domain 0 on - device pci 16.0 on + device ref i2c0 on chip drivers/i2c/hid register "generic.hid" = ""WCOM50C1"" register "generic.desc" = ""WCOM Digitizer"" @@ -116,8 +116,8 @@ chip soc/intel/apollolake register "key.wakeup_event_action" = "EV_ACT_DEASSERTED" device generic 0 on end end - end # - I2C 0 - device pci 16.1 on + end + device ref i2c1 on chip drivers/i2c/sx9310 register "desc" = ""SAR Proximity Sensor"" register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_214_IRQ)" @@ -132,8 +132,8 @@ chip soc/intel/apollolake register "proxraw_strength" = "0" device i2c 28 on end end - end # - I2C 1 - device pci 17.1 on + end + device ref i2c5 on chip drivers/i2c/da7219 register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_137_IRQ)" register "btn_cfg" = "50" @@ -164,8 +164,8 @@ chip soc/intel/apollolake register "property_list[0].integer" = "1" device i2c 1a on end end - end # - I2C 5 - device pci 17.2 on + end + device ref i2c6 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -184,8 +184,8 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x20" device i2c 0x2c on end end - end # - I2C 6 - device pci 17.3 on + end + device ref i2c7 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" @@ -223,7 +223,7 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x01" device i2c 40 on end end - end # - I2C 7 + end end # Disable compliance mode diff --git a/src/mainboard/google/octopus/variants/casta/overridetree.cb b/src/mainboard/google/octopus/variants/casta/overridetree.cb index 8d3fafd956..a6cac573a3 100644 --- a/src/mainboard/google/octopus/variants/casta/overridetree.cb +++ b/src/mainboard/google/octopus/variants/casta/overridetree.cb @@ -83,33 +83,33 @@ chip soc/intel/apollolake }" device domain 0 on - device pci 15.0 on + device ref xhci on chip drivers/usb/acpi register "desc" = ""Root Hub"" register "type" = "UPC_TYPE_HUB" - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""Right Type-A Port"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(2, 2)" - device usb 2.1 on end + device ref usb2_port2 on end end chip drivers/usb/acpi - device usb 2.3 off end + device ref usb2_port4 off end end chip drivers/usb/acpi register "desc" = ""Right Type-A Port"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(2, 2)" - device usb 3.1 on end + device ref usb3_port2 on end end chip drivers/usb/acpi - device usb 3.3 off end + device ref usb3_port4 off end end end end - end # - XHCI - device pci 17.1 on + end + device ref i2c5 on chip drivers/i2c/da7219 register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_137_IRQ)" register "btn_cfg" = "50" @@ -127,8 +127,8 @@ chip soc/intel/apollolake register "mic_amp_in_sel" = ""diff"" device i2c 1a on end end - end # - I2C 5 - device pci 17.2 on + end + device ref i2c6 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -146,7 +146,7 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0xE" device i2c 40 on end end - end # - I2C 6 + end end # Disable compliance mode diff --git a/src/mainboard/google/octopus/variants/dood/overridetree.cb b/src/mainboard/google/octopus/variants/dood/overridetree.cb index eb8490da76..8e04bd3060 100644 --- a/src/mainboard/google/octopus/variants/dood/overridetree.cb +++ b/src/mainboard/google/octopus/variants/dood/overridetree.cb @@ -80,8 +80,8 @@ chip soc/intel/apollolake }" device domain 0 on - device pci 16.0 off end # - I2C 0 - device pci 17.1 on + device ref i2c0 off end + device ref i2c5 on chip drivers/i2c/da7219 register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_137_IRQ)" register "btn_cfg" = "50" @@ -99,8 +99,8 @@ chip soc/intel/apollolake register "mic_amp_in_sel" = ""diff"" device i2c 1a on end end - end # - I2C 5 - device pci 17.2 on + end + device ref i2c6 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -119,8 +119,8 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x20" device i2c 0x2c on end end - end # - I2C 6 - device pci 17.3 on + end + device ref i2c7 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" @@ -158,7 +158,7 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x01" device i2c 40 on end end - end # - I2C 7 + end end # Disable compliance mode diff --git a/src/mainboard/google/octopus/variants/fleex/overridetree.cb b/src/mainboard/google/octopus/variants/fleex/overridetree.cb index 3a17abba45..4583787f88 100644 --- a/src/mainboard/google/octopus/variants/fleex/overridetree.cb +++ b/src/mainboard/google/octopus/variants/fleex/overridetree.cb @@ -89,7 +89,7 @@ chip soc/intel/apollolake register "disable_xhci_lfps_pm" = "0" device domain 0 on - device pci 16.0 on + device ref i2c0 on chip drivers/i2c/hid register "generic.hid" = ""WCOM50C1"" register "generic.desc" = ""WCOM Digitizer"" @@ -102,9 +102,9 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x1" device i2c 0x9 on end end - end # - I2C 0 - device pci 16.1 off end # - I2C 1 - device pci 17.1 on + end + device ref i2c1 off end + device ref i2c5 on chip drivers/i2c/da7219 register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_137_IRQ)" register "btn_cfg" = "50" @@ -151,8 +151,8 @@ chip soc/intel/apollolake register "hs_bias_sense_disable" = "true" device i2c 48 on end end - end # - I2C 5 - device pci 17.2 on + end + device ref i2c6 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -170,8 +170,8 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x20" device i2c 2c on end end - end # - I2C 6 - device pci 17.3 on + end + device ref i2c7 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" @@ -210,6 +210,6 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x01" device i2c 40 on end end - end # - I2C 7 + end end end diff --git a/src/mainboard/google/octopus/variants/foob/overridetree.cb b/src/mainboard/google/octopus/variants/foob/overridetree.cb index 154345599c..b7d70935f2 100644 --- a/src/mainboard/google/octopus/variants/foob/overridetree.cb +++ b/src/mainboard/google/octopus/variants/foob/overridetree.cb @@ -83,7 +83,7 @@ chip soc/intel/apollolake }" device domain 0 on - device pci 16.0 on + device ref i2c0 on chip drivers/i2c/hid register "generic.hid" = ""WCOM50C1"" register "generic.desc" = ""WCOM Digitizer"" @@ -94,8 +94,8 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x1" device i2c 0x9 on end end - end # - I2C 0 - device pci 17.1 on + end + device ref i2c5 on chip drivers/i2c/da7219 register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_137_IRQ)" register "btn_cfg" = "50" @@ -113,8 +113,8 @@ chip soc/intel/apollolake register "mic_amp_in_sel" = ""diff"" device i2c 1a on end end - end # - I2C 5 - device pci 17.2 on + end + device ref i2c6 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -133,8 +133,8 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x20" device i2c 0x2c on end end - end # - I2C 6 - device pci 17.3 on + end + device ref i2c7 on chip drivers/i2c/hid register "generic.hid" = ""ELAN90FC"" register "generic.desc" = ""ELAN Touchscreen"" @@ -159,7 +159,7 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x20" device i2c 20 on end end - end # - I2C 7 + end end # Disable xHCI compliance mode diff --git a/src/mainboard/google/octopus/variants/garg/overridetree.cb b/src/mainboard/google/octopus/variants/garg/overridetree.cb index a653148d10..4084297fe6 100644 --- a/src/mainboard/google/octopus/variants/garg/overridetree.cb +++ b/src/mainboard/google/octopus/variants/garg/overridetree.cb @@ -86,7 +86,7 @@ chip soc/intel/apollolake }" device domain 0 on - device pci 16.0 on + device ref i2c0 on chip drivers/i2c/hid register "generic.hid" = ""WCOM50C1"" register "generic.desc" = ""WCOM Digitizer"" @@ -109,8 +109,8 @@ chip soc/intel/apollolake register "key.wakeup_event_action" = "EV_ACT_DEASSERTED" device generic 0 on end end - end # - I2C 0 - device pci 17.1 on + end + device ref i2c5 on chip drivers/i2c/da7219 register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_137_IRQ)" register "btn_cfg" = "50" @@ -141,8 +141,8 @@ chip soc/intel/apollolake register "property_list[0].integer" = "1" device i2c 1a on end end - end # - I2C 5 - device pci 17.2 on + end + device ref i2c6 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -161,8 +161,8 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x20" device i2c 0x2c on end end - end # - I2C 6 - device pci 17.3 on + end + device ref i2c7 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" @@ -200,7 +200,7 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x01" device i2c 40 on end end - end # - I2C 7 + end end # Disable compliance mode diff --git a/src/mainboard/google/octopus/variants/lick/overridetree.cb b/src/mainboard/google/octopus/variants/lick/overridetree.cb index a89a506dae..a534173a6b 100644 --- a/src/mainboard/google/octopus/variants/lick/overridetree.cb +++ b/src/mainboard/google/octopus/variants/lick/overridetree.cb @@ -73,7 +73,7 @@ chip soc/intel/apollolake }" device domain 0 on - device pci 17.1 on + device ref i2c5 on chip drivers/i2c/da7219 register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_137_IRQ)" register "btn_cfg" = "50" @@ -91,8 +91,8 @@ chip soc/intel/apollolake register "mic_amp_in_sel" = ""diff"" device i2c 1a on end end - end # - I2C 5 - device pci 17.2 on + end + device ref i2c6 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -111,7 +111,7 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x20" device i2c 0x2c on end end - end # - I2C 6 + end end # Disable compliance mode diff --git a/src/mainboard/google/octopus/variants/meep/overridetree.cb b/src/mainboard/google/octopus/variants/meep/overridetree.cb index 9634cf13bb..11038d7e0a 100644 --- a/src/mainboard/google/octopus/variants/meep/overridetree.cb +++ b/src/mainboard/google/octopus/variants/meep/overridetree.cb @@ -83,63 +83,63 @@ chip soc/intel/apollolake }" device domain 0 on - device pci 15.0 on + device ref xhci on chip drivers/usb/acpi register "desc" = ""Root Hub"" register "type" = "UPC_TYPE_HUB" - device usb 0.0 on + device ref xhci_root_hub on 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.0 on end + device ref usb2_port1 on end end chip drivers/usb/acpi register "desc" = ""Right Type-A Port"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(2, 2)" - device usb 2.1 on end + device ref usb2_port2 on end end chip drivers/usb/acpi register "desc" = ""Left Type-A Port"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(1, 2)" - device usb 2.3 on end + device ref usb2_port4 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 2.4 on end + device ref usb2_port5 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.0 on end + device ref usb3_port1 on end end chip drivers/usb/acpi register "desc" = ""Right Type-A Port"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(2, 2)" - device usb 3.1 on end + device ref usb3_port2 on end end chip drivers/usb/acpi register "desc" = ""Left Type-A Port"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(1, 2)" - device usb 3.3 on end + device ref usb3_port4 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.4 on end + device ref usb3_port5 on end end end end - end # - XHCI - device pci 16.0 on + end + device ref i2c0 on chip drivers/i2c/hid register "generic.hid" = ""WCOM50C1"" register "generic.desc" = ""WCOM Digitizer"" @@ -162,8 +162,8 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x1" device i2c 0xa on end end - end # - I2C 0 - device pci 17.1 on + end + device ref i2c5 on chip drivers/i2c/da7219 register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_137_IRQ)" register "btn_cfg" = "50" @@ -194,8 +194,8 @@ chip soc/intel/apollolake register "property_list[0].integer" = "1" device i2c 1a on end end - end # - I2C 5 - device pci 17.2 on + end + device ref i2c6 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -204,8 +204,8 @@ chip soc/intel/apollolake register "detect" = "1" device i2c 15 on end end - end # - I2C 6 - device pci 17.3 on + end + device ref i2c7 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" @@ -244,7 +244,7 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x01" device i2c 40 on end end - end # - I2C 7 + end end # Disable compliance mode diff --git a/src/mainboard/google/octopus/variants/phaser/overridetree.cb b/src/mainboard/google/octopus/variants/phaser/overridetree.cb index 41b654c871..468ae4cb90 100644 --- a/src/mainboard/google/octopus/variants/phaser/overridetree.cb +++ b/src/mainboard/google/octopus/variants/phaser/overridetree.cb @@ -83,7 +83,7 @@ chip soc/intel/apollolake }" device domain 0 on - device pci 16.0 on + device ref i2c0 on chip drivers/i2c/hid register "generic.hid" = ""WCOM50C1"" register "generic.desc" = ""WCOM Digitizer"" @@ -95,8 +95,8 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x1" device i2c 0x9 on end end - end # - I2C 0 - device pci 17.1 on + end + device ref i2c5 on chip drivers/i2c/da7219 register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_137_IRQ)" register "btn_cfg" = "50" @@ -127,8 +127,8 @@ chip soc/intel/apollolake register "property_list[0].integer" = "1" device i2c 1a on end end - end # - I2C 5 - device pci 17.2 on + end + device ref i2c6 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -147,8 +147,8 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x20" device i2c 0x2c on end end - end # - I2C 6 - device pci 17.3 on + end + device ref i2c7 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" @@ -198,7 +198,7 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x01" device i2c 40 on end end - end # - I2C 7 + end end # Disable xHCI compliance mode diff --git a/src/mainboard/google/octopus/variants/yorp/overridetree.cb b/src/mainboard/google/octopus/variants/yorp/overridetree.cb index 82a0ee4263..85db9f2aae 100644 --- a/src/mainboard/google/octopus/variants/yorp/overridetree.cb +++ b/src/mainboard/google/octopus/variants/yorp/overridetree.cb @@ -42,7 +42,7 @@ chip soc/intel/apollolake register "emmc_rx_strobe_cntl" = "0x0a0a" device domain 0 on - device pci 16.0 on + device ref i2c0 on chip drivers/i2c/hid register "generic.hid" = ""WCOM50C1"" register "generic.desc" = ""WCOM Digitizer"" @@ -53,8 +53,8 @@ chip soc/intel/apollolake register "hid_desc_reg_offset" = "0x1" device i2c 0x9 on end end - end # - I2C 0 - device pci 17.1 on + end + device ref i2c5 on chip drivers/i2c/da7219 register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_137_IRQ)" register "btn_cfg" = "50" @@ -72,8 +72,8 @@ chip soc/intel/apollolake register "mic_amp_in_sel" = ""diff"" device i2c 1a on end end - end # - I2C 5 - device pci 17.2 on + end + device ref i2c6 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -82,8 +82,8 @@ chip soc/intel/apollolake register "detect" = "1" device i2c 15 on end end - end # - I2C 6 - device pci 17.3 on + end + device ref i2c7 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" @@ -96,6 +96,6 @@ chip soc/intel/apollolake register "has_power_resource" = "true" device i2c 10 on end end - end # - I2C 7 + end end end