From 760970fb38157fc9023a3d71efaa8585bbdc9d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Tue, 8 Jan 2019 09:32:44 +0200 Subject: AGESA fam16kb boards: Clean up devicetree MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Id3a161c54341d0c5c569ea6118ee6f890b7f62e6 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/30735 Reviewed-by: HAOUAS Elyes Reviewed-by: Angel Pons Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) --- src/mainboard/asus/am1i-a/devicetree.cb | 134 ++++++++++++++++---------------- 1 file changed, 67 insertions(+), 67 deletions(-) (limited to 'src/mainboard/asus/am1i-a') diff --git a/src/mainboard/asus/am1i-a/devicetree.cb b/src/mainboard/asus/am1i-a/devicetree.cb index 3aeb5c729d..53114c17ea 100644 --- a/src/mainboard/asus/am1i-a/devicetree.cb +++ b/src/mainboard/asus/am1i-a/devicetree.cb @@ -23,77 +23,77 @@ chip northbridge/amd/agesa/family16kb/root_complex device domain 0 on subsystemid 0x1043 0x8623 inherit - chip northbridge/amd/agesa/family16kb # CPU side of HT root complex - chip northbridge/amd/agesa/family16kb # PCI side of HT root complex - 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 - device pci 2.0 on end # Host Bridge - device pci 2.1 on end # x4 PCIe slot - device pci 2.2 off end # GPP Bridge 1 - not used - device pci 2.3 off end # GPP Bridge 2 - not used - device pci 2.4 off end # GPP Bridge 3 - not used - device pci 2.5 on end # Realtek GBE - end #chip northbridge/amd/agesa/family16kb + chip northbridge/amd/agesa/family16kb + 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 + device pci 2.0 on end # Host Bridge + device pci 2.1 on end # x4 PCIe slot + device pci 2.2 off end # GPP Bridge 1 - not used + device pci 2.3 off end # GPP Bridge 2 - not used + device pci 2.4 off end # GPP Bridge 3 - not used + device pci 2.5 on end # Realtek GBE + end #chip northbridge/amd/agesa/family16kb - chip southbridge/amd/agesa/hudson # it is under NB/SB Link, but on the same pci bus - device pci 10.0 on end # XHCI HC0 - device pci 11.0 on end # SATA - device pci 12.0 on end # USB - device pci 12.2 on end # USB - device pci 13.0 on end # USB - device pci 13.2 on end # USB - device pci 14.0 on # SM - chip drivers/generic/generic #dimm 0-0-0 - device i2c 50 on end + chip southbridge/amd/agesa/hudson # it is under NB/SB Link, but on the same pci bus + device pci 10.0 on end # XHCI HC0 + device pci 11.0 on end # SATA + device pci 12.0 on end # USB + device pci 12.2 on end # USB + device pci 13.0 on end # USB + device pci 13.2 on end # USB + device pci 14.0 on # SM + chip drivers/generic/generic #dimm 0-0-0 + device i2c 50 on end + end + chip drivers/generic/generic #dimm 0-0-1 + device i2c 51 on end + end + end # SM + device pci 14.2 on end # HDA 0x4383 + device pci 14.3 on # LPC 0x439d + chip superio/ite/it8623e + device pnp 2e.0 off end # FDC - not used + device pnp 2e.1 on # COM1 + io 0x60 = 0x3f8 + irq 0x70 = 4 end - chip drivers/generic/generic #dimm 0-0-1 - device i2c 51 on end + device pnp 2e.2 on # COM2 + io 0x60 = 0x2f8 + irq 0x70 = 3 end - end # SM - device pci 14.2 on end # HDA 0x4383 - device pci 14.3 on # LPC 0x439d - chip superio/ite/it8623e - device pnp 2e.0 off end # FDC - not used - device pnp 2e.1 on # COM1 - io 0x60 = 0x3f8 - irq 0x70 = 4 - end - device pnp 2e.2 on # COM2 - io 0x60 = 0x2f8 - irq 0x70 = 3 - end - device pnp 2e.3 on # Parallel port - io 0x60 = 0x378 - io 0x62 = 0x778 # for ECP mode - irq 0x70 = 5 - drq 0x74 = 3 - end - device pnp 2e.4 on # EC - io 0x60 = 0x290 - io 0x62 = 0x230 - end - device pnp 2e.5 on # PS/2 keyboard - io 0x60 = 0x60 - io 0x62 = 0x64 - irq 0x70 = 1 - end - device pnp 2e.6 on # PS/2 mouse - irq 0x70 = 12 - end - device pnp 2e.7 on # GPIO - io 0x60 = 0x320 - io 0x62 = 0x300 - io 0x64 = 0x321 - end - end #superio/ite/it8623e - chip drivers/pc80/tpm - device pnp 4e.0 on end # TPM module + device pnp 2e.3 on # Parallel port + io 0x60 = 0x378 + io 0x62 = 0x778 # for ECP mode + irq 0x70 = 5 + drq 0x74 = 3 end - end #device pci 14.3 # LPC - device pci 14.7 off end # SD - no card reader present - end #chip southbridge/amd/agesa/hudson + device pnp 2e.4 on # EC + io 0x60 = 0x290 + io 0x62 = 0x230 + end + device pnp 2e.5 on # PS/2 keyboard + io 0x60 = 0x60 + io 0x62 = 0x64 + irq 0x70 = 1 + end + device pnp 2e.6 on # PS/2 mouse + irq 0x70 = 12 + end + device pnp 2e.7 on # GPIO + io 0x60 = 0x320 + io 0x62 = 0x300 + io 0x64 = 0x321 + end + end #superio/ite/it8623e + chip drivers/pc80/tpm + device pnp 4e.0 on end # TPM module + end + end #device pci 14.3 # LPC + device pci 14.7 off end # SD - no card reader present + end #chip southbridge/amd/agesa/hudson + chip northbridge/amd/agesa/family16kb device pci 18.0 on end device pci 18.1 on end device pci 18.2 on end @@ -104,7 +104,7 @@ chip northbridge/amd/agesa/family16kb/root_complex { { {0xA0, 0xA2} }, }" + end - end #chip northbridge/amd/agesa/family16kb # CPU side of HT root complex end #domain end #northbridge/amd/agesa/family16kb/root_complex -- cgit v1.2.3