binaryPI: Drop nested northbridge in devicetree
SPD data needs to remain within same chip -block with device 0:18.2. Change-Id: Ic12481b637ee5f5119faec3239b477f613e4e511 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/31271 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Michał Żygowski <michal.zygowski@3mdeb.com>
This commit is contained in:
parent
5edbea02d4
commit
4dba4975b4
|
@ -21,9 +21,8 @@ chip northbridge/amd/pi/00660F01/root_complex
|
|||
|
||||
device domain 0 on
|
||||
subsystemid 0x1022 0x1410 inherit
|
||||
chip northbridge/amd/pi/00660F01 # CPU side of HT root complex
|
||||
|
||||
chip northbridge/amd/pi/00660F01 # PCI side of HT root complex
|
||||
chip northbridge/amd/pi/00660F01
|
||||
device pci 0.0 on end # Root Complex
|
||||
device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
|
||||
device pci 1.1 on end # Internal Multimedia
|
||||
|
@ -37,7 +36,7 @@ chip northbridge/amd/pi/00660F01/root_complex
|
|||
device pci 3.1 on end # Edge Connector
|
||||
end #chip northbridge/amd/pi/00660F01
|
||||
|
||||
chip southbridge/amd/pi/hudson # it is under NB/SB Link, but on the same pci bus
|
||||
chip southbridge/amd/pi/hudson
|
||||
device pci 9.0 on end # HDA
|
||||
device pci 9.2 on end # HDA
|
||||
device pci 10.0 on end # USB
|
||||
|
@ -56,18 +55,20 @@ chip northbridge/amd/pi/00660F01/root_complex
|
|||
device pci 14.7 on end # SD
|
||||
end #chip southbridge/amd/pi/hudson
|
||||
|
||||
chip northbridge/amd/pi/00660F01
|
||||
device pci 18.0 on end
|
||||
device pci 18.1 on end
|
||||
device pci 18.2 on end
|
||||
device pci 18.3 on end
|
||||
device pci 18.4 on end
|
||||
device pci 18.5 on end
|
||||
|
||||
register "spdAddrLookup" = "
|
||||
{
|
||||
{ {0xA0, 0xA4}, {0xA2, 0xA6}, }, // socket 0 - Channel 0 & 1 - 8-bit SPD addresses
|
||||
{ {0x00, 0x00}, {0x00, 0x00}, }, // socket 1 - Channel 0 & 1 - 8-bit SPD addresses
|
||||
}"
|
||||
end
|
||||
|
||||
end #chip northbridge/amd/pi/00660F01 # CPU side of HT root complex
|
||||
end #domain
|
||||
end #northbridge/amd/pi/00660F01/root_complex
|
||||
|
|
|
@ -22,9 +22,8 @@ chip northbridge/amd/pi/00730F01/root_complex
|
|||
|
||||
device domain 0 on
|
||||
subsystemid 0x1022 0x1410 inherit
|
||||
chip northbridge/amd/pi/00730F01 # CPU side of HT root complex
|
||||
|
||||
chip northbridge/amd/pi/00730F01 # PCI side of HT root complex
|
||||
chip northbridge/amd/pi/00730F01
|
||||
device pci 0.0 on end # Root Complex
|
||||
device pci 0.2 off end # IOMMU
|
||||
device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
|
||||
|
@ -38,7 +37,7 @@ chip northbridge/amd/pi/00730F01/root_complex
|
|||
device pci 8.0 off end # Platform Security Processor
|
||||
end #chip northbridge/amd/pi/00730F01
|
||||
|
||||
chip southbridge/amd/pi/hudson # it is under NB/SB Link, but on the same pci bus
|
||||
chip southbridge/amd/pi/hudson
|
||||
device pci 10.0 on end # XHCI HC0
|
||||
device pci 11.0 on end # SATA
|
||||
device pci 12.0 on end # EHCI #0
|
||||
|
@ -58,6 +57,5 @@ chip northbridge/amd/pi/00730F01/root_complex
|
|||
device pci 18.4 on end
|
||||
device pci 18.5 on end
|
||||
|
||||
end #chip northbridge/amd/pi/00730F01 # CPU side of HT root complex
|
||||
end #domain
|
||||
end #northbridge/amd/pi/00730F01/root_complex
|
||||
|
|
|
@ -22,9 +22,8 @@ chip northbridge/amd/pi/00630F01/root_complex
|
|||
|
||||
device domain 0 on
|
||||
subsystemid 0x1022 0x1410 inherit
|
||||
chip northbridge/amd/pi/00630F01 # CPU side of HT root complex
|
||||
|
||||
chip northbridge/amd/pi/00630F01 # PCI side of HT root complex
|
||||
chip northbridge/amd/pi/00630F01
|
||||
device pci 0.0 on end # 0x1422 Root Complex
|
||||
device pci 0.2 off end # 0x1423 IOMMU
|
||||
device pci 1.0 on end # 0x13XX Internal Graphics
|
||||
|
@ -97,6 +96,7 @@ chip northbridge/amd/pi/00630F01/root_complex
|
|||
device pci 16.0 on end # 0x7809 USB OHCI (when the xHCI device is disabled)
|
||||
end #southbridge/amd/pi/hudson
|
||||
|
||||
chip northbridge/amd/pi/00630F01
|
||||
device pci 18.0 on end # 0x141A HT Configuration
|
||||
device pci 18.1 on end # 0x141B Address Maps
|
||||
device pci 18.2 on end # 0x141C DRAM Configuration
|
||||
|
@ -108,7 +108,7 @@ chip northbridge/amd/pi/00630F01/root_complex
|
|||
{
|
||||
{ {0xA0, 0xA4}, {0xA2, 0xA6}, }, // socket 0 - Channel 0 & 1 - 8-bit SPD addresses
|
||||
}"
|
||||
end
|
||||
|
||||
end #chip northbridge/amd/pi/00630F01 # CPU side of HT root complex
|
||||
end #domain
|
||||
end #northbridge/amd/pi/00630F01/root_complex
|
||||
|
|
|
@ -21,9 +21,8 @@ chip northbridge/amd/pi/00730F01/root_complex
|
|||
|
||||
device domain 0 on
|
||||
subsystemid 0x1022 0x1410 inherit
|
||||
chip northbridge/amd/pi/00730F01 # CPU side of HT root complex
|
||||
|
||||
chip northbridge/amd/pi/00730F01 # PCI side of HT root complex
|
||||
chip northbridge/amd/pi/00730F01
|
||||
device pci 0.0 on end # Root Complex
|
||||
device pci 0.2 off end # IOMMU
|
||||
device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
|
||||
|
@ -37,7 +36,7 @@ chip northbridge/amd/pi/00730F01/root_complex
|
|||
device pci 8.0 on end # Platform Security Processor
|
||||
end #chip northbridge/amd/pi/00730F01
|
||||
|
||||
chip southbridge/amd/pi/hudson # it is under NB/SB Link, but on the same pci bus
|
||||
chip southbridge/amd/pi/hudson
|
||||
device pci 10.0 on end # XHCI HC0
|
||||
device pci 11.0 on end # SATA
|
||||
device pci 12.0 on end # EHCI #0
|
||||
|
@ -56,17 +55,19 @@ chip northbridge/amd/pi/00730F01/root_complex
|
|||
device pci 16.0 on end # EHCI #2
|
||||
end #chip southbridge/amd/pi/hudson
|
||||
|
||||
chip northbridge/amd/pi/00730F01
|
||||
device pci 18.0 on end
|
||||
device pci 18.1 on end
|
||||
device pci 18.2 on end
|
||||
device pci 18.3 on end
|
||||
device pci 18.4 on end
|
||||
device pci 18.5 on end
|
||||
|
||||
register "spdAddrLookup" = "
|
||||
{
|
||||
{ {0xA0, 0xA2} }, // socket 0, channel 0, slots 0 & 1 - 8-bit SPD addresses
|
||||
}"
|
||||
end
|
||||
|
||||
end #chip northbridge/amd/pi/00730F01 # CPU side of HT root complex
|
||||
end #domain
|
||||
end #northbridge/amd/pi/00730F01/root_complex
|
||||
|
|
|
@ -21,9 +21,8 @@ chip northbridge/amd/pi/00730F01/root_complex
|
|||
|
||||
device domain 0 on
|
||||
subsystemid 0x1022 0x1410 inherit
|
||||
chip northbridge/amd/pi/00730F01 # CPU side of HT root complex
|
||||
|
||||
chip northbridge/amd/pi/00730F01 # PCI side of HT root complex
|
||||
chip northbridge/amd/pi/00730F01
|
||||
device pci 0.0 on end # Root Complex
|
||||
device pci 0.2 off end # IOMMU
|
||||
device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
|
||||
|
@ -36,7 +35,7 @@ chip northbridge/amd/pi/00730F01/root_complex
|
|||
device pci 8.0 on end # Platform Security Processor
|
||||
end #chip northbridge/amd/pi/00730F01
|
||||
|
||||
chip southbridge/amd/pi/hudson # it is under NB/SB Link, but on the same pci bus
|
||||
chip southbridge/amd/pi/hudson
|
||||
device pci 10.0 on end # XHCI HC0
|
||||
device pci 11.0 on end # SATA
|
||||
device pci 12.0 on end # EHCI #0
|
||||
|
@ -111,6 +110,5 @@ chip northbridge/amd/pi/00730F01/root_complex
|
|||
device pci 18.4 on end
|
||||
device pci 18.5 on end
|
||||
|
||||
end #chip northbridge/amd/pi/00730F01 # CPU side of HT root complex
|
||||
end #domain
|
||||
end #northbridge/amd/pi/00730F01/root_complex
|
||||
|
|
|
@ -21,9 +21,8 @@ chip northbridge/amd/pi/00730F01/root_complex
|
|||
|
||||
device domain 0 on
|
||||
subsystemid 0x1022 0x1410 inherit
|
||||
chip northbridge/amd/pi/00730F01 # CPU side of HT root complex
|
||||
|
||||
chip northbridge/amd/pi/00730F01 # PCI side of HT root complex
|
||||
chip northbridge/amd/pi/00730F01
|
||||
device pci 0.0 on end # Root Complex
|
||||
device pci 0.2 on end # IOMMU
|
||||
device pci 1.0 off end # Internal Graphics P2P bridge 0x9804
|
||||
|
@ -37,7 +36,7 @@ chip northbridge/amd/pi/00730F01/root_complex
|
|||
device pci 8.0 on end # Platform Security Processor
|
||||
end #chip northbridge/amd/pi/00730F01
|
||||
|
||||
chip southbridge/amd/pi/hudson # it is under NB/SB Link, but on the same pci bus
|
||||
chip southbridge/amd/pi/hudson
|
||||
device pci 10.0 on end # XHCI HC0 muxed with EHCI 2
|
||||
device pci 11.0 on end # SATA
|
||||
device pci 12.0 off end # USB EHCI0 usb[0:3] not connected
|
||||
|
@ -89,6 +88,5 @@ chip northbridge/amd/pi/00730F01/root_complex
|
|||
device pci 18.4 on end
|
||||
device pci 18.5 on end
|
||||
|
||||
end #chip northbridge/amd/pi/00730F01 # CPU side of HT root complex
|
||||
end #domain
|
||||
end #northbridge/amd/pi/00730F01/root_complex
|
||||
|
|
|
@ -21,9 +21,8 @@ chip northbridge/amd/pi/00730F01/root_complex
|
|||
|
||||
device domain 0 on
|
||||
subsystemid 0x1022 0x1410 inherit
|
||||
chip northbridge/amd/pi/00730F01 # CPU side of HT root complex
|
||||
|
||||
chip northbridge/amd/pi/00730F01 # PCI side of HT root complex
|
||||
chip northbridge/amd/pi/00730F01
|
||||
device pci 0.0 on end # Root Complex
|
||||
device pci 0.2 on end # IOMMU
|
||||
device pci 1.0 off end # Internal Graphics P2P bridge 0x9804
|
||||
|
@ -86,6 +85,5 @@ chip northbridge/amd/pi/00730F01/root_complex
|
|||
device pci 18.4 on end
|
||||
device pci 18.5 on end
|
||||
|
||||
end #chip northbridge/amd/pi/00730F01 # CPU side of HT root complex
|
||||
end #domain
|
||||
end #northbridge/amd/pi/00730F01/root_complex
|
||||
|
|
|
@ -21,9 +21,8 @@ chip northbridge/amd/pi/00730F01/root_complex
|
|||
|
||||
device domain 0 on
|
||||
subsystemid 0x1022 0x1410 inherit
|
||||
chip northbridge/amd/pi/00730F01 # CPU side of HT root complex
|
||||
|
||||
chip northbridge/amd/pi/00730F01 # PCI side of HT root complex
|
||||
chip northbridge/amd/pi/00730F01
|
||||
device pci 0.0 on end # Root Complex
|
||||
device pci 0.2 on end # IOMMU
|
||||
device pci 1.0 off end # Internal Graphics P2P bridge 0x9804
|
||||
|
@ -37,7 +36,7 @@ chip northbridge/amd/pi/00730F01/root_complex
|
|||
device pci 8.0 on end # Platform Security Processor
|
||||
end #chip northbridge/amd/pi/00730F01
|
||||
|
||||
chip southbridge/amd/pi/hudson # it is under NB/SB Link, but on the same pci bus
|
||||
chip southbridge/amd/pi/hudson
|
||||
device pci 10.0 on end # XHCI HC0 muxed with EHCI 2
|
||||
device pci 11.0 on end # SATA
|
||||
device pci 12.0 on end # USB EHCI0 usb[0:3] is connected
|
||||
|
@ -86,6 +85,5 @@ chip northbridge/amd/pi/00730F01/root_complex
|
|||
device pci 18.4 on end
|
||||
device pci 18.5 on end
|
||||
|
||||
end #chip northbridge/amd/pi/00730F01 # CPU side of HT root complex
|
||||
end #domain
|
||||
end #northbridge/amd/pi/00730F01/root_complex
|
||||
|
|
|
@ -21,7 +21,6 @@ chip northbridge/amd/pi/00730F01/root_complex
|
|||
|
||||
device domain 0 on
|
||||
subsystemid 0x1022 0x1410 inherit
|
||||
chip northbridge/amd/pi/00730F01 # CPU side of HT root complex
|
||||
|
||||
chip northbridge/amd/pi/00730F01 # PCI side of HT root complex
|
||||
device pci 0.0 on end # Root Complex
|
||||
|
@ -88,6 +87,5 @@ chip northbridge/amd/pi/00730F01/root_complex
|
|||
device pci 18.4 on end
|
||||
device pci 18.5 on end
|
||||
|
||||
end #chip northbridge/amd/pi/00730F01 # CPU side of HT root complex
|
||||
end #domain
|
||||
end #northbridge/amd/pi/00730F01/root_complex
|
||||
|
|
Loading…
Reference in New Issue