AGESA fam15tn boards: Clean up devicetree
Remove double nesting of chip northbridge/amd. There is requirement to keep SPD address map in the same chip block with device 0:18.2. Change-Id: I67fcb59a63046865f660e628a61c2944b0f89a74 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/30734 Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: mikeb mikeb <mikebdp2@gmail.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki
parent
4ebdf34e13
commit
872b42486a
|
|
@ -22,9 +22,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
|
||||
device domain 0 on
|
||||
subsystemid 0x1022 0x1410 inherit
|
||||
chip northbridge/amd/agesa/family15tn # CPU side of HT root complex
|
||||
|
||||
chip northbridge/amd/agesa/family15tn # PCI side of HT root complex
|
||||
chip northbridge/amd/agesa/family15tn
|
||||
device pci 0.0 on end # Root Complex
|
||||
device pci 1.0 on end # Internal Graphics P2P bridge 0x99XX
|
||||
device pci 1.1 on end # Internal Multimedia
|
||||
|
|
@ -35,9 +33,9 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
device pci 6.0 on end # PCIE Slot1 x1
|
||||
device pci 7.0 on end # LAN
|
||||
device pci 8.0 off end # NB/SB Link P2P bridge
|
||||
end #chip northbridge/amd/agesa/family15tn # PCI side of HT root complex
|
||||
end #chip northbridge/amd/agesa/family15tn
|
||||
|
||||
chip southbridge/amd/agesa/hudson # it is under NB/SB Link, but on the same pci bus
|
||||
chip southbridge/amd/agesa/hudson
|
||||
device pci 10.0 on end # XHCI HC0
|
||||
device pci 10.1 on end # XHCI HC1
|
||||
device pci 11.0 on end # SATA
|
||||
|
|
@ -66,6 +64,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
device pci 15.3 off end # PCIe 3
|
||||
end #chip southbridge/amd/agesa/hudson
|
||||
|
||||
chip northbridge/amd/agesa/family15tn
|
||||
device pci 18.0 on end
|
||||
device pci 18.1 on end
|
||||
device pci 18.2 on end
|
||||
|
|
@ -78,7 +77,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
{ {0xA0, 0x00}, {0xA2, 0x00}, }, // 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/agesa/family15tn # CPU side of HT root complex
|
||||
end #domain
|
||||
end #chip northbridge/amd/agesa/family15tn/root_complex
|
||||
|
|
|
|||
|
|
@ -22,9 +22,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
|
||||
device domain 0 on
|
||||
subsystemid 0x1022 0x1410 inherit
|
||||
chip northbridge/amd/agesa/family15tn # CPU side of HT root complex
|
||||
|
||||
chip northbridge/amd/agesa/family15tn # PCI side of HT root complex
|
||||
chip northbridge/amd/agesa/family15tn
|
||||
device pci 0.0 on end # Root Complex
|
||||
device pci 1.0 on end # Internal Graphics P2P bridge 0x99XX
|
||||
device pci 1.1 on end # Internal Multimedia
|
||||
|
|
@ -35,9 +33,9 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
device pci 6.0 on end # PCIE MINI1
|
||||
device pci 7.0 off end
|
||||
device pci 8.0 off end # NB/SB Link P2P bridge
|
||||
end #chip northbridge/amd/agesa/family15tn # PCI side of HT root complex
|
||||
end #chip northbridge/amd/agesa/family15tn
|
||||
|
||||
chip southbridge/amd/agesa/hudson # it is under NB/SB Link, but on the same pci bus
|
||||
chip southbridge/amd/agesa/hudson
|
||||
device pci 10.0 on end # XHCI HC0
|
||||
device pci 10.1 on end # XHCI HC1
|
||||
device pci 11.0 on end # SATA
|
||||
|
|
@ -81,6 +79,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
device pci 15.3 off end # PCIe 3
|
||||
end #chip southbridge/amd/agesa/hudson
|
||||
|
||||
chip northbridge/amd/agesa/family15tn
|
||||
device pci 18.0 on end
|
||||
device pci 18.1 on end
|
||||
device pci 18.2 on end
|
||||
|
|
@ -93,7 +92,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
{ {0xA0, 0x00}, {0xA2, 0x00}, }, // 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/agesa/family15tn # CPU side of HT root complex
|
||||
end #domain
|
||||
end #chip northbridge/amd/agesa/family15tn/root_complex
|
||||
|
|
|
|||
|
|
@ -22,9 +22,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
|
||||
device domain 0 on
|
||||
subsystemid 0x1022 0x1410 inherit
|
||||
chip northbridge/amd/agesa/family15tn # CPU side of HT root complex
|
||||
|
||||
chip northbridge/amd/agesa/family15tn # PCI side of HT root complex
|
||||
chip northbridge/amd/agesa/family15tn
|
||||
device pci 0.0 on end # Root Complex
|
||||
device pci 0.2 on end # IOMMU
|
||||
device pci 1.0 on end # Internal Graphics P2P bridge 0x99XX
|
||||
|
|
@ -33,9 +31,9 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
device pci 4.0 on end # PCIE MINI0
|
||||
device pci 5.0 on end # PCIE MINI1
|
||||
device pci 8.0 off end # NB/SB Link P2P bridge
|
||||
end #chip northbridge/amd/agesa/family15tn # PCI side of HT root complex
|
||||
end #chip northbridge/amd/agesa/family15tn
|
||||
|
||||
chip southbridge/amd/agesa/hudson # it is under NB/SB Link, but on the same pci bus
|
||||
chip southbridge/amd/agesa/hudson
|
||||
device pci 10.0 on end # XHCI HC0
|
||||
device pci 11.0 on end # SATA
|
||||
device pci 12.0 on end # USB
|
||||
|
|
@ -67,6 +65,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
device pci 15.3 off end # PCIe 3
|
||||
end #chip southbridge/amd/agesa/hudson
|
||||
|
||||
chip northbridge/amd/agesa/family15tn
|
||||
device pci 18.0 on end
|
||||
device pci 18.1 on end
|
||||
device pci 18.2 on end
|
||||
|
|
@ -79,7 +78,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
{ {0xA0, 0x00}, {0xA2, 0x00}, }, // 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/agesa/family15tn # CPU side of HT root complex
|
||||
end #domain
|
||||
end #chip northbridge/amd/agesa/family15tn/root_complex
|
||||
|
|
|
|||
|
|
@ -22,9 +22,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
|
||||
device domain 0 on
|
||||
subsystemid 0x1022 0x1410 inherit
|
||||
chip northbridge/amd/agesa/family15tn # CPU side of HT root complex
|
||||
|
||||
chip northbridge/amd/agesa/family15tn # PCI side of HT root complex
|
||||
chip northbridge/amd/agesa/family15tn
|
||||
device pci 0.0 on end # Root Complex
|
||||
device pci 0.2 on end # IOMMU
|
||||
device pci 1.0 on end # Internal Graphics P2P bridge 0x99XX
|
||||
|
|
@ -37,9 +35,9 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
device pci 7.0 off end #
|
||||
device pci 8.0 off end # NB/SB Link P2P bridge ?
|
||||
device pci 9.0 off end #
|
||||
end #chip northbridge/amd/agesa/family15tn # PCI side of HT root complex
|
||||
end #chip northbridge/amd/agesa/family15tn
|
||||
|
||||
chip southbridge/amd/agesa/hudson # it is under NB/SB Link, but on the same pci bus
|
||||
chip southbridge/amd/agesa/hudson
|
||||
device pci 10.0 on end # FCH USB XHCI Controller HC0
|
||||
device pci 11.0 on end # FCH SATA Controller [AHCI mode]
|
||||
device pci 12.0 on end # FCH USB OHCI Controller
|
||||
|
|
@ -71,6 +69,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
device pci 15.3 off end # PCIe 3
|
||||
end #chip southbridge/amd/agesa/hudson
|
||||
|
||||
chip northbridge/amd/agesa/family15tn
|
||||
device pci 18.0 on end
|
||||
device pci 18.1 on end
|
||||
device pci 18.2 on end
|
||||
|
|
@ -83,7 +82,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
{ {0xA0, 0x00}, {0xA2, 0x00}, }, // 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/agesa/family15tn # CPU side of HT root complex
|
||||
end #domain
|
||||
end #chip northbridge/amd/agesa/family15tn/root_complex
|
||||
|
|
|
|||
|
|
@ -23,9 +23,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
|
||||
device domain 0 on
|
||||
subsystemid 0x1022 0x1410 inherit
|
||||
chip northbridge/amd/agesa/family15tn # CPU side of HT root complex
|
||||
|
||||
chip northbridge/amd/agesa/family15tn # PCI side of HT root complex
|
||||
chip northbridge/amd/agesa/family15tn
|
||||
device pci 0.0 on end # Root Complex
|
||||
device pci 0.2 on end # IOMMU
|
||||
device pci 1.0 on end # Internal Graphics P2P bridge 0x990e
|
||||
|
|
@ -37,9 +35,9 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
device pci 6.0 on end # PCIE x1 (2)
|
||||
device pci 7.0 off end # LAN
|
||||
device pci 8.0 off end # NB/SB Link P2P bridge
|
||||
end #chip northbridge/amd/agesa/family15tn # PCI side of HT root complex
|
||||
end #chip northbridge/amd/agesa/family15tn
|
||||
|
||||
chip southbridge/amd/agesa/hudson # it is under NB/SB Link, but on the same pci bus
|
||||
chip southbridge/amd/agesa/hudson
|
||||
device pci 10.0 on end # USB XHCI
|
||||
device pci 10.1 on end # USB XHCI
|
||||
device pci 11.0 on end # SATA
|
||||
|
|
@ -159,6 +157,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
|
||||
end #chip southbridge/amd/agesa/hudson
|
||||
|
||||
chip northbridge/amd/agesa/family15tn
|
||||
device pci 18.0 on end
|
||||
device pci 18.1 on end
|
||||
device pci 18.2 on end
|
||||
|
|
@ -171,7 +170,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
|
|||
{ {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/agesa/family15tn # CPU side of HT root complex
|
||||
end #domain
|
||||
end #chip northbridge/amd/agesa/family15tn/root_complex
|
||||
|
|
|
|||
Loading…
Reference in New Issue