Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/79967?usp=email )
Change subject: mb/asus/p8x7x-series: Use chipset dt reference names ......................................................................
mb/asus/p8x7x-series: Use chipset dt reference names
Use the references from the chipset devicetree as this makes the comments superfluous.
Change-Id: I50250fcf4105f39e55e8837613880bfe5c69deef Signed-off-by: Felix Singer felixsinger@posteo.net Reviewed-on: https://review.coreboot.org/c/coreboot/+/79967 Reviewed-by: Patrick Rudolph patrick.rudolph@9elements.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/asus/p8x7x-series/devicetree.cb M src/mainboard/asus/p8x7x-series/variants/p8c_ws/overridetree.cb M src/mainboard/asus/p8x7x-series/variants/p8h77-v/overridetree.cb M src/mainboard/asus/p8x7x-series/variants/p8z77-m/overridetree.cb M src/mainboard/asus/p8x7x-series/variants/p8z77-m_pro/overridetree.cb M src/mainboard/asus/p8x7x-series/variants/p8z77-v/overridetree.cb M src/mainboard/asus/p8x7x-series/variants/p8z77-v_lx2/overridetree.cb 7 files changed, 83 insertions(+), 84 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Rudolph: Looks good to me, approved
diff --git a/src/mainboard/asus/p8x7x-series/devicetree.cb b/src/mainboard/asus/p8x7x-series/devicetree.cb index cd4336f..192b4bd 100644 --- a/src/mainboard/asus/p8x7x-series/devicetree.cb +++ b/src/mainboard/asus/p8x7x-series/devicetree.cb @@ -21,9 +21,9 @@ # from runtime code)
device domain 0 on - device ref host_bridge on end # Host bridge - device ref peg10 on end # PCIEX16_1 - device ref igd on end # iGPU + device ref host_bridge on end + device ref peg10 on end # PCIEX16_1 + device ref igd on end
chip southbridge/intel/bd82x6x register "sata_interface_speed_support" = "0x3" @@ -34,32 +34,31 @@ register "xhci_overcurrent_mapping" = "0x00000c03" register "xhci_switchable_ports" = "0x0000000f"
- device ref xhci on end # xHCI - device ref mei1 on end # MEI #1 - device ref mei2 off end # MEI #2 - device ref me_ide_r off end # ME IDE-R - device ref me_kt off end # ME KT - device ref gbe off end # Intel GbE - device ref ehci2 on end # EHCI #2 - device ref hda on end # HD Audio + device ref xhci on end + device ref mei1 on end + device ref mei2 off end + device ref me_ide_r off end + device ref me_kt off end + device ref gbe off end + device ref ehci2 on end + device ref hda on end
- device ref pcie_rp1 off end # RP #1 - device ref pcie_rp2 off end # RP #2 - device ref pcie_rp3 off end # RP #3 - device ref pcie_rp4 off end # RP #4 - device ref pcie_rp5 off end # RP #5 - device ref pcie_rp6 off end # RP #6 - device ref pcie_rp7 off end # RP #7 - device ref pcie_rp8 off end # RP #8 + device ref pcie_rp1 off 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 ehci1 on end # EHCI #1 - device ref pci_bridge off end # PCI bridge - device ref lpc on # LPC bridge - end - device ref sata1 on end # SATA (AHCI) - device ref smbus on end # SMBus - device ref sata2 off end # SATA (Legacy) - device ref thermal off end # Thermal + device ref ehci1 on end + device ref pci_bridge off end + device ref lpc on end + device ref sata1 on end # SATA (AHCI) + device ref smbus on end + device ref sata2 off end # SATA (Legacy) + device ref thermal off end end end end diff --git a/src/mainboard/asus/p8x7x-series/variants/p8c_ws/overridetree.cb b/src/mainboard/asus/p8x7x-series/variants/p8c_ws/overridetree.cb index 4de539b..4b7bb1c 100644 --- a/src/mainboard/asus/p8x7x-series/variants/p8c_ws/overridetree.cb +++ b/src/mainboard/asus/p8x7x-series/variants/p8c_ws/overridetree.cb @@ -2,21 +2,21 @@
chip northbridge/intel/sandybridge device domain 0 on - device pci 01.1 on end # PCIEX16_2 (electrical x8) - device pci 06.0 on end # PCIEX16_3 (electrical x4) + device ref peg11 on end # PCIEX16_2 (electrical x8) + device ref peg60 on end # PCIEX16_3 (electrical x4) subsystemid 0x1043 0x84ca inherit chip southbridge/intel/bd82x6x register "gen1_dec" = "0x000c0291" - device pci 1c.0 on end # RP #1: PCIEX16_4 (electrical x4) - device pci 1c.1 off end # RP #2: - device pci 1c.2 off end # RP #3: - device pci 1c.3 off end # RP #4: - device pci 1c.4 on end # RP #5: PCIEX1_1 - device pci 1c.5 on end # RP #6: 82574 GbE #1 - device pci 1c.6 on end # RP #7: 82574 GbE #2 - device pci 1c.7 off end # RP #8: - device pci 1e.0 on end # PCI bridge - device pci 1f.0 on # LPC bridge + device ref pcie_rp1 on end # PCIEX16_4 (electrical x4) + device ref pcie_rp2 off end + device ref pcie_rp3 off end + device ref pcie_rp4 off end + device ref pcie_rp5 on end # PCIEX1_1 + device ref pcie_rp6 on end # 82574 GbE #1 + device ref pcie_rp7 on end # 82574 GbE #2 + device ref pcie_rp8 off end + device ref pci_bridge on end + device ref lpc on chip superio/nuvoton/nct6776 device pnp 2e.0 off end # Floppy device pnp 2e.1 on # Parallel diff --git a/src/mainboard/asus/p8x7x-series/variants/p8h77-v/overridetree.cb b/src/mainboard/asus/p8x7x-series/variants/p8h77-v/overridetree.cb index f20b49c..dbf1f35 100644 --- a/src/mainboard/asus/p8x7x-series/variants/p8h77-v/overridetree.cb +++ b/src/mainboard/asus/p8x7x-series/variants/p8h77-v/overridetree.cb @@ -5,16 +5,16 @@ subsystemid 0x1043 0x84ca inherit chip southbridge/intel/bd82x6x register "gen1_dec" = "0x000c0291" - device pci 1c.0 on end # RP #1: PCIEX16_2 (electrical x4) - device pci 1c.1 off end # RP #2: - device pci 1c.2 off end # RP #3: - device pci 1c.3 off end # RP #4: - device pci 1c.4 on end # RP #5: AR8161 GbE NIC - device pci 1c.5 on end # RP #6: ASM1083 PCI Bridge - device pci 1c.6 on end # RP #7: PCIEX1_1 - device pci 1c.7 on end # RP #8: PCIEX1_2 + device ref pcie_rp1 on end # PCIEX16_2 (electrical x4) + device ref pcie_rp2 off end + device ref pcie_rp3 off end + device ref pcie_rp4 off end + device ref pcie_rp5 on end # AR8161 GbE NIC + device ref pcie_rp6 on end # ASM1083 PCI Bridge + device ref pcie_rp7 on end # PCIEX1_1 + device ref pcie_rp8 on end # PCIEX1_2
- device pci 1f.0 on # LPC bridge + device ref lpc on chip superio/nuvoton/nct6779d device pnp 2e.1 off end # Parallel device pnp 2e.2 on # UART A diff --git a/src/mainboard/asus/p8x7x-series/variants/p8z77-m/overridetree.cb b/src/mainboard/asus/p8x7x-series/variants/p8z77-m/overridetree.cb index c9fd784..5d688fd 100644 --- a/src/mainboard/asus/p8x7x-series/variants/p8z77-m/overridetree.cb +++ b/src/mainboard/asus/p8x7x-series/variants/p8z77-m/overridetree.cb @@ -11,18 +11,18 @@ chip southbridge/intel/bd82x6x # Intel Series 7 Panther Point PCH register "gen1_dec" = "0x000c0291"
- device pci 1c.0 on end # PCIe Port #1 (PCIe x4 slot) - device pci 1c.1 off end # PCIe Port #2 - device pci 1c.2 off end # PCIe Port #3 - device pci 1c.3 off end # PCIe Port #4 - device pci 1c.4 on end # PCIe Port #5 (PCIe x1 slot) - device pci 1c.5 on # PCIe Port #6 (RTL8111F GbE NIC) + device ref pcie_rp1 on end # PCIe x4 slot + device ref pcie_rp2 off end + device ref pcie_rp3 off end + device ref pcie_rp4 off end + device ref pcie_rp5 on end # PCIe x1 slot + device ref pcie_rp6 on # RTL8111F GbE NIC subsystemid 0x1849 0x1e1a device pci 00.0 on end # make onboard end - device pci 1c.6 on end # PCIe Port #7 (PCI slot via ASM1083) - device pci 1c.7 off end # PCIe Port #8 - device pci 1f.0 on # LPC bridge + device ref pcie_rp7 on end # PCI slot via ASM1083 + device ref pcie_rp8 off end + device ref lpc on chip superio/nuvoton/nct6779d device pnp 2e.1 off end # Parallel device pnp 2e.2 on # UART A diff --git a/src/mainboard/asus/p8x7x-series/variants/p8z77-m_pro/overridetree.cb b/src/mainboard/asus/p8x7x-series/variants/p8z77-m_pro/overridetree.cb index d7aea49..da34af3 100644 --- a/src/mainboard/asus/p8x7x-series/variants/p8z77-m_pro/overridetree.cb +++ b/src/mainboard/asus/p8x7x-series/variants/p8z77-m_pro/overridetree.cb @@ -13,16 +13,16 @@ register "gen4_dec" = "0x0000ff29" register "pcie_port_coalesce" = "true"
- device pci 1c.0 on end # PCIe Port 1 PCIEX_16_3 - device pci 1c.1 on end # PCIe Port 2 RTL8111F - device pci 1c.2 off end # PCIe Port 3 unused - device pci 1c.3 off end # PCIe Port 4 unused - device pci 1c.4 off end # PCIe Port 5 unused - device pci 1c.5 on end # PCIe Port 6 ASM1042 USB3 - device pci 1c.6 on end # PCIe Port 7 ASM1061 eSATA - device pci 1c.7 off end # PCIe Port 8 unused + device ref pcie_rp1 on end # PCIEX_16_3 + device ref pcie_rp2 on end # RTL8111F + device ref pcie_rp3 off end + device ref pcie_rp4 off end + device ref pcie_rp5 off end + device ref pcie_rp6 on end # ASM1042 USB3 + device ref pcie_rp7 on end # ASM1061 eSATA + device ref pcie_rp8 off end
- device pci 1f.0 on # LPC bridge + device ref lpc on 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/p8x7x-series/variants/p8z77-v/overridetree.cb b/src/mainboard/asus/p8x7x-series/variants/p8z77-v/overridetree.cb index 77484c7..043be06 100644 --- a/src/mainboard/asus/p8x7x-series/variants/p8z77-v/overridetree.cb +++ b/src/mainboard/asus/p8x7x-series/variants/p8z77-v/overridetree.cb @@ -3,19 +3,19 @@ chip northbridge/intel/sandybridge device domain 0 on subsystemid 0x1043 0x84ca inherit - device pci 01.1 on end # PCIEX_16_2 + device ref peg11 on end # PCIEX_16_2 chip southbridge/intel/bd82x6x register "gen1_dec" = "0x000c0291"
- device pci 19.0 on end # Intel Gigabit Ethernet - device pci 1c.0 on end # PCIe Port 1 PCIEX_16_3 (electrical x1 or x4) - device pci 1c.1 on end # PCIe Port 2 PCIEX_1_1 - device pci 1c.3 on end # PCIe Port 4 ASM1061 SATA or PCIEX_1_2 - device pci 1c.4 on end # PCIe Port 5 ASM1083 PCI Bridge - device pci 1c.6 on end # PCIe Port 7 Wi-Fi Go! - device pci 1c.7 on end # PCIe Port 8 ASM1042 USB3 + device ref gbe on end + device ref pcie_rp1 on end # PCIEX_16_3 (electrical x1 or x4) + device ref pcie_rp2 on end # PCIEX_1_1 + device ref pcie_rp4 on end # ASM1061 SATA or PCIEX_1_2 + device ref pcie_rp5 on end # ASM1083 PCI Bridge + device ref pcie_rp7 on end # Wi-Fi Go! + device ref pcie_rp8 on end # ASM1042 USB3
- device pci 1f.0 on # LPC bridge + device ref lpc on chip superio/nuvoton/nct6779d device pnp 2e.1 off end # Parallel device pnp 2e.2 on # UART A diff --git a/src/mainboard/asus/p8x7x-series/variants/p8z77-v_lx2/overridetree.cb b/src/mainboard/asus/p8x7x-series/variants/p8z77-v_lx2/overridetree.cb index 6be23fa..0ae41b3 100644 --- a/src/mainboard/asus/p8x7x-series/variants/p8z77-v_lx2/overridetree.cb +++ b/src/mainboard/asus/p8x7x-series/variants/p8z77-v_lx2/overridetree.cb @@ -6,16 +6,16 @@ chip southbridge/intel/bd82x6x register "gen1_dec" = "0x000c0291"
- device pci 1c.0 on end # RP #1: PCIEX16_2 (electrical x4) - device pci 1c.1 off end # RP #2: - device pci 1c.2 off end # RP #3: - device pci 1c.3 off end # RP #4: - device pci 1c.4 on end # RP #5: RTL8111 GbE NIC - device pci 1c.5 on end # RP #6: ASM1083 PCI Bridge - device pci 1c.6 on end # RP #7: PCIEX1_1 - device pci 1c.7 on end # RP #8: PCIEX1_2 + device ref pcie_rp1 on end # PCIEX16_2 (electrical x4) + device ref pcie_rp2 off end + device ref pcie_rp3 off end + device ref pcie_rp4 off end + device ref pcie_rp5 on end # RTL8111 GbE NIC + device ref pcie_rp6 on end # ASM1083 PCI Bridge + device ref pcie_rp7 on end # PCIEX1_1 + device ref pcie_rp8 on end # PCIEX1_2
- device pci 1f.0 on # LPC bridge + device ref lpc on chip superio/nuvoton/nct6779d device pnp 2e.1 off end # Parallel device pnp 2e.2 on # UART A
-
Felix Singer (Code Review)