Felix Singer submitted this change.
mb/asus/h61-series: Convert remaining PCI numbers into reference names
Change-Id: I8008fcc994e49c1626fd366c74661fcceb21a323
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79969
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <patrick.rudolph@9elements.com>
---
M src/mainboard/asus/h61-series/variants/h61m-cs/overridetree.cb
M src/mainboard/asus/h61-series/variants/p8h61-m_lx/overridetree.cb
M src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/overridetree.cb
M src/mainboard/asus/h61-series/variants/p8h61-m_pro/overridetree.cb
M src/mainboard/asus/h61-series/variants/p8h61-m_pro_cm6630/overridetree.cb
5 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/src/mainboard/asus/h61-series/variants/h61m-cs/overridetree.cb b/src/mainboard/asus/h61-series/variants/h61m-cs/overridetree.cb
index cb30fc3..066136cb 100644
--- a/src/mainboard/asus/h61-series/variants/h61m-cs/overridetree.cb
+++ b/src/mainboard/asus/h61-series/variants/h61m-cs/overridetree.cb
@@ -5,21 +5,21 @@
subsystemid 0x1043 0x844d inherit
chip southbridge/intel/bd82x6x
register "gen1_dec" = "0x000c0291"
- device pci 1b.0 on # High Definition Audio controller
+ device ref hda on # High Definition Audio controller
subsystemid 0x1043 0x8445
end
- device pci 1c.0 off end # PCIe Port #1
- device pci 1c.1 off end # PCIe Port #2
- device pci 1c.2 off end # PCIe Port #3
- device pci 1c.3 on end # PCIe x1 Slot 1 PCIE_1
- device pci 1c.4 on end # PCIe x1 Slot 2 PCIE_2
- device pci 1c.5 on # Realtek Gigabit NIC
+ device ref pcie_rp1 off end # PCIe Port #1
+ device ref pcie_rp2 off end # PCIe Port #2
+ device ref pcie_rp3 off end # PCIe Port #3
+ device ref pcie_rp4 on end # PCIe x1 Slot 1 PCIE_1
+ device ref pcie_rp5 on end # PCIe x1 Slot 2 PCIE_2
+ device ref pcie_rp6 on # Realtek Gigabit NIC
device pci 00.0 on end
end
- device pci 1c.6 off end # PCIe Port #7
- device pci 1c.7 off end # PCIe Port #8
+ device ref pcie_rp7 off end # PCIe Port #7
+ device ref pcie_rp8 off end # PCIe Port #8
- device pci 1f.0 on # LPC bridge PCI-LPC bridge
+ device ref lpc on # LPC bridge PCI-LPC bridge
chip superio/nuvoton/nct6779d
device pnp 2e.1 off end # Parallel
device pnp 2e.2 off end # UART A
diff --git a/src/mainboard/asus/h61-series/variants/p8h61-m_lx/overridetree.cb b/src/mainboard/asus/h61-series/variants/p8h61-m_lx/overridetree.cb
index aa9f8c8..c4ff6b0 100644
--- a/src/mainboard/asus/h61-series/variants/p8h61-m_lx/overridetree.cb
+++ b/src/mainboard/asus/h61-series/variants/p8h61-m_lx/overridetree.cb
@@ -6,25 +6,25 @@
chip southbridge/intel/bd82x6x
register "gen1_dec" = "0x00000295" # Super I/O HWM
- device pci 1b.0 on # HD audio controller
+ device ref hda on # HD audio controller
subsystemid 0x1043 0x8445
end
- device pci 1c.0 on end # PCIe 1x slot (PCIEX1_1)
- device pci 1c.1 on end # PCIe 1x slot (PCIEX1_2)
- device pci 1c.2 on # Realtek Gigabit Ethernet
+ device ref pcie_rp1 on end # PCIe 1x slot (PCIEX1_1)
+ device ref pcie_rp2 on end # PCIe 1x slot (PCIEX1_2)
+ device ref pcie_rp3 on # Realtek Gigabit Ethernet
subsystemid 0x1043 0x8432
chip drivers/net
register "customized_leds" = "0x00f6"
device pci 00.0 on end
end
end
- device pci 1c.3 off end # Unused PCIe port
- device pci 1c.4 on end # PCIe 1x slot (PCIEX1_3)
- device pci 1c.5 off end # Unused PCIe port
- device pci 1c.6 off end # Unused PCIe port
- device pci 1c.7 off end # Unused PCIe port
+ device ref pcie_rp4 off end # Unused PCIe port
+ device ref pcie_rp5 on end # PCIe 1x slot (PCIEX1_3)
+ device ref pcie_rp6 off end # Unused PCIe port
+ device ref pcie_rp7 off end # Unused PCIe port
+ device ref pcie_rp8 off end # Unused PCIe port
- device pci 1f.0 on # LPC bridge
+ device ref lpc on # LPC bridge
chip superio/nuvoton/nct6776
device pnp 2e.0 off end # Floppy
device pnp 2e.1 on # Parallel
diff --git a/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/overridetree.cb b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/overridetree.cb
index 5d9635c..fc3313e 100644
--- a/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/overridetree.cb
+++ b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/overridetree.cb
@@ -6,16 +6,16 @@
chip southbridge/intel/bd82x6x
register "gen1_dec" = "0x000c0291"
- device pci 1c.0 on end # RP #1
- device pci 1c.1 off end # RP #2
- device pci 1c.2 off end # RP #3
- device pci 1c.3 on end # RP #4: PCIEX1_1
- device pci 1c.4 on end # RP #5: PCIEX1_2
- device pci 1c.5 on end # RP #6: RTL8111 GbE NIC
- device pci 1c.6 off end # RP #7
- device pci 1c.7 off end # RP #8
+ device ref pcie_rp1 on end # RP #1
+ device ref pcie_rp2 off end # RP #2
+ device ref pcie_rp3 off end # RP #3
+ device ref pcie_rp4 on end # RP #4: PCIEX1_1
+ device ref pcie_rp5 on end # RP #5: PCIEX1_2
+ device ref pcie_rp6 on end # RP #6: RTL8111 GbE NIC
+ device ref pcie_rp7 off end # RP #7
+ device ref pcie_rp8 off end # RP #8
- device pci 1f.0 on # LPC bridge
+ device ref lpc on # LPC bridge
chip superio/nuvoton/nct6779d
device pnp 2e.1 off end # Parallel
device pnp 2e.2 off end # UART A
diff --git a/src/mainboard/asus/h61-series/variants/p8h61-m_pro/overridetree.cb b/src/mainboard/asus/h61-series/variants/p8h61-m_pro/overridetree.cb
index d726131..026bd81 100644
--- a/src/mainboard/asus/h61-series/variants/p8h61-m_pro/overridetree.cb
+++ b/src/mainboard/asus/h61-series/variants/p8h61-m_pro/overridetree.cb
@@ -5,22 +5,22 @@
chip southbridge/intel/bd82x6x
register "gen1_dec" = "0x000c0291" # HWM
- device pci 1c.0 on end # PCIe x1 Port (PCIEX1_1)
- device pci 1c.1 on end # PCIe x1 Port (PCIEX1_2)
- device pci 1c.2 on # Realtek RTL8111E Ethernet Controller
+ device ref pcie_rp1 on end # PCIe x1 Port (PCIEX1_1)
+ device ref pcie_rp2 on end # PCIe x1 Port (PCIEX1_2)
+ device ref pcie_rp3 on # Realtek RTL8111E Ethernet Controller
chip drivers/net
register "customized_leds" = "0x00f6"
register "wake" = "9"
device pci 00.0 on end
end
end
- device pci 1c.3 on end # ASMedia ASM1042 USB3 Controller
- device pci 1c.4 on end # PCIe x1 Port, x16 size (PCIEX16_2)
- device pci 1c.5 on end # ASMedia ASM1062 SATA Controller
- device pci 1c.6 off end # Unused PCIe Port
- device pci 1c.7 off end # Unused PCIe Port
+ device ref pcie_rp4 on end # ASMedia ASM1042 USB3 Controller
+ device ref pcie_rp5 on end # PCIe x1 Port, x16 size (PCIEX16_2)
+ device ref pcie_rp6 on end # ASMedia ASM1062 SATA Controller
+ device ref pcie_rp7 off end # Unused PCIe Port
+ device ref pcie_rp8 off end # Unused PCIe Port
- device pci 1f.0 on # LPC bridge
+ device ref lpc on # LPC bridge
chip superio/nuvoton/nct6776
device pnp 2e.0 off end # Floppy
device pnp 2e.1 on # Parallel port
diff --git a/src/mainboard/asus/h61-series/variants/p8h61-m_pro_cm6630/overridetree.cb b/src/mainboard/asus/h61-series/variants/p8h61-m_pro_cm6630/overridetree.cb
index 1b78b9b..9db03fc 100644
--- a/src/mainboard/asus/h61-series/variants/p8h61-m_pro_cm6630/overridetree.cb
+++ b/src/mainboard/asus/h61-series/variants/p8h61-m_pro_cm6630/overridetree.cb
@@ -6,22 +6,22 @@
chip southbridge/intel/bd82x6x
register "gen1_dec" = "0x000c0291" # HWM
- device pci 1c.0 on end # PCIe x1 Port (PCIEX1_1)
- device pci 1c.1 on end # PCIe x1 Port (PCIEX1_2)
- device pci 1c.2 on # Realtek RTL8111E Ethernet Controller
+ device ref pcie_rp1 on end # PCIe x1 Port (PCIEX1_1)
+ device ref pcie_rp2 on end # PCIe x1 Port (PCIEX1_2)
+ device ref pcie_rp3 on # Realtek RTL8111E Ethernet Controller
chip drivers/net
register "customized_leds" = "0x00f6"
register "wake" = "9"
device pci 00.0 on end
end
end
- device pci 1c.3 on end # ASMedia ASM1042 USB3 Controller
- device pci 1c.4 on end # RP #6: ASM1083 PCI Bridge
- device pci 1c.5 on end # ASMedia ASM1062 SATA Controller
- device pci 1c.6 off end # Unused PCIe Port
- device pci 1c.7 off end # Unused PCIe Port
+ device ref pcie_rp4 on end # ASMedia ASM1042 USB3 Controller
+ device ref pcie_rp5 on end # RP #6: ASM1083 PCI Bridge
+ device ref pcie_rp6 on end # ASMedia ASM1062 SATA Controller
+ device ref pcie_rp7 off end # Unused PCIe Port
+ device ref pcie_rp8 off end # Unused PCIe Port
- device pci 1f.0 on # LPC bridge
+ device ref lpc on # LPC bridge
chip superio/nuvoton/nct6776
device pnp 2e.0 off end # Floppy
device pnp 2e.1 on # Parallel port
To view, visit change 79969. To unsubscribe, or for help writing mail filters, visit settings.