diff --git a/src/mainboard/google/dedede/variants/awasuki/overridetree.cb b/src/mainboard/google/dedede/variants/awasuki/overridetree.cb index f791468b2b..570403f81f 100644 --- a/src/mainboard/google/dedede/variants/awasuki/overridetree.cb +++ b/src/mainboard/google/dedede/variants/awasuki/overridetree.cb @@ -84,7 +84,7 @@ chip soc/intel/jasperlake register "SdCardPowerEnableActiveHigh" = "0" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf ## sensor information register "options.tsr[0].desc" = ""Ambient"" @@ -134,48 +134,30 @@ chip soc/intel/jasperlake }" device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on - chip drivers/usb/acpi - device usb 2.1 off end - end - chip drivers/usb/acpi - device usb 2.3 off end - end - chip drivers/usb/acpi - device usb 2.4 off end - end + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""User Facing Camera"" register "type" = "UPC_TYPE_INTERNAL" register "has_power_resource" = "true" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D15)" register "enable_delay_ms" = "20" - device usb 2.5 on end - end - chip drivers/usb/acpi - device usb 2.6 off end - end - chip drivers/usb/acpi - device usb 3.1 off end - end - chip drivers/usb/acpi - device usb 3.3 off end + device ref usb2_port6 on end end end end - end # USB xHCI - device pci 14.3 on + end + device ref cnvi_wifi on chip drivers/wifi/generic register "wake" = "GPE0_PME_B0" register "enable_cnvi_ddr_rfim" = "true" register "add_acpi_dma_property" = "true" device generic 0 on end end - end # CNVi wifi - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/hid register "generic.hid" = ""PNP0C50"" register "generic.desc" = ""PIXART Touchpad"" @@ -185,8 +167,8 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x01" device i2c 15 on end end - end # I2C 0 - device pci 15.2 on + end + device ref i2c2 on probe TOUCHSCREEN TOUCHSCREEN_PRESENT chip drivers/i2c/generic register "hid" = ""ELAN0001"" @@ -206,8 +188,8 @@ chip soc/intel/jasperlake register "has_power_resource" = "true" device i2c 10 on end end - end # I2C 2 - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/rt5645 register "hid" = ""10EC5650"" register "name" = ""RT58"" @@ -217,20 +199,20 @@ chip soc/intel/jasperlake register "jd_mode" = "2" device i2c 1a on end end - end # I2C 4 - device pci 1c.7 on + end + device ref pcie_rp8 on chip drivers/wifi/generic register "wake" = "GPE0_DW2_03" device pci 00.0 on end end - end # PCI Express Root Port 8 - WLAN - device pci 1f.3 on + end + device ref hda on chip drivers/sof register "spkr_tplg" = "rt5650_sp" register "jack_tplg" = "rt5650_hp" register "mic_tplg" = "_2ch_pdm0" device generic 0 on end end - end # Intel HDA/cAVS + end end end diff --git a/src/mainboard/google/dedede/variants/baseboard/devicetree.cb b/src/mainboard/google/dedede/variants/baseboard/devicetree.cb index 05c77da3e5..240c3e6c4b 100644 --- a/src/mainboard/google/dedede/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/dedede/variants/baseboard/devicetree.cb @@ -228,11 +228,10 @@ chip soc/intel/jasperlake register "xhci_lfps_sampling_offtime_ms" = "9" device domain 0 on - device pci 00.0 on end # Host Bridge - device pci 02.0 on + device ref igpu on register "gfx" = "GMA_DEFAULT_PANEL(0)" - end # Integrated Graphics Device - device pci 04.0 on + end + device ref dptf on # Default DPTF Policy for all Dedede boards if not overridden chip drivers/intel/dptf ## Passive Policy @@ -283,132 +282,96 @@ chip soc/intel/jasperlake device generic 0 on end end - end # SA Thermal device - device pci 05.0 off end # IPU - device pci 08.0 on end # GNA - device pci 09.0 off end # Intel Trace Hub - device pci 12.6 off end # GSPI 2 - device pci 14.0 on + end + device ref gna on end + device ref south_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" = ""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 + 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.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 - end - chip drivers/usb/acpi - device usb 2.4 off end - end - chip drivers/usb/acpi - device usb 2.5 off end - end - chip drivers/usb/acpi - device usb 2.6 off end + device ref usb2_port4 on end end chip drivers/usb/acpi register "desc" = ""Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H19)" - device usb 2.7 on end + device ref usb2_port8 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" = ""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 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.2 on end + device ref usb3_port3 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 end end - end # USB xHCI - device pci 14.1 off end # USB xDCI (OTG) - device pci 14.2 on end # PMC SRAM - device pci 14.3 on + end + device ref shared_ram on end + device ref cnvi_wifi on chip drivers/wifi/generic register "wake" = "GPE0_PME_B0" device generic 0 on end end - end # CNVi wifi - device pci 14.5 on end # SDCard - device pci 15.0 off end # I2C 0 - device pci 15.1 off end # I2C 1 - device pci 15.2 off end # I2C 2 - device pci 15.3 off end # I2C 3 - device pci 16.0 on end # HECI 1 - device pci 16.1 off end # HECI 2 - device pci 16.4 off end # HECI 3 - device pci 16.5 off end # HECI 4 - device pci 17.0 off end # SATA - device pci 19.0 off end # I2C 4 - device pci 19.1 off end # I2C 5 - device pci 19.2 on end # UART 2 - device pci 1a.0 on end # eMMC - device pci 1c.0 off end # PCI Express Root Port 1 - device pci 1c.1 off end # PCI Express Root Port 2 - device pci 1c.2 off end # PCI Express Root Port 3 - device pci 1c.3 off end # PCI Express Root Port 4 - device pci 1c.4 off end # PCI Express Root Port 5 - device pci 1c.5 off end # PCI Express Root Port 6 - device pci 1c.6 off end # PCI Express Root Port 7 - # External PCIe port 4 is mapped to PCIe Root port 8 - device pci 1c.7 off end # PCI Express Root Port 8 - hosts M.2 E-key WLAN - device pci 1e.0 off end # UART 0 - device pci 1e.1 off end # UART 1 - device pci 1e.2 on + end + device ref sdxc on end + device ref heci1 on end + device ref i2c4 on end + device ref uart2 on end + device ref emmc on end + device ref gspi0 on chip drivers/spi/acpi register "hid" = "ACPI_DT_NAMESPACE_HID" register "compat_string" = ""google,cr50"" register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_B4_IRQ)" device spi 0 on end end - end # GSPI 0 - device pci 1e.3 off end # GSPI 1 - device pci 1f.0 on + end + device ref pch_espi on chip ec/google/chromeec device pnp 0c09.0 on end end - end # eSPI Interface - device pci 1f.1 on end # P2SB - device pci 1f.2 hidden end # Power Management Controller - device pci 1f.3 on + end + device ref hda on chip drivers/sof register "spkr_tplg" = "rt1015" register "jack_tplg" = "rt5682" @@ -427,9 +390,6 @@ chip soc/intel/jasperlake probe AUDIO_AMP MAX98360 end end - end # Intel HDA/cAVS - device pci 1f.4 off end # SMBus - device pci 1f.5 on end # PCH SPI - device pci 1f.7 off end # Intel Trace Hub + end end end diff --git a/src/mainboard/google/dedede/variants/beadrix/overridetree.cb b/src/mainboard/google/dedede/variants/beadrix/overridetree.cb index cba95da235..a1c95148ba 100644 --- a/src/mainboard/google/dedede/variants/beadrix/overridetree.cb +++ b/src/mainboard/google/dedede/variants/beadrix/overridetree.cb @@ -60,7 +60,7 @@ chip soc/intel/jasperlake register "SerialIoI2cMode[PchSerialIoIndexI2C5]" = "PchSerialIoPci" device domain 0 on - device pci 04.0 on + device ref dptf on # Default DPTF Policy for all Dedede boards if not overridden chip drivers/intel/dptf register "options.tsr[0].desc" = ""Memory"" @@ -100,10 +100,10 @@ chip soc/intel/jasperlake device generic 0 on end end end - device pci 05.0 off end # IPU - MIPI Camera - device pci 14.0 on + device ref ipu off end + device ref south_xhci on chip drivers/usb/acpi - 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" @@ -117,7 +117,7 @@ chip soc/intel/jasperlake 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 + device ref usb3_port2 on probe DB_PORTS DB_PORTS_1C_LTE probe DB_PORTS DB_PORTS_1C end @@ -135,15 +135,15 @@ chip soc/intel/jasperlake register "reset_off_delay_ms" = "20" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A10)" register "enable_delay_ms" = "20" - device usb 3.3 on + device ref usb3_port4 on probe DB_PORTS DB_PORTS_1C_LTE probe DB_PORTS DB_PORTS_LTE end end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/hid register "generic.hid" = ""PIXA2635"" register "generic.desc" = ""PIXA Touchpad"" @@ -153,8 +153,8 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x01" device i2c 15 on end end - end # I2C 0 - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -182,8 +182,8 @@ chip soc/intel/jasperlake probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682I_VS end end - end # I2C 4 - device pci 19.1 on + end + device ref i2c5 on chip drivers/i2c/sx9324 register "desc" = ""SAR Proximity Sensor"" register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E11_IRQ)" @@ -239,13 +239,13 @@ chip soc/intel/jasperlake probe DB_PORTS DB_PORTS_LTE end end - end # I2C 5 - device pci 1f.3 on + end + device ref hda on chip drivers/generic/max98357a register "hid" = ""MX98360A"" register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/blipper/overridetree.cb b/src/mainboard/google/dedede/variants/blipper/overridetree.cb index db0bdc2049..535c0f6934 100644 --- a/src/mainboard/google/dedede/variants/blipper/overridetree.cb +++ b/src/mainboard/google/dedede/variants/blipper/overridetree.cb @@ -63,7 +63,7 @@ chip soc/intel/jasperlake register "FastPkgCRampDisable" = "1" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf ## Passive Policy register "policies.passive" = "{ @@ -89,19 +89,19 @@ chip soc/intel/jasperlake .granularity = 1000,}" device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""UFCamera"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.5 on end + device ref usb2_port6 on end end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -120,8 +120,8 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x20" device i2c 0x2c on end end - end # I2C 0 - device pci 15.2 on + end + device ref i2c2 on chip drivers/i2c/hid register "generic.hid" = ""GTCH7503"" register "generic.desc" = ""G2 Touchscreen"" @@ -157,8 +157,8 @@ chip soc/intel/jasperlake register "has_power_resource" = "true" device i2c 10 on end end - end # I2C 2 - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -186,12 +186,12 @@ chip soc/intel/jasperlake probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682I_VS end end - end # I2C 4 - device pci 1f.3 on + end + device ref hda on chip drivers/generic/alc1015 register "sdb" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/boten/overridetree.cb b/src/mainboard/google/dedede/variants/boten/overridetree.cb index a1c33fa809..5e3614c0b4 100644 --- a/src/mainboard/google/dedede/variants/boten/overridetree.cb +++ b/src/mainboard/google/dedede/variants/boten/overridetree.cb @@ -89,7 +89,7 @@ chip soc/intel/jasperlake register "xhci_lfps_sampling_offtime_ms" = "0" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf ## Passive Policy register "policies.passive" = "{ @@ -136,17 +136,17 @@ chip soc/intel/jasperlake device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_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, 1)" - device usb 2.1 on end + device ref usb2_port2 on end end chip drivers/usb/acpi register "desc" = ""LTE"" @@ -156,33 +156,33 @@ chip soc/intel/jasperlake register "reset_off_delay_ms" = "10" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A10)" register "enable_delay_ms" = "20" - device usb 2.3 on end + device ref usb2_port4 on end end chip drivers/usb/acpi register "desc" = ""UFCamera"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.5 on end + device ref usb2_port6 on end end chip drivers/usb/acpi register "desc" = ""WFCamera"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.6 on end + device ref usb2_port7 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, 1)" - device usb 3.1 on end + device ref usb3_port2 on end end chip drivers/usb/acpi register "desc" = ""LTE"" register "type" = "UPC_TYPE_INTERNAL" - device usb 3.3 on end + device ref usb3_port4 on end end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -201,8 +201,8 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x20" device i2c 0x2c on end end - end # I2C 0 - device pci 15.2 on + end + device ref i2c2 on chip drivers/generic/gpio_keys register "name" = ""PENH"" register "gpio" = "ACPI_GPIO_INPUT_ACTIVE_LOW(GPP_C12)" @@ -254,8 +254,8 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x01" device i2c 10 on end end - end # I2C 2 - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -301,8 +301,8 @@ chip soc/intel/jasperlake probe AUDIO_AMP UNPROVISIONED end end - end # I2C 4 - device pci 19.1 on + end + device ref i2c5 on chip drivers/i2c/sx9324 register "desc" = ""SAR Proximity Sensor"" register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E11_IRQ)" @@ -355,14 +355,14 @@ chip soc/intel/jasperlake register "reg_irq_cfg2" = "0x00" device i2c 28 on end end - end # I2C 5 - device pci 1f.3 on + end + device ref hda on chip drivers/generic/alc1015 register "sdb" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on probe AUDIO_AMP RT1015P_AUTO end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/boxy/overridetree.cb b/src/mainboard/google/dedede/variants/boxy/overridetree.cb index 11c7ae399e..f3fb01df4b 100644 --- a/src/mainboard/google/dedede/variants/boxy/overridetree.cb +++ b/src/mainboard/google/dedede/variants/boxy/overridetree.cb @@ -90,7 +90,7 @@ chip soc/intel/jasperlake USB_PORT_WAKE_ENABLE(4)" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf ## Passive Policy register "policies.passive" = "{ @@ -139,62 +139,62 @@ chip soc/intel/jasperlake device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""USB2 Type-C Port C0"" 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" = ""USB2 Type-A Port A0"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(1, 3)" - device usb 2.1 on end + device ref usb2_port2 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port A1"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(1, 2)" - device usb 2.2 on end + device ref usb2_port3 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-C Port C1"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "group" = "ACPI_PLD_GROUP(2, 1)" - device usb 2.3 on end + device ref usb2_port4 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-C Port C0"" 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" = ""USB3 Type-C Port C1"" register "type" = "UPC_TYPE_C_USB2_SS_SWITCH" register "group" = "ACPI_PLD_GROUP(2, 1)" - device usb 3.1 on end + device ref usb3_port2 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A0"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(1, 3)" - device usb 3.2 on end + device ref usb3_port3 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A1"" 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 end end - end # USB xHCI - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -221,8 +221,8 @@ chip soc/intel/jasperlake probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682I_VS end end - end # I2C 4 - device pci 1c.2 on + end + device ref pcie_rp3 on chip drivers/net register "customized_leds" = "0x07af" register "wake" = "GPE0_DW0_03" # GPP_B3 @@ -230,14 +230,13 @@ chip soc/intel/jasperlake register "device_index" = "0" device pci 00.0 on end end - end # PCI Express Root Port 3 - RTL8111H LAN - device pci 1c.6 on + end + device ref pcie_rp7 on chip drivers/wifi/generic register "wake" = "GPE0_DW2_03" device pci 00.0 on end end - end # PCI Express Root Port 7 - WLAN - device pci 1c.7 off end # PCI Express Root Port 8 - device pci 1f.3 on end # Intel HDA + end + device ref hda on end end end diff --git a/src/mainboard/google/dedede/variants/bugzzy/overridetree.cb b/src/mainboard/google/dedede/variants/bugzzy/overridetree.cb index a1303d7a4f..441707e940 100644 --- a/src/mainboard/google/dedede/variants/bugzzy/overridetree.cb +++ b/src/mainboard/google/dedede/variants/bugzzy/overridetree.cb @@ -94,7 +94,7 @@ chip soc/intel/jasperlake register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf register "options.tsr[0].desc" = ""Memory"" register "options.tsr[1].desc" = ""CPU"" @@ -138,8 +138,8 @@ chip soc/intel/jasperlake }" device generic 0 on end end - end # SA Thermal device - device pci 05.0 on # IPU - MIPI Camera + end + device ref ipu on chip drivers/intel/mipi_camera register "acpi_uid" = "0x50000" register "acpi_name" = ""IPU0"" @@ -153,16 +153,16 @@ chip soc/intel/jasperlake device generic 0 on end end end - device pci 14.0 on + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""UFCamera"" register "type" = "UPC_TYPE_INTERNAL" register "has_power_resource" = "true" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D13)" register "enable_delay_ms" = "20" - device usb 2.5 on end + device ref usb2_port6 on end end chip drivers/usb/acpi register "desc" = ""LTE"" @@ -172,14 +172,14 @@ chip soc/intel/jasperlake register "reset_off_delay_ms" = "20" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A10)" register "enable_delay_ms" = "20" - device usb 3.3 on + device ref usb3_port4 on probe DB_PORTS DB_PORTS_1C_1A_LTE end end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -197,8 +197,8 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0xE" device i2c 40 on end end - end # I2C 0 - device pci 15.1 on + end + device ref i2c1 on chip drivers/i2c/hid register "generic.hid" = ""WCOM014B"" register "generic.desc" = ""WCOM Digitizer"" @@ -222,8 +222,8 @@ chip soc/intel/jasperlake probe DB_PORTS DB_PORTS_1C_1A_LTE end end - end # I2C #1 - device pci 15.2 on + end + device ref i2c2 on chip drivers/i2c/hid register "generic.hid" = ""HX121A"" register "generic.desc" = ""HX Touchscreen"" @@ -236,8 +236,8 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x1" device i2c 0x4F on end end - end # I2C #2 - device pci 15.3 on + end + device ref i2c3 on chip drivers/intel/mipi_camera register "acpi_hid" = ""OVTI8856"" register "acpi_uid" = "0" @@ -310,9 +310,8 @@ chip soc/intel/jasperlake device i2c 50 on end end - end # I2C 3 - device pci 1c.7 off end # PCI Express Root Port 8 - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/da7219 register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_D16)" register "btn_cfg" = "50" @@ -330,13 +329,13 @@ chip soc/intel/jasperlake register "mic_amp_in_sel" = ""diff"" device i2c 1a on end end - end #I2C 4 - device pci 1f.3 on + end + device ref hda on chip drivers/generic/max98357a register "hid" = ""MX98360A"" register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/cappy2/overridetree.cb b/src/mainboard/google/dedede/variants/cappy2/overridetree.cb index 2b361a3d93..59c7f9fd1c 100644 --- a/src/mainboard/google/dedede/variants/cappy2/overridetree.cb +++ b/src/mainboard/google/dedede/variants/cappy2/overridetree.cb @@ -77,7 +77,7 @@ chip soc/intel/jasperlake }" # Camera device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf ## Passive Policy register "policies.passive" = "{ @@ -112,22 +112,22 @@ chip soc/intel/jasperlake }" device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""UFCamera"" register "type" = "UPC_TYPE_INTERNAL" register "has_power_resource" = "true" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D15)" register "enable_delay_ms" = "20" - device usb 2.5 on end + device ref usb2_port6 on end end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/hid register "generic.hid" = ""SYNA0A00"" register "generic.desc" = ""SYNA Touchpad"" @@ -172,8 +172,8 @@ chip soc/intel/jasperlake register "detect" = "1" device i2c 15 on end end - end #I2C 0 - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -219,13 +219,13 @@ chip soc/intel/jasperlake probe AUDIO_CODEC_SOURCE AUDIO_CODEC_CS42l42 end end - end #I2C 4 - device pci 1f.0 on + end + device ref pch_espi on chip drivers/pc80/tpm device pnp 0c31.0 on end # Discrete TPM - end # chip drivers/pc80/tpm - end # PCH eSPI - device pci 1f.3 on + end + end + device ref hda on chip drivers/generic/alc1015 register "sdb" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on @@ -239,6 +239,6 @@ chip soc/intel/jasperlake probe AUDIO_AMP MAX98360 end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/corori/overridetree.cb b/src/mainboard/google/dedede/variants/corori/overridetree.cb index 59afb06e93..76aadb44dd 100644 --- a/src/mainboard/google/dedede/variants/corori/overridetree.cb +++ b/src/mainboard/google/dedede/variants/corori/overridetree.cb @@ -44,7 +44,7 @@ chip soc/intel/jasperlake register "SerialIoGSpiCsMode[PchSerialIoIndexGSPI0]" = "0" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf ## Passive Policy register "policies.passive" = "{ @@ -79,31 +79,19 @@ chip soc/intel/jasperlake }" device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on - chip drivers/usb/acpi - device usb 2.1 off end - end - chip drivers/usb/acpi - device usb 2.3 off end - end + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""Camera (UFC)"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.5 on end - end - chip drivers/usb/acpi - device usb 3.1 off end - end - chip drivers/usb/acpi - device usb 3.3 off end + device ref usb2_port6 on end end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -112,8 +100,8 @@ chip soc/intel/jasperlake register "detect" = "1" device i2c 15 on end end - end #I2C 0 - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -143,19 +131,18 @@ chip soc/intel/jasperlake probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682I_VS end end - end #I2C 4 - device pci 1e.2 off end # GSPI 0 - device pci 1f.0 on + end + device ref pch_espi on chip drivers/pc80/tpm device pnp 0c31.0 on end # Discrete TPM end # chip drivers/pc80/tpm - end # PCH eSPI - device pci 1f.3 on + end + device ref hda on chip drivers/generic/max98357a register "hid" = ""MX98360A"" register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/cret/overridetree.cb b/src/mainboard/google/dedede/variants/cret/overridetree.cb index f1a00ffb20..aaf7321b90 100644 --- a/src/mainboard/google/dedede/variants/cret/overridetree.cb +++ b/src/mainboard/google/dedede/variants/cret/overridetree.cb @@ -52,7 +52,7 @@ chip soc/intel/jasperlake }, }" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf ## Passive Policy register "policies.passive" = "{ @@ -87,32 +87,26 @@ chip soc/intel/jasperlake }" device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on - chip drivers/usb/acpi - device usb 2.1 off end - end + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""LTE"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.3 on + device ref usb2_port4 on probe LTE LTE_PRESENT end end chip drivers/usb/acpi register "desc" = ""Camera (UFC)"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.5 on end + device ref usb2_port6 on end end chip drivers/usb/acpi register "desc" = ""Camera (WFC)"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.6 on end - end - chip drivers/usb/acpi - device usb 3.1 off end + device ref usb2_port7 on end end chip drivers/usb/acpi register "desc" = ""LTE"" @@ -124,14 +118,14 @@ chip soc/intel/jasperlake register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A10)" register "enable_delay_ms" = "20" - device usb 3.3 on + device ref usb3_port4 on probe LTE LTE_PRESENT end end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -149,8 +143,8 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x20" device i2c 2c on end end - end #I2C 0 - device pci 15.2 on + end + device ref i2c2 on chip drivers/i2c/hid register "generic.hid" = ""WDHT0002"" register "generic.desc" = ""WDT Touchscreen"" @@ -239,9 +233,9 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x01" device i2c 40 on end end - end # I2C 2 - device pci 1c.7 on end - device pci 19.0 on + end + device ref pcie_rp8 on end + device ref i2c4 on chip drivers/i2c/da7219 register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_D16)" register "btn_cfg" = "50" @@ -280,13 +274,13 @@ chip soc/intel/jasperlake probe AUDIO_CODEC_SOURCE AUDIO_CODEC_CS42l42 end end - end #I2C 4 - device pci 1f.3 on + end + device ref hda on chip drivers/generic/max98357a register "hid" = ""MX98360A"" register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/dexi/overridetree.cb b/src/mainboard/google/dedede/variants/dexi/overridetree.cb index 38a2d520a8..54910d5f4c 100644 --- a/src/mainboard/google/dedede/variants/dexi/overridetree.cb +++ b/src/mainboard/google/dedede/variants/dexi/overridetree.cb @@ -135,7 +135,7 @@ chip soc/intel/jasperlake USB_PORT_WAKE_ENABLE(6)" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf ## Passive Policy register "policies.passive" = "{ @@ -184,86 +184,86 @@ chip soc/intel/jasperlake device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""USB2 Type-C Port C0"" 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" = ""USB2 Type-A Port A0"" 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" = ""USB2 Type-A Port A1"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(2, 3)" - device usb 2.2 on end + device ref usb2_port3 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port A2"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(1, 3)" - device usb 2.3 on end + device ref usb2_port4 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port A3"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(1, 2)" - device usb 2.4 on end + device ref usb2_port5 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port A4"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(1, 1)" - device usb 2.6 on end + device ref usb2_port7 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-C Port C0"" 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" = ""USB3 Type-A Port A4"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(1, 1)" - device usb 3.1 on end + device ref usb3_port2 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A0"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(2, 2)" - device usb 3.2 on end + device ref usb3_port3 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A1"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(2, 3)" - device usb 3.3 on end + device ref usb3_port4 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A3"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(1, 2)" - device usb 3.4 on end + device ref usb3_port5 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A2"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(1, 3)" - device usb 3.5 on end + device ref usb3_port6 on end end end end - end # USB xHCI - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""RTL5682"" register "name" = ""RT58"" @@ -275,8 +275,8 @@ chip soc/intel/jasperlake register "property_list[0].integer" = "1" device i2c 1a on end end - end # I2C 4 - device pci 1c.2 on + end + device ref pcie_rp3 on chip drivers/net register "customized_leds" = "0x05af" register "wake" = "GPE0_DW0_03" # GPP_B3 @@ -284,14 +284,13 @@ chip soc/intel/jasperlake register "device_index" = "0" device pci 00.0 on end end - end # PCI Express Root Port 3 - RTL8111H LAN - device pci 1c.6 on + end + device ref pcie_rp7 on chip drivers/wifi/generic register "wake" = "GPE0_DW2_03" device pci 00.0 on end end - end # PCI Express Root Port 7 - WLAN - device pci 1c.7 off end # PCI Express Root Port 8 - device pci 1f.3 on end # Intel HDA + end + device ref hda on end end end diff --git a/src/mainboard/google/dedede/variants/dibbi/overridetree.cb b/src/mainboard/google/dedede/variants/dibbi/overridetree.cb index eb05d24c94..1c6ee0706e 100644 --- a/src/mainboard/google/dedede/variants/dibbi/overridetree.cb +++ b/src/mainboard/google/dedede/variants/dibbi/overridetree.cb @@ -111,7 +111,7 @@ chip soc/intel/jasperlake register "usb3_ports[5]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB3/1 Type-A Port A3 device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf ## Passive Policy register "policies.passive" = "{ @@ -160,77 +160,74 @@ chip soc/intel/jasperlake device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""USB2 Type-C Port C0"" 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" = ""USB2 Type-A Port A0"" 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" = ""USB2 Type-A Port A1"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(1, 3)" - device usb 2.2 on end + device ref usb2_port3 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port A2"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(1, 4)" - device usb 2.3 on end + device ref usb2_port4 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port A3"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(1, 5)" - device usb 2.4 on end + device ref usb2_port5 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-C Port C0"" 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 - device usb 3.1 off end + device ref usb3_port1 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A0"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(1, 2)" - device usb 3.2 on end + device ref usb3_port3 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A1"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(1, 3)" - device usb 3.3 on end + device ref usb3_port4 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A3"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(1, 5)" - device usb 3.4 on end + device ref usb3_port5 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A2"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(1, 4)" - device usb 3.5 on end + device ref usb3_port6 on end end end end - end # USB xHCI - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""RTL5682"" register "name" = ""RT58"" @@ -242,8 +239,8 @@ chip soc/intel/jasperlake register "property_list[0].integer" = "1" device i2c 1a on end end - end # I2C 4 - device pci 1c.2 on + end + device ref pcie_rp3 on chip drivers/net register "customized_leds" = "0x05af" register "wake" = "GPE0_DW0_03" # GPP_B3 @@ -251,14 +248,13 @@ chip soc/intel/jasperlake register "device_index" = "0" device pci 00.0 on end end - end # PCI Express Root Port 3 - RTL8111H LAN - device pci 1c.6 on + end + device ref pcie_rp7 on chip drivers/wifi/generic register "wake" = "GPE0_DW2_03" device pci 00.0 on end end - end # PCI Express Root Port 7 - WLAN - device pci 1c.7 off end # PCI Express Root Port 8 - device pci 1f.3 on end # Intel HDA + end + device ref hda on end end end diff --git a/src/mainboard/google/dedede/variants/dita/overridetree.cb b/src/mainboard/google/dedede/variants/dita/overridetree.cb index 38a2d520a8..54910d5f4c 100644 --- a/src/mainboard/google/dedede/variants/dita/overridetree.cb +++ b/src/mainboard/google/dedede/variants/dita/overridetree.cb @@ -135,7 +135,7 @@ chip soc/intel/jasperlake USB_PORT_WAKE_ENABLE(6)" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf ## Passive Policy register "policies.passive" = "{ @@ -184,86 +184,86 @@ chip soc/intel/jasperlake device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""USB2 Type-C Port C0"" 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" = ""USB2 Type-A Port A0"" 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" = ""USB2 Type-A Port A1"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(2, 3)" - device usb 2.2 on end + device ref usb2_port3 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port A2"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(1, 3)" - device usb 2.3 on end + device ref usb2_port4 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port A3"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(1, 2)" - device usb 2.4 on end + device ref usb2_port5 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port A4"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(1, 1)" - device usb 2.6 on end + device ref usb2_port7 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-C Port C0"" 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" = ""USB3 Type-A Port A4"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(1, 1)" - device usb 3.1 on end + device ref usb3_port2 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A0"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(2, 2)" - device usb 3.2 on end + device ref usb3_port3 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A1"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(2, 3)" - device usb 3.3 on end + device ref usb3_port4 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A3"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(1, 2)" - device usb 3.4 on end + device ref usb3_port5 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A2"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(1, 3)" - device usb 3.5 on end + device ref usb3_port6 on end end end end - end # USB xHCI - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""RTL5682"" register "name" = ""RT58"" @@ -275,8 +275,8 @@ chip soc/intel/jasperlake register "property_list[0].integer" = "1" device i2c 1a on end end - end # I2C 4 - device pci 1c.2 on + end + device ref pcie_rp3 on chip drivers/net register "customized_leds" = "0x05af" register "wake" = "GPE0_DW0_03" # GPP_B3 @@ -284,14 +284,13 @@ chip soc/intel/jasperlake register "device_index" = "0" device pci 00.0 on end end - end # PCI Express Root Port 3 - RTL8111H LAN - device pci 1c.6 on + end + device ref pcie_rp7 on chip drivers/wifi/generic register "wake" = "GPE0_DW2_03" device pci 00.0 on end end - end # PCI Express Root Port 7 - WLAN - device pci 1c.7 off end # PCI Express Root Port 8 - device pci 1f.3 on end # Intel HDA + end + device ref hda on end end end diff --git a/src/mainboard/google/dedede/variants/drawcia/overridetree.cb b/src/mainboard/google/dedede/variants/drawcia/overridetree.cb index 12e45d9308..8e13098ccc 100644 --- a/src/mainboard/google/dedede/variants/drawcia/overridetree.cb +++ b/src/mainboard/google/dedede/variants/drawcia/overridetree.cb @@ -82,7 +82,7 @@ chip soc/intel/jasperlake register "FastPkgCRampDisable" = "1" device domain 0 on - device pci 05.0 on # IPU - MIPI Camera + device ref ipu on chip drivers/intel/mipi_camera register "acpi_uid" = "0x50000" register "acpi_name" = ""IPU0"" @@ -97,7 +97,7 @@ chip soc/intel/jasperlake end end - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf # Default DPTF Policy for all drawcia boards if not overridden register "options.tsr[0].desc" = ""Memory"" @@ -150,10 +150,10 @@ chip soc/intel/jasperlake device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""LTE"" register "type" = "UPC_TYPE_INTERNAL" @@ -163,7 +163,7 @@ chip soc/intel/jasperlake register "reset_off_delay_ms" = "20" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A10)" register "enable_delay_ms" = "20" - device usb 2.3 on + device ref usb2_port4 on probe DB_PORTS DB_PORTS_1A_HDMI_LTE end end @@ -171,7 +171,7 @@ chip soc/intel/jasperlake register "desc" = ""Right Type-A Port"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(2, 2)" - device usb 2.3 on + device ref usb2_port4 on probe DB_PORTS DB_PORTS_1A_HDMI probe DB_PORTS DB_PORTS_1C_1A end @@ -179,13 +179,13 @@ chip soc/intel/jasperlake chip drivers/usb/acpi register "desc" = ""Camera"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.5 on end + device ref usb2_port6 on end end chip drivers/usb/acpi register "desc" = ""LTE"" register "type" = "UPC_TYPE_INTERNAL" register "group" = "ACPI_PLD_GROUP(2, 2)" - device usb 3.3 on + device ref usb3_port4 on probe DB_PORTS DB_PORTS_1A_HDMI_LTE end end @@ -193,15 +193,15 @@ chip soc/intel/jasperlake register "desc" = ""Right Type-A Port"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(2, 2)" - device usb 3.3 on + device ref usb3_port4 on probe DB_PORTS DB_PORTS_1A_HDMI probe DB_PORTS DB_PORTS_1C_1A end end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -220,8 +220,8 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x20" device i2c 0x2c on end end - end #I2C 0 - device pci 15.2 on + end + device ref i2c2 on chip drivers/generic/gpio_keys register "name" = ""PENH"" register "gpio" = "ACPI_GPIO_INPUT_ACTIVE_LOW(GPP_C12)" @@ -296,8 +296,8 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x20" device i2c 2c alias wdht0002 on end end - end # I2C 2 - device pci 15.3 on + end + device ref i2c3 on chip drivers/intel/mipi_camera register "acpi_hid" = ""OVTI8856"" register "acpi_uid" = "0" @@ -395,8 +395,8 @@ chip soc/intel/jasperlake register "off_seq.ops[0]" = "SEQ_OPS_GPIO_DISABLE(0, 0)" device i2c 50 on end end - end # I2C 3 - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -426,19 +426,19 @@ chip soc/intel/jasperlake probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682I_VS end end - end #I2C 4 - device pci 1c.7 on + end + device ref pcie_rp8 on chip drivers/wifi/generic register "wake" = "GPE0_DW2_03" device pci 00.0 on end end end - device pci 1f.3 on + device ref hda on chip drivers/generic/max98357a register "hid" = ""MX98360A"" register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/driblee/overridetree.cb b/src/mainboard/google/dedede/variants/driblee/overridetree.cb index a703ada882..23d1875054 100644 --- a/src/mainboard/google/dedede/variants/driblee/overridetree.cb +++ b/src/mainboard/google/dedede/variants/driblee/overridetree.cb @@ -35,7 +35,7 @@ chip soc/intel/jasperlake register "SerialIoGSpiCsMode[PchSerialIoIndexGSPI0]" = "0" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf ## Passive Policy register "policies.passive" = "{ @@ -70,31 +70,19 @@ chip soc/intel/jasperlake }" device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on - chip drivers/usb/acpi - device usb 2.1 off end - end - chip drivers/usb/acpi - device usb 2.3 off end - end + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""Camera (UFC)"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.5 on end - end - chip drivers/usb/acpi - device usb 3.1 off end - end - chip drivers/usb/acpi - device usb 3.3 off end + device ref usb2_port6 on end end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -112,8 +100,8 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x20" device i2c 2c on end end - end #I2C 0 - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/cs42l42 register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_D16)" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_H16)" @@ -130,19 +118,18 @@ chip soc/intel/jasperlake register "hs_bias_sense_disable" = "true" device i2c 48 on end end - end #I2C 4 - device pci 1e.2 off end # GSPI 0 - device pci 1f.0 on + end + device ref pch_espi on chip drivers/pc80/tpm device pnp 0c31.0 on end # Discrete TPM - end # chip drivers/pc80/tpm - end # PCH eSPI - device pci 1f.3 on + end + end + device ref hda on chip drivers/generic/max98357a register "hid" = ""MX98360A"" register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/galtic/overridetree.cb b/src/mainboard/google/dedede/variants/galtic/overridetree.cb index 3a5597c3f4..189029b5cd 100644 --- a/src/mainboard/google/dedede/variants/galtic/overridetree.cb +++ b/src/mainboard/google/dedede/variants/galtic/overridetree.cb @@ -69,7 +69,7 @@ chip soc/intel/jasperlake register "tcc_offset" = "8" # TCC of 97C device domain 0 on - device pci 04.0 on + device ref dptf on # Default DPTF Policy for all Dedede boards if not overridden chip drivers/intel/dptf ## Passive Policy @@ -120,20 +120,20 @@ chip soc/intel/jasperlake device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""Camera"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.5 on end + device ref usb2_port6 on end end end end - end # USB xHCI + end - device pci 15.0 on + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -150,7 +150,7 @@ chip soc/intel/jasperlake device i2c 15 alias elan2702 on end end end - device pci 15.2 on + device ref i2c2 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" @@ -183,8 +183,8 @@ chip soc/intel/jasperlake probe TOUCHSCREEN_SOURCE TOUCHSCREEN_ELAN9008 end end - end # I2C 2 - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -231,13 +231,13 @@ chip soc/intel/jasperlake end end end - device pci 1f.3 on + device ref hda on chip drivers/generic/alc1015 register "sdb" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on probe AUDIO_AMP RT1015P_AUTO end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/gooey/overridetree.cb b/src/mainboard/google/dedede/variants/gooey/overridetree.cb index d7e9d47241..0a73b9c471 100644 --- a/src/mainboard/google/dedede/variants/gooey/overridetree.cb +++ b/src/mainboard/google/dedede/variants/gooey/overridetree.cb @@ -68,7 +68,7 @@ chip soc/intel/jasperlake register "xhci_lfps_sampling_offtime_ms" = "0" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf ## Passive Policy register "policies.passive" = "{ @@ -115,17 +115,17 @@ chip soc/intel/jasperlake device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_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, 1)" - device usb 2.1 on end + device ref usb2_port2 on end end chip drivers/usb/acpi register "desc" = ""LTE"" @@ -135,33 +135,33 @@ chip soc/intel/jasperlake register "reset_off_delay_ms" = "10" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A10)" register "enable_delay_ms" = "20" - device usb 2.3 on end + device ref usb2_port4 on end end chip drivers/usb/acpi register "desc" = ""UFCamera"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.5 on end + device ref usb2_port6 on end end chip drivers/usb/acpi register "desc" = ""WFCamera"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.6 on end + device ref usb2_port7 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, 1)" - device usb 3.1 on end + device ref usb3_port2 on end end chip drivers/usb/acpi register "desc" = ""LTE"" register "type" = "UPC_TYPE_INTERNAL" - device usb 3.3 on end + device ref usb3_port4 on end end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -180,8 +180,8 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x20" device i2c 0x2c on end end - end # I2C 0 - device pci 15.2 on + end + device ref i2c2 on chip drivers/generic/gpio_keys register "name" = ""PENH"" register "gpio" = "ACPI_GPIO_INPUT_ACTIVE_LOW(GPP_C12)" @@ -233,8 +233,8 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x01" device i2c 10 on end end - end # I2C 2 - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -280,8 +280,8 @@ chip soc/intel/jasperlake probe AUDIO_AMP UNPROVISIONED end end - end # I2C 4 - device pci 19.1 on + end + device ref i2c5 on chip drivers/i2c/sx9324 register "desc" = ""SAR Proximity Sensor"" register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E11_IRQ)" @@ -335,19 +335,18 @@ chip soc/intel/jasperlake device i2c 28 on end end end # I2C 5 - device pci 1f.0 on + device ref pch_espi on chip drivers/pc80/tpm device pnp 0c31.0 on end # Discrete TPM - end # chip drivers/pc80/tpm - end # PCH eSPI - device pci 1e.2 off end # GSPI 0 - device pci 1f.3 on + end + end + device ref hda on chip drivers/generic/alc1015 register "sdb" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on probe AUDIO_AMP RT1015P_AUTO end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/haboki/overridetree.cb b/src/mainboard/google/dedede/variants/haboki/overridetree.cb index 030b143204..7146bd899f 100644 --- a/src/mainboard/google/dedede/variants/haboki/overridetree.cb +++ b/src/mainboard/google/dedede/variants/haboki/overridetree.cb @@ -53,7 +53,7 @@ chip soc/intel/jasperlake register "FastPkgCRampDisable" = "1" device domain 0 on - device pci 05.0 on # IPU - MIPI Camera + device ref ipu on chip drivers/intel/mipi_camera register "acpi_uid" = "0x50000" register "acpi_name" = ""IPU0"" @@ -68,7 +68,7 @@ chip soc/intel/jasperlake end end - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf # Default DPTF Policy for all drawcia boards if not overridden register "options.tsr[0].desc" = ""Memory"" @@ -122,7 +122,7 @@ chip soc/intel/jasperlake device generic 0 on end end end # SA Thermal device - device pci 14.0 on + device ref south_xhci on chip drivers/usb/acpi device usb 0.0 on chip drivers/usb/acpi @@ -132,8 +132,8 @@ chip soc/intel/jasperlake end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -142,8 +142,8 @@ chip soc/intel/jasperlake register "detect" = "1" device i2c 15 on end end - end #I2C 0 - device pci 15.2 on + end + device ref i2c2 on chip drivers/generic/gpio_keys register "name" = ""PENH"" register "gpio" = "ACPI_GPIO_INPUT_ACTIVE_LOW(GPP_C12)" @@ -210,8 +210,8 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x01" device i2c 15 on end end - end # I2C 2 - device pci 15.3 on + end + device ref i2c3 on chip drivers/intel/mipi_camera register "acpi_hid" = ""OVTI8856"" register "acpi_uid" = "0" @@ -284,8 +284,8 @@ chip soc/intel/jasperlake device i2c 50 on end end - end # I2C 3 - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -298,19 +298,18 @@ chip soc/intel/jasperlake register "property_list[0].integer" = "1" device i2c 1a on end end - end #I2C 4 - device pci 1f.0 on + end + device ref pch_espi on chip drivers/pc80/tpm device pnp 0c31.0 on end # Discrete TPM - end # chip drivers/pc80/tpm - end # PCH eSPI - device pci 1e.2 off end # GSPI 0 - device pci 1f.3 on + end + end + device ref hda on chip drivers/generic/max98357a register "hid" = ""MX98360A"" register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/kracko/overridetree.cb b/src/mainboard/google/dedede/variants/kracko/overridetree.cb index 388850570b..c45ccdc428 100644 --- a/src/mainboard/google/dedede/variants/kracko/overridetree.cb +++ b/src/mainboard/google/dedede/variants/kracko/overridetree.cb @@ -65,7 +65,7 @@ chip soc/intel/jasperlake register "tcc_offset" = "20" # TCC of 85C device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf # Default DPTF Policy for all drawcia boards if not overridden register "options.tsr[0].desc" = ""Memory"" @@ -113,10 +113,10 @@ chip soc/intel/jasperlake }" device generic 0 alias dptf_policy on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""LTE"" register "type" = "UPC_TYPE_INTERNAL" @@ -126,7 +126,7 @@ chip soc/intel/jasperlake register "reset_off_delay_ms" = "20" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A10)" register "enable_delay_ms" = "20" - device usb 2.3 on + device ref usb2_port4 on probe DB_PORTS DB_PORTS_1C_LTE probe DB_PORTS DB_PORTS_LTE end @@ -135,7 +135,7 @@ chip soc/intel/jasperlake 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 + device ref usb2_port2 on probe DB_PORTS DB_PORTS_1C_1A probe DB_PORTS DB_PORTS_1C_LTE end @@ -144,25 +144,25 @@ chip soc/intel/jasperlake register "desc" = ""Right Type-A Port"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(2, 2)" - device usb 2.3 on + device ref usb2_port4 on probe DB_PORTS DB_PORTS_1C_1A end end chip drivers/usb/acpi register "desc" = ""UFCamera"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.5 on end + device ref usb2_port6 on end end chip drivers/usb/acpi register "desc" = ""WFCamera"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.6 on end + device ref usb2_port7 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 + device ref usb3_port2 on probe DB_PORTS DB_PORTS_1C_1A probe DB_PORTS DB_PORTS_1C_LTE end @@ -171,7 +171,7 @@ chip soc/intel/jasperlake register "desc" = ""LTE"" register "type" = "UPC_TYPE_INTERNAL" register "group" = "ACPI_PLD_GROUP(2, 2)" - device usb 3.3 on + device ref usb3_port4 on probe DB_PORTS DB_PORTS_1C_LTE probe DB_PORTS DB_PORTS_LTE end @@ -180,14 +180,14 @@ chip soc/intel/jasperlake register "desc" = ""Right Type-A Port"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(2, 2)" - device usb 3.3 on + device ref usb3_port4 on probe DB_PORTS DB_PORTS_1C_1A end end end end end # USB xHCI - device pci 15.0 on + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -196,8 +196,8 @@ chip soc/intel/jasperlake register "detect" = "1" device i2c 15 on end end - end #I2C 0 - device pci 15.2 on + end + device ref i2c2 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" @@ -240,8 +240,8 @@ chip soc/intel/jasperlake device i2c 40 on end end - end # I2C 2 - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -270,8 +270,8 @@ chip soc/intel/jasperlake probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682I_VS end end - end #I2C 4 - device pci 19.1 on + end + device ref i2c5 on chip drivers/i2c/sx9324 register "desc" = ""SAR Proximity Sensor"" register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E11_IRQ)" @@ -324,12 +324,12 @@ chip soc/intel/jasperlake device i2c 28 on end end end # I2C 5 - device pci 1f.3 on + device ref hda on chip drivers/generic/max98357a register "hid" = ""MX98360A"" register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/lalala/overridetree.cb b/src/mainboard/google/dedede/variants/lalala/overridetree.cb index 90620d6c7d..26569c52ca 100644 --- a/src/mainboard/google/dedede/variants/lalala/overridetree.cb +++ b/src/mainboard/google/dedede/variants/lalala/overridetree.cb @@ -87,7 +87,7 @@ chip soc/intel/jasperlake register "FastPkgCRampDisable" = "1" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf register "options.tsr[0].desc" = ""Memory"" register "options.tsr[1].desc" = ""Ambient"" @@ -121,8 +121,8 @@ chip soc/intel/jasperlake device generic 0 on end end - end # SA Thermal device - device pci 05.0 on # IPU - MIPI Camera + end + device ref ipu on chip drivers/intel/mipi_camera register "acpi_uid" = "0x50000" register "acpi_name" = ""IPU0"" @@ -135,18 +135,18 @@ chip soc/intel/jasperlake device generic 0 on end end end - device pci 14.0 on + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""Camera"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.5 on end + device ref usb2_port6 on end end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/hid register "generic.hid" = ""SYNA0000"" register "generic.cid" = ""ACPI0C50"" @@ -165,8 +165,8 @@ chip soc/intel/jasperlake register "detect" = "1" device i2c 15 on end end - end # I2C 0 - device pci 15.2 on + end + device ref i2c2 on chip drivers/i2c/hid register "generic.hid" = ""ELAN6915"" register "generic.desc" = ""ELAN Touchscreen"" @@ -209,7 +209,7 @@ chip soc/intel/jasperlake device i2c 39 on end end end # I2C 2 - device pci 15.3 on # I2C 3 + device ref i2c3 on chip drivers/intel/mipi_camera register "acpi_hid" = ""OVTI5675"" register "acpi_uid" = "0" @@ -285,7 +285,7 @@ chip soc/intel/jasperlake device i2c 50 on end end end - device pci 19.0 on + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -310,14 +310,13 @@ chip soc/intel/jasperlake device i2c 29 on end end end - device pci 1f.0 on + device ref pch_espi on chip drivers/pc80/tpm device pnp 0c31.0 on end # Discrete TPM end # chip drivers/pc80/tpm - end # PCH eSPI - device pci 1e.2 off end # GSPI 0 - device pci 1f.3 on end # Intel HDA - device pci 1c.7 on + end + device ref hda on end + device ref pcie_rp8 on chip drivers/wifi/generic register "wake" = "GPE0_DW2_03" device pci 00.0 on end diff --git a/src/mainboard/google/dedede/variants/lantis/overridetree.cb b/src/mainboard/google/dedede/variants/lantis/overridetree.cb index c21ccf2643..21e15d43ee 100644 --- a/src/mainboard/google/dedede/variants/lantis/overridetree.cb +++ b/src/mainboard/google/dedede/variants/lantis/overridetree.cb @@ -90,7 +90,7 @@ chip soc/intel/jasperlake register "FastPkgCRampDisable" = "1" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf register "options.tsr[0].desc" = ""Memory"" register "options.tsr[1].desc" = ""Ambient"" @@ -141,31 +141,31 @@ chip soc/intel/jasperlake device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""Discrete Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H19)" - device usb 2.4 on end + device ref usb2_port5 on end end chip drivers/usb/acpi register "desc" = ""Camera"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.5 on end + device ref usb2_port6 on end end chip drivers/usb/acpi register "desc" = ""Integrated Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H19)" - device usb 2.7 on end + device ref usb2_port8 on end end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -174,8 +174,8 @@ chip soc/intel/jasperlake register "detect" = "1" device i2c 15 on end end - end #I2C 0 - device pci 15.2 on + end + device ref i2c2 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" @@ -233,14 +233,14 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x01" device i2c 0x5d on end end - end # I2C 2 - device pci 1c.7 on + end + device ref pcie_rp8 on chip drivers/wifi/generic register "wake" = "GPE0_DW2_03" device pci 00.0 on end end - end # PCI Express Root Port 8 - WLAN - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -268,13 +268,13 @@ chip soc/intel/jasperlake probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682I_VS end end - end #I2C 4 - device pci 1f.3 on + end + device ref hda on chip drivers/generic/max98357a register "hid" = ""MX98360A"" register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/madoo/overridetree.cb b/src/mainboard/google/dedede/variants/madoo/overridetree.cb index c69b482ef0..801b947f1e 100644 --- a/src/mainboard/google/dedede/variants/madoo/overridetree.cb +++ b/src/mainboard/google/dedede/variants/madoo/overridetree.cb @@ -57,7 +57,7 @@ chip soc/intel/jasperlake register "SlowSlewRate" = "2" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf register "policies.passive" = "{ [0] = DPTF_PASSIVE(CPU, CPU, 65, 1000), @@ -81,25 +81,19 @@ chip soc/intel/jasperlake .granularity = 1000,}" device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on - chip drivers/usb/acpi - device usb 2.2 off end - end + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""Camera"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.5 on end - end - chip drivers/usb/acpi - device usb 3.2 off end + device ref usb2_port6 on end end end end end # USB xHCI - device pci 15.0 on + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -108,8 +102,8 @@ chip soc/intel/jasperlake register "detect" = "1" device i2c 15 on end end - end #I2C 0 - device pci 15.2 on + end + device ref i2c2 on chip drivers/i2c/hid register "generic.hid" = ""GDIX0000"" register "generic.desc" = ""Goodix Touchscreen"" @@ -125,14 +119,14 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x01" device i2c 0x5d on end end - end # I2C 2 - device pci 1c.7 on + end + device ref pcie_rp8 on chip drivers/wifi/generic register "wake" = "GPE0_DW2_03" device pci 00.0 on end end - end # PCI Express Root Port 8 - WLAN - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -145,13 +139,13 @@ chip soc/intel/jasperlake register "property_list[0].integer" = "1" device i2c 1a on end end - end #I2C 4 - device pci 1f.3 on + end + device ref hda on chip drivers/generic/max98357a register "hid" = ""MX98360A"" register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/magolor/overridetree.cb b/src/mainboard/google/dedede/variants/magolor/overridetree.cb index c32429dc24..45cd9971ca 100644 --- a/src/mainboard/google/dedede/variants/magolor/overridetree.cb +++ b/src/mainboard/google/dedede/variants/magolor/overridetree.cb @@ -126,7 +126,7 @@ chip soc/intel/jasperlake register "FastPkgCRampDisable" = "1" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf register "options.tsr[0].desc" = ""Memory"" register "options.tsr[1].desc" = ""Ambient"" @@ -160,8 +160,8 @@ chip soc/intel/jasperlake device generic 0 on end end - end # SA Thermal device - device pci 05.0 on # IPU - MIPI Camera + end + device ref ipu on chip drivers/intel/mipi_camera register "acpi_uid" = "0x50000" register "acpi_name" = ""IPU0"" @@ -174,7 +174,7 @@ chip soc/intel/jasperlake device generic 0 on end end end - device pci 14.0 on + device ref south_xhci on chip drivers/usb/acpi device usb 0.0 on chip drivers/usb/acpi @@ -184,8 +184,8 @@ chip soc/intel/jasperlake end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/hid register "generic.hid" = ""SYNA0000"" register "generic.cid" = ""ACPI0C50"" @@ -204,8 +204,8 @@ chip soc/intel/jasperlake register "detect" = "1" device i2c 15 on end end - end # I2C 0 - device pci 15.2 on + end + device ref i2c2 on chip drivers/generic/gpio_keys register "name" = ""PENH"" register "gpio" = "ACPI_GPIO_INPUT_ACTIVE_LOW(GPP_C12)" @@ -342,8 +342,8 @@ chip soc/intel/jasperlake probe TS_SOURCE TS_RAYD_0001 end end - end # I2C 2 - device pci 15.3 on # I2C 3 + end + device ref i2c3 on chip drivers/intel/mipi_camera register "acpi_hid" = ""OVTI5675"" register "acpi_uid" = "0" @@ -470,7 +470,7 @@ chip soc/intel/jasperlake device i2c 50 on end end end - device pci 19.0 on + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -536,19 +536,19 @@ chip soc/intel/jasperlake end end end - device pci 1f.3 on + device ref hda on chip drivers/generic/alc1015 register "sdb" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on probe AUDIO_AMP RT1015P_AUTO end end - end # Intel HDA - device pci 1c.7 on + end + device ref pcie_rp8 on chip drivers/wifi/generic register "wake" = "GPE0_DW2_03" device pci 00.0 on end end - end # PCI Express Root Port 8 - WLAN + end end end diff --git a/src/mainboard/google/dedede/variants/metaknight/overridetree.cb b/src/mainboard/google/dedede/variants/metaknight/overridetree.cb index c116cccdae..631fb5c5df 100644 --- a/src/mainboard/google/dedede/variants/metaknight/overridetree.cb +++ b/src/mainboard/google/dedede/variants/metaknight/overridetree.cb @@ -84,7 +84,7 @@ chip soc/intel/jasperlake }" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf register "options.tsr[0].desc" = ""Memory"" register "options.tsr[1].desc" = ""CPU"" @@ -118,10 +118,10 @@ chip soc/intel/jasperlake device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""LTE"" register "type" = "UPC_TYPE_INTERNAL" @@ -171,8 +171,8 @@ chip soc/intel/jasperlake end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/hid register "generic.hid" = ""SYNA0000"" register "generic.cid" = ""ACPI0C50"" @@ -191,8 +191,8 @@ chip soc/intel/jasperlake register "detect" = "1" device i2c 15 on end end - end # I2C 0 - device pci 15.2 on + end + device ref i2c2 on chip drivers/generic/gpio_keys register "name" = ""PENH"" register "gpio" = "ACPI_GPIO_INPUT_ACTIVE_LOW(GPP_C12)" @@ -238,8 +238,8 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x01" device i2c 15 on end end - end # I2C 2 - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -285,13 +285,13 @@ chip soc/intel/jasperlake end end end - device pci 1f.3 on + device ref hda on chip drivers/generic/alc1015 register "sdb" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on probe AUDIO_AMP RT1015P_AUTO end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/pirika/overridetree.cb b/src/mainboard/google/dedede/variants/pirika/overridetree.cb index d413e060e0..01f724c5fa 100644 --- a/src/mainboard/google/dedede/variants/pirika/overridetree.cb +++ b/src/mainboard/google/dedede/variants/pirika/overridetree.cb @@ -78,7 +78,7 @@ chip soc/intel/jasperlake register "tcc_offset" = "8" # TCC of 97C device domain 0 on - device pci 04.0 on + device ref dptf on # Default DPTF Policy for all Dedede boards if not overridden chip drivers/intel/dptf ## Passive Policy @@ -119,20 +119,20 @@ chip soc/intel/jasperlake device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""Camera"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.5 on end + device ref usb2_port6 on end end end end - end # USB xHCI + end - device pci 15.0 on + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -152,7 +152,7 @@ chip soc/intel/jasperlake device i2c 0x2c on end end end - device pci 15.2 on + device ref i2c2 on chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" @@ -165,8 +165,8 @@ chip soc/intel/jasperlake register "has_power_resource" = "true" device i2c 10 on end end - end # I2C 2 - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -226,13 +226,13 @@ chip soc/intel/jasperlake end end end - device pci 1f.3 on + device ref hda on chip drivers/generic/alc1015 register "sdb" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on probe AUDIO_AMP RT1015P_AUTO end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/sasuke/overridetree.cb b/src/mainboard/google/dedede/variants/sasuke/overridetree.cb index 6f72562fe9..4be52ff3d2 100644 --- a/src/mainboard/google/dedede/variants/sasuke/overridetree.cb +++ b/src/mainboard/google/dedede/variants/sasuke/overridetree.cb @@ -85,7 +85,7 @@ chip soc/intel/jasperlake register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf register "options.tsr[0].desc" = ""Charger"" register "options.tsr[1].desc" = ""Vcore"" @@ -123,8 +123,8 @@ chip soc/intel/jasperlake }" device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi device usb 0.0 on chip drivers/usb/acpi @@ -133,7 +133,7 @@ chip soc/intel/jasperlake register "has_power_resource" = "true" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D13)" register "enable_delay_ms" = "20" - device usb 2.5 on end + device ref usb2_port6 on end end chip drivers/usb/acpi register "desc" = ""LTE"" @@ -143,12 +143,12 @@ chip soc/intel/jasperlake register "reset_off_delay_ms" = "20" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A10)" register "enable_delay_ms" = "20" - device usb 3.3 on end + device ref usb3_port4 on end end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -166,10 +166,8 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0xE" device i2c 40 on end end - end # I2C 0 - device pci 15.2 on end - device pci 1c.7 off end # PCI Express Root Port 8 - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/da7219 register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_D16)" register "btn_cfg" = "50" @@ -187,13 +185,13 @@ chip soc/intel/jasperlake register "mic_amp_in_sel" = ""diff"" device i2c 1a on end end - end #I2C 4 - device pci 1f.3 on + end + device ref hda on chip drivers/generic/max98357a register "hid" = ""MX98360A"" register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/sasukette/overridetree.cb b/src/mainboard/google/dedede/variants/sasukette/overridetree.cb index aa61b8e11d..90a7a10199 100644 --- a/src/mainboard/google/dedede/variants/sasukette/overridetree.cb +++ b/src/mainboard/google/dedede/variants/sasukette/overridetree.cb @@ -96,7 +96,7 @@ chip soc/intel/jasperlake register "xhci_lfps_sampling_offtime_ms" = "0" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf ## Passive Policy register "policies.passive" = "{ @@ -131,8 +131,8 @@ chip soc/intel/jasperlake }" device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi device usb 0.0 on chip drivers/usb/acpi @@ -141,7 +141,7 @@ chip soc/intel/jasperlake register "has_power_resource" = "true" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D15)" register "enable_delay_ms" = "20" - device usb 2.5 on end + device ref usb2_port6 on end end chip drivers/usb/acpi register "desc" = ""LTE"" @@ -151,12 +151,12 @@ chip soc/intel/jasperlake register "reset_off_delay_ms" = "20" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A10)" register "enable_delay_ms" = "20" - device usb 3.3 on end + device ref usb3_port4 on end end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/hid register "generic.hid" = ""SYNA0A00"" register "generic.desc" = ""SYNA Touchpad"" @@ -201,8 +201,8 @@ chip soc/intel/jasperlake register "detect" = "1" device i2c 15 on end end - end #I2C 0 - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -230,13 +230,12 @@ chip soc/intel/jasperlake probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682I_VS end end - end #I2C 4 - device pci 1c.7 off end # PCI Express Root Port 8 - device pci 1f.3 on + end + device ref hda on chip drivers/generic/alc1015 register "sdb" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/shotzo/overridetree.cb b/src/mainboard/google/dedede/variants/shotzo/overridetree.cb index 7a821d7f8f..b32e39b1c9 100644 --- a/src/mainboard/google/dedede/variants/shotzo/overridetree.cb +++ b/src/mainboard/google/dedede/variants/shotzo/overridetree.cb @@ -67,7 +67,7 @@ chip soc/intel/jasperlake register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)" # Lan device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf # Default DPTF Policy for all drawcia boards if not overridden register "options.tsr[0].desc" = ""Ambient"" @@ -111,83 +111,83 @@ chip soc/intel/jasperlake device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""USB2 Type-C Port C0"" 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" = ""USB2 Type-A Port A2"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(2, 1)" - device usb 2.1 on end + device ref usb2_port2 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port A0"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(2, 2)" - device usb 2.2 on end + device ref usb2_port3 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port A1"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(2, 3)" - device usb 2.3 on end + device ref usb2_port4 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port A3"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(2, 4)" - device usb 2.4 on end + device ref usb2_port5 on end end chip drivers/usb/acpi register "desc" = ""Camera"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.5 on end + device ref usb2_port6 on end end chip drivers/usb/acpi register "desc" = ""LAN"" register "type" = "UPC_TYPE_INTERNAL" - device usb 2.6 on end + device ref usb2_port7 on end end chip drivers/usb/acpi register "desc" = ""Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H19)" - device usb 2.7 on end + device ref usb2_port8 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-C Port C0"" 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" = ""LAN"" register "type" = "UPC_TYPE_INTERNAL" - device usb 3.1 on end + device ref usb3_port2 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A0"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(2, 1)" - device usb 3.2 on end + device ref usb3_port3 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A1"" 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 end end end # USB xHCI - device pci 15.2 on + device ref i2c2 on chip drivers/i2c/hid register "generic.hid" = ""ILTK0001"" register "generic.desc" = ""ILITEK Touchscreen"" @@ -202,14 +202,14 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x01" device i2c 41 on end end - end # I2C 2 - device pci 1c.7 on + end + device ref pcie_rp8 on chip drivers/wifi/generic register "wake" = "GPE0_DW2_03" device pci 00.0 on end end - end # PCI Express Root Port 8 - WLAN - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""RTL5682"" register "name" = ""RT58"" @@ -222,12 +222,12 @@ chip soc/intel/jasperlake device i2c 1a on end end end #I2C 4 - device pci 1f.3 on + device ref hda on chip drivers/generic/alc1015 register "hid" = ""RTL1019"" register "sdb" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on end end - end # Intel HDA + end end end diff --git a/src/mainboard/google/dedede/variants/storo/overridetree.cb b/src/mainboard/google/dedede/variants/storo/overridetree.cb index f893829dc0..729aff50a2 100644 --- a/src/mainboard/google/dedede/variants/storo/overridetree.cb +++ b/src/mainboard/google/dedede/variants/storo/overridetree.cb @@ -100,7 +100,7 @@ chip soc/intel/jasperlake register "xhci_lfps_sampling_offtime_ms" = "0" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf ## Passive Policy register "policies.passive" = "{ @@ -135,8 +135,8 @@ chip soc/intel/jasperlake }" device generic 0 on end end - end # SA Thermal device - device pci 05.0 on # IPU - MIPI Camera + end + device ref ipu on chip drivers/intel/mipi_camera register "acpi_uid" = "0x50000" register "acpi_name" = ""IPU0"" @@ -150,9 +150,9 @@ chip soc/intel/jasperlake device generic 0 on end end end - device pci 14.0 on + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""User Facing Camera"" register "type" = "UPC_TYPE_INTERNAL" @@ -179,8 +179,8 @@ chip soc/intel/jasperlake end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -189,8 +189,8 @@ chip soc/intel/jasperlake register "detect" = "1" device i2c 15 on end end - end #I2C 0 - device pci 15.2 on + end + device ref i2c2 on chip drivers/generic/gpio_keys register "name" = ""PENH"" register "gpio" = "ACPI_GPIO_INPUT_ACTIVE_LOW(GPP_C12)" @@ -216,8 +216,8 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x01" device i2c 10 on end end - end # I2C 2 - device pci 15.3 on + end + device ref i2c3 on chip drivers/intel/mipi_camera register "acpi_hid" = ""OVTI8856"" register "acpi_uid" = "0" @@ -290,8 +290,8 @@ chip soc/intel/jasperlake device i2c 50 on end end - end # I2C 3 - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -319,14 +319,14 @@ chip soc/intel/jasperlake probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682I_VS end end - end # I2C 4 - device pci 1f.3 on + end + device ref hda on chip drivers/generic/alc1015 register "sdb" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on end end - end # Intel HDA - device pci 19.1 on + end + device ref i2c5 on chip drivers/i2c/sx9324 register "desc" = ""SAR Proximity Sensor"" register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E11_IRQ)" @@ -379,7 +379,6 @@ chip soc/intel/jasperlake register "reg_irq_cfg2" = "0x01" device i2c 28 on end end - end # I2C 5 - device pci 1c.7 off end # PCI Express Root Port 8 + end end end diff --git a/src/mainboard/google/dedede/variants/taranza/overridetree.cb b/src/mainboard/google/dedede/variants/taranza/overridetree.cb index 38a2d520a8..54910d5f4c 100644 --- a/src/mainboard/google/dedede/variants/taranza/overridetree.cb +++ b/src/mainboard/google/dedede/variants/taranza/overridetree.cb @@ -135,7 +135,7 @@ chip soc/intel/jasperlake USB_PORT_WAKE_ENABLE(6)" device domain 0 on - device pci 04.0 on + device ref dptf on chip drivers/intel/dptf ## Passive Policy register "policies.passive" = "{ @@ -184,86 +184,86 @@ chip soc/intel/jasperlake device generic 0 on end end - end # SA Thermal device - device pci 14.0 on + end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""USB2 Type-C Port C0"" 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" = ""USB2 Type-A Port A0"" 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" = ""USB2 Type-A Port A1"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(2, 3)" - device usb 2.2 on end + device ref usb2_port3 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port A2"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(1, 3)" - device usb 2.3 on end + device ref usb2_port4 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port A3"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(1, 2)" - device usb 2.4 on end + device ref usb2_port5 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port A4"" register "type" = "UPC_TYPE_A" register "group" = "ACPI_PLD_GROUP(1, 1)" - device usb 2.6 on end + device ref usb2_port7 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-C Port C0"" 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" = ""USB3 Type-A Port A4"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(1, 1)" - device usb 3.1 on end + device ref usb3_port2 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A0"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(2, 2)" - device usb 3.2 on end + device ref usb3_port3 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A1"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(2, 3)" - device usb 3.3 on end + device ref usb3_port4 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A3"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(1, 2)" - device usb 3.4 on end + device ref usb3_port5 on end end chip drivers/usb/acpi register "desc" = ""USB3 Type-A Port A2"" register "type" = "UPC_TYPE_USB3_A" register "group" = "ACPI_PLD_GROUP(1, 3)" - device usb 3.5 on end + device ref usb3_port6 on end end end end - end # USB xHCI - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""RTL5682"" register "name" = ""RT58"" @@ -275,8 +275,8 @@ chip soc/intel/jasperlake register "property_list[0].integer" = "1" device i2c 1a on end end - end # I2C 4 - device pci 1c.2 on + end + device ref pcie_rp3 on chip drivers/net register "customized_leds" = "0x05af" register "wake" = "GPE0_DW0_03" # GPP_B3 @@ -284,14 +284,13 @@ chip soc/intel/jasperlake register "device_index" = "0" device pci 00.0 on end end - end # PCI Express Root Port 3 - RTL8111H LAN - device pci 1c.6 on + end + device ref pcie_rp7 on chip drivers/wifi/generic register "wake" = "GPE0_DW2_03" device pci 00.0 on end end - end # PCI Express Root Port 7 - WLAN - device pci 1c.7 off end # PCI Express Root Port 8 - device pci 1f.3 on end # Intel HDA + end + device ref hda on end end end diff --git a/src/mainboard/google/dedede/variants/waddledee/overridetree.cb b/src/mainboard/google/dedede/variants/waddledee/overridetree.cb index 4fdddd18cc..7356e95625 100644 --- a/src/mainboard/google/dedede/variants/waddledee/overridetree.cb +++ b/src/mainboard/google/dedede/variants/waddledee/overridetree.cb @@ -61,26 +61,26 @@ chip soc/intel/jasperlake register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" device domain 0 on - device pci 05.0 on end # IPU - MIPI Camera - device pci 14.0 on + device ref ipu on end + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""Discrete Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H19)" - device usb 2.4 on end + device ref usb2_port5 on end end chip drivers/usb/acpi register "desc" = ""Integrated Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H19)" - device usb 2.7 on end + device ref usb2_port8 on end end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/hid register "generic.hid" = ""SYNA0000"" register "generic.cid" = ""ACPI0C50"" @@ -92,7 +92,7 @@ chip soc/intel/jasperlake device i2c 0x2c on end end end - device pci 15.2 on + device ref i2c2 on chip drivers/i2c/hid register "generic.hid" = ""SIS6496"" register "generic.desc" = ""SIS Touchscreen"" @@ -125,8 +125,8 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x01" device i2c 0x5d on end end - end # I2C 2 - device pci 15.3 on + end + device ref i2c3 on chip drivers/i2c/gpiomux/mux register "mux_gpio_count" = "1" register "mux_gpio[0]" = "ACPI_GPIO_OUTPUT(GPP_E5)" @@ -139,8 +139,8 @@ chip soc/intel/jasperlake end end # I2C MUX end - end # I2C 3 - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/generic register "hid" = ""10EC5682"" register "name" = ""RT58"" @@ -165,12 +165,12 @@ chip soc/intel/jasperlake device i2c 29 on end end end - device pci 1c.7 on + device ref pcie_rp8 on chip drivers/wifi/generic register "wake" = "GPE0_DW2_03" device pci 00.0 on end end - end # PCI Express Root Port 8 - WLAN - device pci 1f.3 on end # Intel HDA + end + device ref hda on end end end diff --git a/src/mainboard/google/dedede/variants/waddledoo/overridetree.cb b/src/mainboard/google/dedede/variants/waddledoo/overridetree.cb index 8a1d5556c1..9b9d308019 100644 --- a/src/mainboard/google/dedede/variants/waddledoo/overridetree.cb +++ b/src/mainboard/google/dedede/variants/waddledoo/overridetree.cb @@ -57,7 +57,7 @@ chip soc/intel/jasperlake register "SerialIoI2cMode[PchSerialIoIndexI2C4]" = "PchSerialIoPci" device domain 0 on - device pci 05.0 on # IPU - MIPI Camera + device ref ipu on chip drivers/intel/mipi_camera register "acpi_uid" = "0x50000" register "acpi_name" = ""IPU0"" @@ -72,9 +72,9 @@ chip soc/intel/jasperlake device generic 0 on end end end - device pci 14.0 on + device ref south_xhci on chip drivers/usb/acpi - device usb 0.0 on + device ref xhci_root_hub on chip drivers/usb/acpi register "desc" = ""Discrete Bluetooth"" register "type" = "UPC_TYPE_INTERNAL" @@ -94,8 +94,8 @@ chip soc/intel/jasperlake end end end - end # USB xHCI - device pci 15.0 on + end + device ref i2c0 on chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -104,8 +104,8 @@ chip soc/intel/jasperlake register "detect" = "1" device i2c 15 on end end - end #I2C 0 - device pci 15.2 on + end + device ref i2c2 on chip drivers/i2c/hid register "generic.hid" = ""SIS6496"" register "generic.desc" = ""SIS Touchscreen"" @@ -143,8 +143,8 @@ chip soc/intel/jasperlake register "hid_desc_reg_offset" = "0x01" device i2c 10 on end end - end # I2C 2 - device pci 15.3 on #I2C #3 CAM0 CAM1 and VCM0 + end + device ref i2c3 on chip drivers/intel/mipi_camera register "acpi_hid" = ""OVTI8856"" register "acpi_uid" = "0" @@ -259,13 +259,13 @@ chip soc/intel/jasperlake device i2c 36 on end end end - device pci 1c.7 on + device ref pcie_rp8 on chip drivers/wifi/generic register "wake" = "GPE0_DW2_03" device pci 00.0 on end end - end # PCI Express Root Port 8 - WLAN - device pci 19.0 on + end + device ref i2c4 on chip drivers/i2c/da7219 register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_D16)" register "btn_cfg" = "50" @@ -283,13 +283,13 @@ chip soc/intel/jasperlake register "mic_amp_in_sel" = ""diff"" device i2c 1a on end end - end #I2C 4 - device pci 1f.3 on + end + device ref hda on chip drivers/generic/max98357a register "hid" = ""MX98360A"" register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)" device generic 0 on end end - end # Intel HDA + end end end