summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarvin Evers <marvin.evers@stud.hs-bochum.de>2023-12-04 02:28:25 +0100
committerMatt DeVillier <matt.devillier@gmail.com>2024-01-17 20:47:43 +0000
commit059476d18c8e8e09fa5a42b1db24b965fa08f71a (patch)
tree97dca72a79dbc94a24d9be7ee7ed2d2bf953fce7
parent6e5cc4ce7c6228aa245796e818ec00124c4e9f4a (diff)
mb/google/poppy: Use chipset dt reference names
Use the references from the chipset devicetree as this makes the comments superfluous. Built all variants with BUILD_TIMELESS=1 and the resulting binaries remain the same. Change-Id: I22bcde2dea726f47f8d64a762ca147efde0b610d Signed-off-by: Marvin Evers <marvin.evers@stud.hs-bochum.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/79439 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
-rw-r--r--src/mainboard/google/poppy/variants/atlas/devicetree.cb110
-rw-r--r--src/mainboard/google/poppy/variants/baseboard/devicetree.cb106
-rw-r--r--src/mainboard/google/poppy/variants/nami/devicetree.cb110
-rw-r--r--src/mainboard/google/poppy/variants/nautilus/devicetree.cb110
-rw-r--r--src/mainboard/google/poppy/variants/nocturne/devicetree.cb112
-rw-r--r--src/mainboard/google/poppy/variants/rammus/devicetree.cb108
-rw-r--r--src/mainboard/google/poppy/variants/soraka/devicetree.cb104
7 files changed, 380 insertions, 380 deletions
diff --git a/src/mainboard/google/poppy/variants/atlas/devicetree.cb b/src/mainboard/google/poppy/variants/atlas/devicetree.cb
index 4ba644fb40..eb7d660ad5 100644
--- a/src/mainboard/google/poppy/variants/atlas/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/atlas/devicetree.cb
@@ -229,12 +229,12 @@ chip soc/intel/skylake
device cpu_cluster 0 on end
device domain 0 on
- device pci 00.0 on end # Host Bridge
- device pci 02.0 on end # Integrated Graphics Device
- device pci 04.0 on end # SA thermal subsystem
- device pci 05.0 on end # SA IMGU
- device pci 13.0 off end # Integrated Sensor Hub
- device pci 14.0 on
+ device ref system_agent on end
+ device ref igpu on end
+ device ref sa_thermal on end
+ device ref imgu on end
+ device ref ish off end
+ device ref south_xhci on
chip drivers/usb/acpi
register "desc" = ""Root Hub""
register "type" = "UPC_TYPE_HUB"
@@ -257,11 +257,11 @@ chip soc/intel/skylake
end
end
end
- end # USB xHCI
- device pci 14.1 on end # USB xDCI (OTG)
- device pci 14.2 on end # Thermal Subsystem
- device pci 14.3 on end # Camera
- device pci 15.0 on
+ end
+ device ref south_xdci on end
+ device ref thermal on end
+ device ref cio on end
+ device ref i2c0 on
chip drivers/i2c/hid
register "generic.hid" = ""ACPI0C50""
register "generic.desc" = ""STM Touchscreen""
@@ -277,9 +277,9 @@ chip soc/intel/skylake
register "hid_desc_reg_offset" = "0xab"
device i2c 0x49 on end
end
- end # I2C #0 - Touchscreen
- device pci 15.1 off end # I2C #1
- device pci 15.2 on
+ end
+ device ref i2c1 off end
+ device ref i2c2 on
chip drivers/i2c/hid
register "generic.hid" = ""ACPI0C50""
register "generic.desc" = ""ELAN Touchpad""
@@ -288,17 +288,17 @@ chip soc/intel/skylake
register "hid_desc_reg_offset" = "0x01"
device i2c 0x15 on end
end
- end # I2C #2 - Trackpad
- device pci 15.3 on end # I2C #3 - Camera
- device pci 16.0 on end # Management Engine Interface 1
- device pci 16.1 off end # Management Engine Interface 2
- device pci 16.2 off end # Management Engine IDE-R
- device pci 16.3 off end # Management Engine KT Redirection
- device pci 16.4 off end # Management Engine Interface 3
- device pci 17.0 off end # SATA
- device pci 19.0 on end # UART #2
- device pci 19.1 off end # I2C #5
- device pci 19.2 on
+ end
+ device ref i2c3 on end # Camera
+ device ref heci1 on end
+ device ref heci2 off end
+ device ref csme_ider off end
+ device ref csme_ktr off end
+ device ref heci3 off end
+ device ref sata off end
+ device ref uart2 on end
+ device ref i2c5 off end
+ device ref i2c4 on
chip drivers/i2c/max98373
register "vmon_slot_no" = "4"
register "imon_slot_no" = "5"
@@ -332,48 +332,48 @@ chip soc/intel/skylake
register "mic_amp_in_sel" = ""diff""
device i2c 1a on end
end
- end # I2C #4 - Audio
- device pci 1c.0 on
+ end
+ device ref pcie_rp1 on
chip drivers/wifi/generic
register "wake" = "GPE0_DW1_07" # GPP_B7
device pci 00.0 on end
end
- end # PCI Express Port 1
- device pci 1c.1 off end # PCI Express Port 2
- device pci 1c.2 off end # PCI Express Port 3
- device pci 1c.3 off end # PCI Express Port 4
- device pci 1c.4 off end # PCI Express Port 5
- device pci 1c.5 off end # PCI Express Port 6
- device pci 1c.6 off end # PCI Express Port 7
- device pci 1c.7 off end # PCI Express Port 8
- device pci 1d.0 off end # PCI Express Port 9
- device pci 1d.1 off end # PCI Express Port 10
- device pci 1d.2 off end # PCI Express Port 11
- device pci 1d.3 off end # PCI Express Port 12
- device pci 1e.0 on end # UART #0
- device pci 1e.1 off end # UART #1
- device pci 1e.2 on
+ end
+ device ref pcie_rp2 off end
+ device ref pcie_rp3 off end
+ device ref pcie_rp4 off end
+ device ref pcie_rp5 off end
+ device ref pcie_rp6 off end
+ device ref pcie_rp7 off end
+ device ref pcie_rp8 off end
+ device ref pcie_rp9 off end
+ device ref pcie_rp10 off end
+ device ref pcie_rp11 off end
+ device ref pcie_rp12 off end
+ device ref uart0 on end
+ device ref uart1 off 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_E0_IRQ)"
device spi 0 on end
end
- end # GSPI #0
- device pci 1e.3 off end # GSPI #1
- device pci 1e.4 on end # eMMC
- device pci 1e.5 off end # SDIO
- device pci 1e.6 off end # SDCard
- device pci 1f.0 on
+ end
+ device ref gspi1 off end
+ device ref emmc on end
+ device ref sdio off end
+ device ref sdxc off end
+ device ref lpc_espi on
chip ec/google/chromeec
device pnp 0c09.0 on end
end
- end # LPC Interface
- device pci 1f.1 on end # P2SB
- device pci 1f.2 on end # Power Management Controller
- device pci 1f.3 on end # Intel HDA
- device pci 1f.4 on end # SMBus
- device pci 1f.5 on end # PCH SPI
- device pci 1f.6 off end # GbE
+ end
+ device ref p2sb on end
+ device ref pmc on end
+ device ref hda on end
+ device ref smbus on end
+ device ref fast_spi on end
+ device ref gbe off end
end
end
diff --git a/src/mainboard/google/poppy/variants/baseboard/devicetree.cb b/src/mainboard/google/poppy/variants/baseboard/devicetree.cb
index 717ab547cd..2425de24c0 100644
--- a/src/mainboard/google/poppy/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/baseboard/devicetree.cb
@@ -251,15 +251,15 @@ chip soc/intel/skylake
device cpu_cluster 0 on end
device domain 0 on
- device pci 00.0 on end # Host Bridge
- device pci 02.0 on end # Integrated Graphics Device
- device pci 04.0 on end # SA thermal subsystem
- device pci 05.0 on end # SA IMGU
- device pci 14.0 on end # USB xHCI
- device pci 14.1 on end # USB xDCI (OTG)
- device pci 14.2 on end # Thermal Subsystem
- device pci 14.3 on end # Camera
- device pci 15.0 on
+ device ref system_agent on end
+ device ref igpu on end
+ device ref sa_thermal on end
+ device ref imgu on end
+ device ref south_xhci on end
+ device ref south_xdci on end
+ device ref thermal on end
+ device ref cio on end
+ device ref i2c0 on
chip drivers/i2c/generic
register "hid" = ""ELAN0001""
register "desc" = ""ELAN Touchscreen""
@@ -282,16 +282,16 @@ chip soc/intel/skylake
register "enable_delay_ms" = "250"
device i2c 4b on end
end
- end # I2C #0
- device pci 15.1 on
+ end
+ device ref i2c1 on
chip drivers/i2c/tpm
register "hid" = ""GOOG0005""
register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E0_IRQ)"
device i2c 50 on end
end
- end # I2C #1
- device pci 15.2 on end # I2C #2
- device pci 15.3 on
+ end
+ device ref i2c2 on end
+ device ref i2c3 on
chip drivers/i2c/hid
register "generic.hid" = ""WCOM50C1""
register "generic.desc" = ""WCOM Digitizer""
@@ -310,15 +310,15 @@ chip soc/intel/skylake
register "key.wakeup_route" = "WAKEUP_ROUTE_DISABLED"
device generic 0 on end
end
- end # I2C #3
- device pci 16.0 on end # Management Engine Interface 1
- device pci 16.1 off end # Management Engine Interface 2
- device pci 16.2 off end # Management Engine IDE-R
- device pci 16.3 off end # Management Engine KT Redirection
- device pci 16.4 off end # Management Engine Interface 3
- device pci 17.0 off end # SATA
- device pci 19.0 on end # UART #2
- device pci 19.1 on
+ end
+ device ref heci1 on end
+ device ref heci2 off end
+ device ref csme_ider off end
+ device ref csme_ktr off end
+ device ref heci3 off end
+ device ref sata off end
+ device ref uart2 on end
+ device ref i2c5 on
chip drivers/i2c/max98927
register "interleave_mode" = "1"
register "vmon_slot_no" = "4"
@@ -345,42 +345,42 @@ chip soc/intel/skylake
register "probed" = "1"
device i2c 13 on end
end
- end # I2C #5
- device pci 19.2 on end # I2C #4
- device pci 1c.0 on
+ end
+ device ref i2c4 on end
+ device ref pcie_rp1 on
chip drivers/wifi/generic
register "wake" = "GPE0_DW0_00"
device pci 00.0 on end
end
- end # PCI Express Port 1
- device pci 1c.1 off end # PCI Express Port 2
- device pci 1c.2 off end # PCI Express Port 3
- device pci 1c.3 off end # PCI Express Port 4
- device pci 1c.4 off end # PCI Express Port 5
- device pci 1c.5 off end # PCI Express Port 6
- device pci 1c.6 off end # PCI Express Port 7
- device pci 1c.7 off end # PCI Express Port 8
- device pci 1d.0 off end # PCI Express Port 9
- device pci 1d.1 off end # PCI Express Port 10
- device pci 1d.2 off end # PCI Express Port 11
- device pci 1d.3 off end # PCI Express Port 12
- device pci 1e.0 on end # UART #0
- device pci 1e.1 off end # UART #1
- device pci 1e.2 off end # GSPI #0
- device pci 1e.3 off end # GSPI #1
- device pci 1e.4 on end # eMMC
- device pci 1e.5 off end # SDIO
- device pci 1e.6 on end # SDCard
- device pci 1f.0 on
+ end
+ device ref pcie_rp2 off end
+ device ref pcie_rp3 off end
+ device ref pcie_rp4 off end
+ device ref pcie_rp5 off end
+ device ref pcie_rp6 off end
+ device ref pcie_rp7 off end
+ device ref pcie_rp8 off end
+ device ref pcie_rp9 off end
+ device ref pcie_rp10 off end
+ device ref pcie_rp11 off end
+ device ref pcie_rp12 off end
+ device ref uart0 on end
+ device ref uart1 off end
+ device ref gspi0 off end
+ device ref gspi1 off end
+ device ref emmc on end
+ device ref sdio off end
+ device ref sdxc on end
+ device ref lpc_espi on
chip ec/google/chromeec
device pnp 0c09.0 on end
end
- end # LPC Interface
- device pci 1f.1 on end # P2SB
- device pci 1f.2 on end # Power Management Controller
- device pci 1f.3 on end # Intel HDA
- device pci 1f.4 on end # SMBus
- device pci 1f.5 on end # PCH SPI
- device pci 1f.6 off end # GbE
+ end
+ device ref p2sb on end
+ device ref pmc on end
+ device ref hda on end
+ device ref smbus on end
+ device ref fast_spi on end
+ device ref gbe off end
end
end
diff --git a/src/mainboard/google/poppy/variants/nami/devicetree.cb b/src/mainboard/google/poppy/variants/nami/devicetree.cb
index d1d044161f..334250ef5a 100644
--- a/src/mainboard/google/poppy/variants/nami/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/nami/devicetree.cb
@@ -275,15 +275,15 @@ chip soc/intel/skylake
device cpu_cluster 0 on end
device domain 0 on
- device pci 00.0 on end # Host Bridge
- device pci 02.0 on end # Integrated Graphics Device
- device pci 04.0 on end # SA thermal subsystem
- device pci 05.0 off end # SA IMGU
- device pci 14.0 on end # USB xHCI
- device pci 14.1 on end # USB xDCI (OTG)
- device pci 14.2 on end # Thermal Subsystem
- device pci 14.3 off end # Camera
- device pci 15.0 on
+ device ref system_agent on end
+ device ref igpu on end
+ device ref sa_thermal on end
+ device ref imgu off end
+ device ref south_xhci on end
+ device ref south_xdci on end
+ device ref thermal on end
+ device ref cio off end
+ device ref i2c0 on
chip drivers/i2c/generic
register "hid" = ""ELAN0001""
register "desc" = ""ELAN Touchscreen""
@@ -341,8 +341,8 @@ chip soc/intel/skylake
register "hid_desc_reg_offset" = "0x01"
device i2c 40 on end
end
- end # I2C #0
- device pci 15.1 on
+ end
+ device ref i2c1 on
chip drivers/i2c/generic
register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad""
@@ -361,8 +361,8 @@ chip soc/intel/skylake
register "hid_desc_reg_offset" = "0x20"
device i2c 0x2c on end
end
- end # I2C #1
- device pci 15.2 on
+ end
+ device ref i2c2 on
chip drivers/i2c/hid
register "generic.hid" = ""WCOM005C""
register "generic.desc" = ""WCOM Digitizer""
@@ -385,8 +385,8 @@ chip soc/intel/skylake
register "key.wakeup_route" = "WAKEUP_ROUTE_DISABLED"
device generic 0 on end
end
- end # I2C #2
- device pci 15.3 on
+ end
+ device ref i2c3 on
chip drivers/generic/max98357a
register "hid" = ""MX98357A""
register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A23)"
@@ -410,44 +410,44 @@ chip soc/intel/skylake
register "mic_amp_in_sel" = ""diff""
device i2c 1A on end
end
- end # I2C #3
- device pci 16.0 on end # Management Engine Interface 1
- device pci 16.1 off end # Management Engine Interface 2
- device pci 16.2 off end # Management Engine IDE-R
- device pci 16.3 off end # Management Engine KT Redirection
- device pci 16.4 off end # Management Engine Interface 3
- device pci 17.0 off end # SATA
- device pci 19.0 on end # UART #2
- device pci 19.1 off end # I2C #5
- device pci 19.2 off end # I2C #4
- device pci 1c.0 on end # PCI Express Port 1
- device pci 1c.1 off end # PCI Express Port 2
- device pci 1c.2 off end # PCI Express Port 3
- device pci 1c.3 on
+ end
+ device ref heci1 on end
+ device ref heci2 off end
+ device ref csme_ider off end
+ device ref csme_ktr off end
+ device ref heci3 off end
+ device ref sata off end
+ device ref uart2 on end
+ device ref i2c5 off end
+ device ref i2c4 off end
+ device ref pcie_rp1 on end
+ device ref pcie_rp2 off end
+ device ref pcie_rp3 off end
+ device ref pcie_rp4 on
chip drivers/wifi/generic
register "wake" = "GPE0_DW2_22" # Wake pin = GPP_E22
device pci 00.0 on end
end
- end # PCI Express Port 4
- device pci 1c.4 on end # PCI Express Port 5
- device pci 1c.5 off end # PCI Express Port 6
- device pci 1c.6 off end # PCI Express Port 7
- device pci 1c.7 off end # PCI Express Port 8
- device pci 1d.0 on end # PCI Express Port 9
- device pci 1d.1 off end # PCI Express Port 10
- device pci 1d.2 off end # PCI Express Port 11
- device pci 1d.3 off end # PCI Express Port 12
- device pci 1e.0 on end # UART #0
- device pci 1e.1 off end # UART #1
- device pci 1e.2 on
+ end
+ device ref pcie_rp5 on end
+ device ref pcie_rp6 off end
+ device ref pcie_rp7 off end
+ device ref pcie_rp8 off end
+ device ref pcie_rp9 on end
+ device ref pcie_rp10 off end
+ device ref pcie_rp11 off end
+ device ref pcie_rp12 off end
+ device ref uart0 on end
+ device ref uart1 off 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_E0_IRQ)"
device spi 0 on end
end
- end # GSPI #0
- device pci 1e.3 on
+ end
+ device ref gspi1 on
chip drivers/spi/acpi
register "name" = ""CRFP""
register "hid" = "ACPI_DT_NAMESPACE_HID"
@@ -457,20 +457,20 @@ chip soc/intel/skylake
register "wake" = "GPE0_DW0_01" # GPP_B1
device spi 0 on end
end # FPMCU
- end # GSPI #1
- device pci 1e.4 on end # eMMC
- device pci 1e.5 off end # SDIO
- device pci 1e.6 off end # SDCard
- device pci 1f.0 on
+ end
+ device ref emmc on end
+ device ref sdio off end
+ device ref sdxc off end
+ device ref lpc_espi on
chip ec/google/chromeec
device pnp 0c09.0 on end
end
- end # LPC Interface
- device pci 1f.1 on end # P2SB
- device pci 1f.2 on end # Power Management Controller
- device pci 1f.3 on end # Intel HDA
- device pci 1f.4 on end # SMBus
- device pci 1f.5 on end # PCH SPI
- device pci 1f.6 off end # GbE
+ end
+ device ref p2sb on end
+ device ref pmc on end
+ device ref hda on end
+ device ref smbus on end
+ device ref fast_spi on end
+ device ref gbe off end
end
end
diff --git a/src/mainboard/google/poppy/variants/nautilus/devicetree.cb b/src/mainboard/google/poppy/variants/nautilus/devicetree.cb
index 6cc1f8eb76..4cbc0450f0 100644
--- a/src/mainboard/google/poppy/variants/nautilus/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/nautilus/devicetree.cb
@@ -282,15 +282,15 @@ chip soc/intel/skylake
device cpu_cluster 0 on end
device domain 0 on
- device pci 00.0 on end # Host Bridge
- device pci 02.0 on end # Integrated Graphics Device
- device pci 04.0 on end # SA thermal subsystem
- device pci 05.0 on end # SA IMGU
- device pci 14.0 on end # USB xHCI
- device pci 14.1 on end # USB xDCI (OTG)
- device pci 14.2 on end # Thermal Subsystem
- device pci 14.3 on end # Camera
- device pci 15.0 on
+ device ref system_agent on end
+ device ref igpu on end
+ device ref sa_thermal on end
+ device ref imgu on end
+ device ref south_xhci on end
+ device ref south_xdci on end
+ device ref thermal on end
+ device ref cio on end
+ device ref i2c0 on
chip drivers/i2c/hid
register "generic.hid" = ""SYTS7813""
register "generic.desc" = ""Synaptics Touchscreen""
@@ -302,15 +302,15 @@ chip soc/intel/skylake
register "hid_desc_reg_offset" = "0x20"
device i2c 20 on end
end
- end # I2C #0
- device pci 15.1 on
+ end
+ device ref i2c1 on
chip drivers/i2c/tpm
register "hid" = ""GOOG0005""
register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E0_IRQ)"
device i2c 50 on end
end
- end # I2C #1
- device pci 15.2 on
+ end
+ device ref i2c2 on
chip drivers/i2c/generic
register "hid" = ""STH9321""
register "name" = ""SEMTECH SX9321""
@@ -319,8 +319,8 @@ chip soc/intel/skylake
register "device_present_gpio" = "GPP_B20"
device i2c 28 on end
end
- end # I2C #2
- device pci 15.3 on
+ end
+ device ref i2c3 on
chip drivers/i2c/hid
register "generic.hid" = ""ACPI0C50""
register "generic.cid" = ""PNP0C50""
@@ -343,15 +343,15 @@ chip soc/intel/skylake
register "key.wakeup_route" = "WAKEUP_ROUTE_DISABLED"
device generic 0 on end
end
- end # I2C #3
- device pci 16.0 on end # Management Engine Interface 1
- device pci 16.1 off end # Management Engine Interface 2
- device pci 16.2 off end # Management Engine IDE-R
- device pci 16.3 off end # Management Engine KT Redirection
- device pci 16.4 off end # Management Engine Interface 3
- device pci 17.0 off end # SATA
- device pci 19.0 on end # UART #2
- device pci 19.1 on
+ end
+ device ref heci1 on end
+ device ref heci2 off end
+ device ref csme_ider off end
+ device ref csme_ktr off end
+ device ref heci3 off end
+ device ref sata off end
+ device ref uart2 on end
+ device ref i2c5 on
chip drivers/generic/max98357a
register "hid" = ""MX98357A""
register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A23)"
@@ -375,8 +375,8 @@ chip soc/intel/skylake
register "mic_amp_in_sel" = ""diff""
device i2c 1A on end
end
- end # I2C #5
- device pci 19.2 on
+ end
+ device ref i2c4 on
chip drivers/i2c/generic
register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad""
@@ -384,41 +384,41 @@ chip soc/intel/skylake
register "wake" = "GPE0_DW0_05"
device i2c 15 on end
end
- end # I2C #4
- device pci 1c.0 on
+ end
+ device ref pcie_rp1 on
chip drivers/wifi/generic
register "wake" = "GPE0_DW0_00"
device pci 00.0 on end
end
- end # PCI Express Port 1
- device pci 1c.1 off end # PCI Express Port 2
- device pci 1c.2 off end # PCI Express Port 3
- device pci 1c.3 off end # PCI Express Port 4
- device pci 1c.4 off end # PCI Express Port 5
- device pci 1c.5 off end # PCI Express Port 6
- device pci 1c.6 off end # PCI Express Port 7
- device pci 1c.7 off end # PCI Express Port 8
- device pci 1d.0 off end # PCI Express Port 9
- device pci 1d.1 off end # PCI Express Port 10
- device pci 1d.2 off end # PCI Express Port 11
- device pci 1d.3 off end # PCI Express Port 12
- device pci 1e.0 on end # UART #0
- device pci 1e.1 off end # UART #1
- device pci 1e.2 off end # GSPI #0
- device pci 1e.3 off end # GSPI #1
- device pci 1e.4 on end # eMMC
- device pci 1e.5 off end # SDIO
- device pci 1e.6 on end # SDCard
- device pci 1f.0 on
+ end
+ device ref pcie_rp2 off end
+ device ref pcie_rp3 off end
+ device ref pcie_rp4 off end
+ device ref pcie_rp5 off end
+ device ref pcie_rp6 off end
+ device ref pcie_rp7 off end
+ device ref pcie_rp8 off end
+ device ref pcie_rp9 off end
+ device ref pcie_rp10 off end
+ device ref pcie_rp11 off end
+ device ref pcie_rp12 off end
+ device ref uart0 on end
+ device ref uart1 off end
+ device ref gspi0 off end
+ device ref gspi1 off end
+ device ref emmc on end
+ device ref sdio off end
+ device ref sdxc on end
+ device ref lpc_espi on
chip ec/google/chromeec
device pnp 0c09.0 on end
end
- end # LPC Interface
- device pci 1f.1 on end # P2SB
- device pci 1f.2 on end # Power Management Controller
- device pci 1f.3 on end # Intel HDA
- device pci 1f.4 on end # SMBus
- device pci 1f.5 on end # PCH SPI
- device pci 1f.6 off end # GbE
+ end
+ device ref p2sb on end
+ device ref pmc on end
+ device ref hda on end
+ device ref smbus on end
+ device ref fast_spi on end
+ device ref gbe off end
end
end
diff --git a/src/mainboard/google/poppy/variants/nocturne/devicetree.cb b/src/mainboard/google/poppy/variants/nocturne/devicetree.cb
index 5f322b12e8..188f0e184c 100644
--- a/src/mainboard/google/poppy/variants/nocturne/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/nocturne/devicetree.cb
@@ -246,11 +246,11 @@ chip soc/intel/skylake
device cpu_cluster 0 on end
device domain 0 on
- device pci 00.0 on end # Host Bridge
- device pci 02.0 on end # Integrated Graphics Device
- device pci 04.0 on end # SA thermal subsystem
- device pci 05.0 on end # SA IMGU
- device pci 14.0 on
+ device ref system_agent on end
+ device ref igpu on end
+ device ref sa_thermal on end
+ device ref imgu on end
+ device ref south_xhci on
chip drivers/usb/acpi
register "desc" = ""Root Hub""
register "type" = "UPC_TYPE_HUB"
@@ -278,11 +278,11 @@ chip soc/intel/skylake
end
end
end
- end # USB xHCI
- device pci 14.1 on end # USB xDCI (OTG)
- device pci 14.2 on end # Thermal Subsystem
- device pci 14.3 on end # Camera
- device pci 15.0 on
+ end
+ device ref south_xdci on end
+ device ref thermal on end
+ device ref cio on end
+ device ref i2c0 on
chip drivers/i2c/hid
register "generic.hid" = ""WCOM50C1""
register "generic.desc" = ""WCOM Digitizer""
@@ -297,8 +297,8 @@ chip soc/intel/skylake
register "hid_desc_reg_offset" = "0x1"
device i2c 0a on end
end
- end # I2C #0 - Touchscreen
- device pci 15.1 on
+ end
+ device ref i2c1 on
chip drivers/i2c/sx9310
register "desc" = ""Right SAR Proximity Sensor""
register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D9_IRQ)"
@@ -315,17 +315,17 @@ chip soc/intel/skylake
register "startup_sensor" = "0"
register "proxraw_strength" = "0"
end
- end # I2C #1
- device pci 15.2 off end # I2C #2
- device pci 15.3 on end # I2C #3 - Camera
- device pci 16.0 on end # Management Engine Interface 1
- device pci 16.1 off end # Management Engine Interface 2
- device pci 16.2 off end # Management Engine IDE-R
- device pci 16.3 off end # Management Engine KT Redirection
- device pci 16.4 off end # Management Engine Interface 3
- device pci 17.0 off end # SATA
- device pci 19.0 on end # UART #2
- device pci 19.1 on
+ end
+ device ref i2c2 off end
+ device ref i2c3 on end
+ device ref heci1 on end
+ device ref heci2 off end
+ device ref csme_ider off end
+ device ref csme_ktr off end
+ device ref heci3 off end
+ device ref sata off end
+ device ref uart2 on end
+ device ref i2c5 on
chip drivers/i2c/sx9310
register "desc" = ""Left SAR Proximity Sensor""
register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D10_IRQ)"
@@ -342,8 +342,8 @@ chip soc/intel/skylake
register "startup_sensor" = "0"
register "proxraw_strength" = "0"
end
- end # I2C #5
- device pci 19.2 on
+ end
+ device ref i2c4 on
chip drivers/i2c/max98373
register "vmon_slot_no" = "4"
register "imon_slot_no" = "5"
@@ -360,35 +360,35 @@ chip soc/intel/skylake
register "name" = ""MAXL""
device i2c 31 on end
end
- end # I2C #4 - Audio
- device pci 1c.0 on
+ end
+ device ref pcie_rp1 on
chip drivers/wifi/generic
register "wake" = "GPE0_DW2_01"
device pci 00.0 on end
end
- end # PCI Express Port 1
- device pci 1c.1 off end # PCI Express Port 2
- device pci 1c.2 off end # PCI Express Port 3
- device pci 1c.3 off end # PCI Express Port 4
- device pci 1c.4 off end # PCI Express Port 5
- device pci 1c.5 off end # PCI Express Port 6
- device pci 1c.6 off end # PCI Express Port 7
- device pci 1c.7 off end # PCI Express Port 8
- device pci 1d.0 on end # PCI Express Port 9
- device pci 1d.1 off end # PCI Express Port 10
- device pci 1d.2 off end # PCI Express Port 11
- device pci 1d.3 off end # PCI Express Port 12
- device pci 1e.0 off end # UART #0
- device pci 1e.1 off end # UART #1
- device pci 1e.2 on
+ end
+ device ref pcie_rp2 off end
+ device ref pcie_rp3 off end
+ device ref pcie_rp4 off end
+ device ref pcie_rp5 off end
+ device ref pcie_rp6 off end
+ device ref pcie_rp7 off end
+ device ref pcie_rp8 off end
+ device ref pcie_rp9 on end
+ device ref pcie_rp10 off end
+ device ref pcie_rp11 off end
+ device ref pcie_rp12 off end
+ device ref uart0 off end
+ device ref uart1 off 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_E0_IRQ)"
device spi 0 on end
end
- end # GSPI #0
- device pci 1e.3 on
+ end
+ device ref gspi1 on
chip drivers/spi/acpi
register "name" = ""CRFP""
register "hid" = "ACPI_DT_NAMESPACE_HID"
@@ -398,20 +398,20 @@ chip soc/intel/skylake
register "wake" = "GPE0_DW0_09" # GPP_C9
device spi 0 on end
end # FPMCU
- end # GSPI #1
- device pci 1e.4 on end # eMMC
- device pci 1e.5 off end # SDIO
- device pci 1e.6 off end # SDCard
- device pci 1f.0 on
+ end
+ device ref emmc on end
+ device ref sdio off end
+ device ref sdxc off end
+ device ref lpc_espi on
chip ec/google/chromeec
device pnp 0c09.0 on end
end
- end # LPC Interface
- device pci 1f.1 on end # P2SB
- device pci 1f.2 on end # Power Management Controller
- device pci 1f.3 on end # Intel HDA
- device pci 1f.4 on end # SMBus
- device pci 1f.5 on end # PCH SPI
- device pci 1f.6 off end # GbE
+ end
+ device ref p2sb on end
+ device ref pmc on end
+ device ref hda on end
+ device ref smbus on end
+ device ref fast_spi on end
+ device ref gbe off end
end
end
diff --git a/src/mainboard/google/poppy/variants/rammus/devicetree.cb b/src/mainboard/google/poppy/variants/rammus/devicetree.cb
index 8a3d4fd6e3..34dd2afbd3 100644
--- a/src/mainboard/google/poppy/variants/rammus/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/rammus/devicetree.cb
@@ -232,11 +232,11 @@ chip soc/intel/skylake
device cpu_cluster 0 on end
device domain 0 on
- device pci 00.0 on end # Host Bridge
- device pci 02.0 on end # Integrated Graphics Device
- device pci 04.0 on end # SA thermal subsystem
- device pci 05.0 off end # SA IMGU
- device pci 14.0 on
+ device ref system_agent on end
+ device ref igpu on end
+ device ref sa_thermal on end
+ device ref imgu off end
+ device ref south_xhci on
chip drivers/usb/acpi
register "desc" = ""Root Hub""
register "type" = "UPC_TYPE_HUB"
@@ -269,11 +269,11 @@ chip soc/intel/skylake
end
end
end
- end # USB xHCI
- device pci 14.1 off end # USB xDCI (OTG)
- device pci 14.2 on end # Thermal Subsystem
- device pci 14.3 off end # Camera
- device pci 15.0 on
+ end
+ device ref south_xdci off end
+ device ref thermal on end
+ device ref cio off end
+ device ref i2c0 on
chip drivers/i2c/hid
register "generic.hid" = ""PNP0C50""
register "generic.desc" = ""SISC Touchscreen""
@@ -287,8 +287,8 @@ chip soc/intel/skylake
register "hid_desc_reg_offset" = "0x0"
device i2c 5c on end
end
- end # I2C #0
- device pci 15.1 on
+ end
+ device ref i2c1 on
chip drivers/i2c/generic
register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad""
@@ -297,17 +297,17 @@ chip soc/intel/skylake
register "detect" = "1"
device i2c 15 on end
end
- 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 # Management Engine Interface 1
- device pci 16.1 off end # Management Engine Interface 2
- device pci 16.2 off end # Management Engine IDE-R
- device pci 16.3 off end # Management Engine KT Redirection
- device pci 16.4 off end # Management Engine Interface 3
- device pci 17.0 off end # SATA
- device pci 19.0 on end # UART #2
- device pci 19.1 on
+ end
+ device ref i2c2 off end
+ device ref i2c3 off end
+ device ref heci1 on end
+ device ref heci2 off end
+ device ref csme_ider off end
+ device ref csme_ktr off end
+ device ref heci3 off end
+ device ref sata off end
+ device ref uart2 on end
+ device ref i2c5 on
chip drivers/i2c/max98927
register "interleave_mode" = "1"
register "vmon_slot_no" = "4"
@@ -343,49 +343,49 @@ chip soc/intel/skylake
register "mic_amp_in_sel" = ""diff""
device i2c 1A on end
end
- end # I2C #5
- device pci 19.2 off end # I2C #4
- device pci 1c.0 on
+ end
+ device ref i2c4 off end
+ device ref pcie_rp1 on
chip drivers/wifi/generic
register "wake" = "GPE0_DW0_00" # GPP_B0
device pci 00.0 on end
end
- end # PCI Express Port 1
- device pci 1c.1 off end # PCI Express Port 2
- device pci 1c.2 off end # PCI Express Port 3
- device pci 1c.3 off end # PCI Express Port 4
- device pci 1c.4 off end # PCI Express Port 5
- device pci 1c.5 off end # PCI Express Port 6
- device pci 1c.6 off end # PCI Express Port 7
- device pci 1c.7 off end # PCI Express Port 8
- device pci 1d.0 off end # PCI Express Port 9
- device pci 1d.1 off end # PCI Express Port 10
- device pci 1d.2 off end # PCI Express Port 11
- device pci 1d.3 off end # PCI Express Port 12
- device pci 1e.0 on end # UART #0
- device pci 1e.1 off end # UART #1
- device pci 1e.2 on
+ end
+ device ref pcie_rp2 off end
+ device ref pcie_rp3 off end
+ device ref pcie_rp4 off end
+ device ref pcie_rp5 off end
+ device ref pcie_rp6 off end
+ device ref pcie_rp7 off end
+ device ref pcie_rp8 off end
+ device ref pcie_rp9 off end
+ device ref pcie_rp10 off end
+ device ref pcie_rp11 off end
+ device ref pcie_rp12 off end
+ device ref uart0 on end
+ device ref uart1 off 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_E0_IRQ)"
device spi 0 on end
end
- end # GSPI #0
- device pci 1e.3 off end # GSPI #1
- device pci 1e.4 on end # eMMC
- device pci 1e.5 off end # SDIO
- device pci 1e.6 on end # SDCard
- device pci 1f.0 on
+ end
+ device ref gspi1 off end
+ device ref emmc on end
+ device ref sdio off end
+ device ref sdxc on end
+ device ref lpc_espi on
chip ec/google/chromeec
device pnp 0c09.0 on end
end
- end # LPC Interface
- device pci 1f.1 on end # P2SB
- device pci 1f.2 on end # Power Management Controller
- device pci 1f.3 on end # Intel HDA
- device pci 1f.4 on end # SMBus
- device pci 1f.5 on end # PCH SPI
- device pci 1f.6 off end # GbE
+ end
+ device ref p2sb on end
+ device ref pmc on end
+ device ref hda on end
+ device ref smbus on end
+ device ref fast_spi on end
+ device ref gbe off end
end
end
diff --git a/src/mainboard/google/poppy/variants/soraka/devicetree.cb b/src/mainboard/google/poppy/variants/soraka/devicetree.cb
index db7933707b..d64213792f 100644
--- a/src/mainboard/google/poppy/variants/soraka/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/soraka/devicetree.cb
@@ -261,15 +261,15 @@ chip soc/intel/skylake
device cpu_cluster 0 on end
device domain 0 on
- device pci 00.0 on end # Host Bridge
- device pci 02.0 on end # Integrated Graphics Device
- device pci 04.0 on end # SA thermal subsystem
- device pci 05.0 on end # SA IMGU
- device pci 14.0 on end # USB xHCI
- device pci 14.1 on end # USB xDCI (OTG)
- device pci 14.2 on end # Thermal Subsystem
- device pci 14.3 on end # Camera
- device pci 15.0 on
+ device ref system_agent on end
+ device ref igpu on end
+ device ref sa_thermal on end
+ device ref imgu on end
+ device ref south_xhci on end
+ device ref south_xdci on end
+ device ref thermal on end
+ device ref cio on end
+ device ref i2c0 on
chip drivers/i2c/hid
register "generic.hid" = ""WCOMCOHO""
register "generic.desc" = ""WCOM Touchscreen""
@@ -284,24 +284,24 @@ chip soc/intel/skylake
register "hid_desc_reg_offset" = "0x1"
device i2c 0xA on end
end
- end # I2C #0
- device pci 15.1 on
+ end
+ device ref i2c1 on
chip drivers/i2c/tpm
register "hid" = ""GOOG0005""
register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E0_IRQ)"
device i2c 50 on end
end
- end # I2C #1
- device pci 15.2 on end # I2C #2
- device pci 15.3 off end # I2C #3
- device pci 16.0 on end # Management Engine Interface 1
- device pci 16.1 off end # Management Engine Interface 2
- device pci 16.2 off end # Management Engine IDE-R
- device pci 16.3 off end # Management Engine KT Redirection
- device pci 16.4 off end # Management Engine Interface 3
- device pci 17.0 off end # SATA
- device pci 19.0 on end # UART #2
- device pci 19.1 on
+ end
+ device ref i2c2 on end
+ device ref i2c3 off end
+ device ref heci1 on end
+ device ref heci2 off end
+ device ref csme_ider off end
+ device ref csme_ktr off end
+ device ref heci3 off end
+ device ref sata off end
+ device ref uart2 on end
+ device ref i2c5 on
chip drivers/i2c/max98927
register "interleave_mode" = "1"
register "vmon_slot_no" = "4"
@@ -328,42 +328,42 @@ chip soc/intel/skylake
register "probed" = "1"
device i2c 13 on end
end
- end # I2C #5
- device pci 19.2 on end # I2C #4
- device pci 1c.0 on
+ end
+ device ref i2c4 on end
+ device ref pcie_rp1 on
chip drivers/wifi/generic
register "wake" = "GPE0_PCI_EXP"
device pci 00.0 on end
end
- end # PCI Express Port 1
- device pci 1c.1 off end # PCI Express Port 2
- device pci 1c.2 off end # PCI Express Port 3
- device pci 1c.3 off end # PCI Express Port 4
- device pci 1c.4 off end # PCI Express Port 5
- device pci 1c.5 off end # PCI Express Port 6
- device pci 1c.6 off end # PCI Express Port 7
- device pci 1c.7 off end # PCI Express Port 8
- device pci 1d.0 off end # PCI Express Port 9
- device pci 1d.1 off end # PCI Express Port 10
- device pci 1d.2 off end # PCI Express Port 11
- device pci 1d.3 off end # PCI Express Port 12
- device pci 1e.0 on end # UART #0
- device pci 1e.1 off end # UART #1
- device pci 1e.2 off end # GSPI #0
- device pci 1e.3 off end # GSPI #1
- device pci 1e.4 on end # eMMC
- device pci 1e.5 off end # SDIO
- device pci 1e.6 on end # SDCard
- device pci 1f.0 on
+ end
+ device ref pcie_rp2 off end
+ device ref pcie_rp3 off end
+ device ref pcie_rp4 off end
+ device ref pcie_rp5 off end
+ device ref pcie_rp6 off end
+ device ref pcie_rp7 off end
+ device ref pcie_rp8 off end
+ device ref pcie_rp9 off end
+ device ref pcie_rp10 off end
+ device ref pcie_rp11 off end
+ device ref pcie_rp12 off end
+ device ref uart0 on end
+ device ref uart1 off end
+ device ref gspi0 off end
+ device ref gspi1 off end
+ device ref emmc on end
+ device ref sdio off end
+ device ref sdxc on end
+ device ref lpc_espi on
chip ec/google/chromeec
device pnp 0c09.0 on end
end
- end # LPC Interface
- device pci 1f.1 on end # P2SB
- device pci 1f.2 on end # Power Management Controller
- device pci 1f.3 on end # Intel HDA
- device pci 1f.4 on end # SMBus
- device pci 1f.5 on end # PCH SPI
- device pci 1f.6 off end # GbE
+ end
+ device ref p2sb on end
+ device ref pmc on end
+ device ref hda on end
+ device ref smbus on end
+ device ref fast_spi on end
+ device ref gbe off end
end
end