Skip to content

Commit 0d97a84

Browse files
felixsingerFelix Singer
authored and
Felix Singer
committed
mb/prodrive/hermes: Use chipset dt reference names
Use the references from the chipset devicetree as this makes the comments superfluous. Change-Id: I81dd67fd200768942fe355180b75db0746cda8ea Signed-off-by: Felix Singer <[email protected]> Reviewed-on: https://review.coreboot.org/c/coreboot/+/80050 Tested-by: build bot (Jenkins) <[email protected]> Reviewed-by: Martin L Roth <[email protected]>
1 parent dea4746 commit 0d97a84

File tree

1 file changed

+41
-41
lines changed

1 file changed

+41
-41
lines changed

src/mainboard/prodrive/hermes/devicetree.cb

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -139,44 +139,44 @@ chip soc/intel/cannonlake
139139
device cpu_cluster 0 on end
140140

141141
device domain 0 on
142-
device pci 00.0 on end # Host Bridge
143-
device pci 01.0 on # PEG x8 / Slot 2
142+
device ref system_agent on end
143+
device ref peg0 on # x8 / Slot 2
144144
smbios_slot_desc "SlotTypePciExpressGen3X16" "SlotLengthOther" "SLOT2" "SlotDataBusWidth8X"
145145
end
146-
device pci 01.1 on # PEG x4 or x8 / Slot 6
146+
device ref peg1 on # x4 or x8 / Slot 6
147147
smbios_slot_desc "SlotTypePciExpressGen3X16" "SlotLengthOther" "SLOT6" "SlotDataBusWidth4X"
148148
end
149-
device pci 01.2 on # PEG x4 or disabled / Slot 4
149+
device ref peg2 on # x4 or disabled / Slot 4
150150
smbios_slot_desc "SlotTypePciExpressGen3X16" "SlotLengthOther" "SLOT4" "SlotDataBusWidth4X"
151151
end
152-
device pci 02.0 on end # Integrated Graphics Device
153-
device pci 04.0 on end # SA Thermal device
154-
device pci 08.0 on end # Gaussian Mixture
155-
device pci 12.0 on end # Thermal Subsystem
156-
device pci 14.0 on end # USB xHCI
157-
device pci 14.1 off end # USB xDCI (OTG)
158-
device pci 14.2 on end # RAM controller
159-
device pci 14.3 on
152+
device ref igpu on end
153+
device ref dptf on end
154+
device ref gna on end
155+
device ref thermal on end
156+
device ref xhci on end
157+
device ref xdci off end
158+
device ref shared_sram on end
159+
device ref cnvi_wifi on
160160
chip drivers/wifi/generic
161161
register "wake" = "PME_B0_EN_BIT"
162162
device generic 0 on end
163163
end
164-
end # CNVi wifi
165-
device pci 14.5 off end # SDCard
166-
device pci 16.0 on end # Management Engine Interface 1
167-
device pci 16.1 on end # Management Engine Interface 2
168-
device pci 16.4 off end # Management Engine Interface 3
169-
device pci 17.0 on end # SATA
164+
end
165+
device ref sdxc off end
166+
device ref heci1 on end
167+
device ref heci2 on end
168+
device ref heci3 off end
169+
device ref sata on end
170170
# This device does not have any function on CNP-H, but it needs
171171
# to be here so that the resource allocator is aware of UART 2.
172-
device pci 19.0 hidden end
173-
device pci 19.2 hidden
172+
device ref i2c4 hidden end
173+
device ref uart2 hidden # in ACPI mode
174174
chip soc/intel/common/block/uart
175175
register "devid" = "PCI_DID_INTEL_CNP_H_UART2"
176176
device generic 0 hidden end
177177
end
178-
end # UART #2, in ACPI mode
179-
device pci 1b.4 on # PCIe root port 21 (Slot 1)
178+
end
179+
device ref pcie_rp21 on
180180
smbios_slot_desc "SlotTypePciExpressGen3X16" "SlotLengthOther" "SLOT1" "SlotDataBusWidth4X"
181181
register "PcieRpEnable[20]" = "1"
182182
register "PcieRpLtrEnable[20]" = "1"
@@ -185,7 +185,7 @@ chip soc/intel/cannonlake
185185
register "PcieRpAdvancedErrorReporting[20]" = "1"
186186
register "PcieRpAspm[20]" = "AspmDisabled"
187187
end
188-
device pci 1c.0 on # PCIe root port 1 (Slot 3)
188+
device ref pcie_rp1 on
189189
smbios_slot_desc "SlotTypePciExpressGen3X16" "SlotLengthOther" "SLOT3" "SlotDataBusWidth4X"
190190
register "PcieRpEnable[0]" = "1"
191191
register "PcieRpLtrEnable[0]" = "1"
@@ -194,75 +194,75 @@ chip soc/intel/cannonlake
194194
register "PcieRpAdvancedErrorReporting[0]" = "1"
195195
register "PcieRpAspm[0]" = "AspmDisabled"
196196
end
197-
device pci 1c.4 on # PCIe root port 5 (PHY 3)
197+
device ref pcie_rp5 on # PHY 3
198198
register "PcieRpEnable[4]" = "1"
199199
register "PcieRpLtrEnable[4]" = "1"
200200
device pci 00.0 on
201201
smbios_dev_info 3
202202
end
203203
end
204-
device pci 1c.5 on # PCIe root port 6 (PHY 4)
204+
device ref pcie_rp6 on # PHY 4
205205
register "PcieRpEnable[5]" = "1"
206206
register "PcieRpLtrEnable[5]" = "1"
207207
device pci 00.0 on
208208
smbios_dev_info 4
209209
end
210210
end
211-
device pci 1c.6 on # PCIe root port 7 (PHY 2)
211+
device ref pcie_rp7 on # PHY 2
212212
register "PcieRpEnable[6]" = "1"
213213
register "PcieRpLtrEnable[6]" = "1"
214214
device pci 00.0 on
215215
smbios_dev_info 2
216216
end
217217
end
218-
device pci 1c.7 on # PCIe root port 8 (PHY 1)
218+
device ref pcie_rp8 on # PHY 1
219219
register "PcieRpEnable[7]" = "1"
220220
register "PcieRpLtrEnable[7]" = "1"
221221
device pci 00.0 on
222222
smbios_dev_info 1
223223
end
224224
end
225-
device pci 1d.0 on # PCIe root port 9 (M2 M)
225+
device ref pcie_rp9 on
226226
smbios_slot_desc "SlotTypePciExpressGen3X16" "SlotLengthOther" "M2 M" "SlotDataBusWidth4X"
227227
register "PcieRpEnable[8]" = "1"
228228
register "PcieRpLtrEnable[8]" = "1"
229229
register "PcieRpSlotImplemented[8]" = "1"
230230
end
231-
device pci 1d.5 on # PCIe root port 14 (PHY 0)
231+
device ref pcie_rp14 on # PHY 0
232232
register "PcieRpEnable[13]" = "1"
233233
register "PcieRpLtrEnable[13]" = "1"
234234
device pci 00.0 on
235235
smbios_dev_info 0
236236
end
237237
end
238-
device pci 1d.6 on # PCIe root port 15 (BMC)
238+
device ref pcie_rp15 on # BMC
239239
device pci 00.0 on # Aspeed PCI Bridge
240240
device pci 00.0 on end # Aspeed 2500 VGA
241241
end
242242
register "PcieRpEnable[14]" = "1"
243243
register "PcieRpLtrEnable[14]" = "1"
244244
register "PcieRpSlotImplemented[14]" = "1"
245245
end
246-
device pci 1d.7 on # PCIe root port 16 (M.2 E/CNVi)
246+
device ref pcie_rp16 on # M.2 E/CNVi
247247
# Disabled when CNVi is present
248248
register "PcieRpEnable[15]" = "1"
249249
register "PcieRpLtrEnable[15]" = "1"
250250
register "PcieRpSlotImplemented[15]" = "1"
251251
end
252-
device pci 1e.0 on end # UART #0
253-
device pci 1e.1 on end # UART #1
254-
device pci 1e.2 off end # GSPI #0
255-
device pci 1e.3 off end # GSPI #1
256-
device pci 1f.0 on # LPC Interface
252+
device ref uart0 on end
253+
device ref uart1 on end
254+
device ref gspi0 off end
255+
device ref gspi1 off end
256+
device ref lpc_espi on
257257
chip drivers/pc80/tpm
258258
device pnp 0c31.0 on end
259259
end
260260
# AST2500, but not enabled to decode LPC cycles
261261
end
262-
device pci 1f.1 on end # P2SB
263-
device pci 1f.2 hidden end # Power Management Controller
264-
device pci 1f.3 on end # Intel HDA
265-
device pci 1f.4 on end # SMBus
266-
device pci 1f.5 on end # PCH SPI
262+
device ref p2sb on end
263+
device ref pmc hidden end
264+
device ref hda on end
265+
device ref smbus on end
266+
device ref fast_spi on end
267267
end
268268
end

0 commit comments

Comments
 (0)