From 4ce5b632947d3a2ea06d3e58a8a197cee35115ce Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Thu, 5 Nov 2020 11:30:16 +0100 Subject: mb/prodrive/hermes: Update PCIe slots in devicetree * Drop PcieRpSlotImplemented on internal slots * Add PCIe port 15 that connected to CNVi/M.2 E Change-Id: Iaa05affa760b447fc1725e674b12366684a63720 Signed-off-by: Patrick Rudolph Reviewed-on: https://review.coreboot.org/c/coreboot/+/47239 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Christian Walter Reviewed-by: Arthur Heymans --- .../hermes/variants/baseboard/overridetree.cb | 27 ++++++++-------------- 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'src/mainboard/prodrive/hermes') diff --git a/src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb b/src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb index 025510e7ce..b543a78c5c 100644 --- a/src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb +++ b/src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb @@ -185,30 +185,21 @@ chip soc/intel/cannonlake smbios_slot_desc "SlotTypePciExpressGen3X16" "SlotLengthOther" "SLOT3" "SlotDataBusWidth4X" register "PcieRpSlotImplemented[0]" = "1" end - device pci 1c.4 on # PCIe root port 5 (PHY 3) - register "PcieRpSlotImplemented[4]" = "1" - end - device pci 1c.5 on # PCIe root port 6 (PHY 4) - register "PcieRpSlotImplemented[5]" = "1" - end - device pci 1c.6 on # PCIe root port 7 (PHY 2) - register "PcieRpSlotImplemented[6]" = "1" - end - device pci 1c.7 on # PCIe root port 8 (PHY 1) - register "PcieRpSlotImplemented[7]" = "1" - end + device pci 1c.4 on end # PCIe root port 5 (PHY 3) + device pci 1c.5 on end # PCIe root port 6 (PHY 4) + device pci 1c.6 on end # PCIe root port 7 (PHY 2) + device pci 1c.7 on end # PCIe root port 8 (PHY 1) device pci 1d.0 on # PCIe root port 9 (M2 M) smbios_slot_desc "SlotTypePciExpressGen3X16" "SlotLengthOther" "M2 M" "SlotDataBusWidth4X" register "PcieRpSlotImplemented[8]" = "1" end - device pci 1d.5 on # PCIe root port 14 (PHY 0) - register "PcieRpSlotImplemented[13]" = "1" - end - device pci 1d.6 on # PCIe root port 15 (BMC) - register "PcieRpSlotImplemented[14]" = "1" + device pci 1d.5 on end # PCIe root port 14 (PHY 0) + device pci 1d.6 on end # PCIe root port 15 (BMC) + device pci 1d.7 on # PCIe root port 16 (M.2 E/CNVi) + # Disabled when CNVi is present + register "PcieRpSlotImplemented[15]" = "1" end - device pci 1e.0 on end # UART #0 device pci 1e.1 on end # UART #1 device pci 1e.2 off end # GSPI #0 -- cgit v1.2.3