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>

4 files changed, 165 insertions, 165 deletions

diff --git a/src/mainboard/amd/bettong/devicetree.cb b/src/mainboard/amd/bettong/devicetree.cb
index a259e92ddc..84aaf41a3c 100644
--- a/src/mainboard/amd/bettong/devicetree.cb
+++ b/src/mainboard/amd/bettong/devicetree.cb
@@ -21,53 +21,54 @@ 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
-				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 # PCIe Host Bridge
-				device pci 2.1 on  end # x4 PCIe slot
-				device pci 2.2 on  end # mPCIe slot
-				device pci 2.3 on  end # Realtek NIC
-				device pci 2.4 on  end # Edge Connector
-				device pci 2.5 on  end # Edge Connector
-				device pci 3.0 on  end # Edge Connector
-				device pci 3.1 on  end # Edge Connector
-			end	#chip northbridge/amd/pi/00660F01
+		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
+			device pci 2.0 on  end # PCIe Host Bridge
+			device pci 2.1 on  end # x4 PCIe slot
+			device pci 2.2 on  end # mPCIe slot
+			device pci 2.3 on  end # Realtek NIC
+			device pci 2.4 on  end # Edge Connector
+			device pci 2.5 on  end # Edge Connector
+			device pci 3.0 on  end # Edge Connector
+			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
-				device pci 9.0 on  end # HDA
-				device pci 9.2 on  end # HDA
-				device pci 10.0 on  end # USB
-				device pci 11.0 on  end # SATA
-				device pci 12.0 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  end # LPC	0x439d
-				device pci 14.7 on  end # SD
-			end	#chip southbridge/amd/pi/hudson
+		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
+			device pci 11.0 on  end # SATA
+			device pci 12.0 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  end # LPC	0x439d
+			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
diff --git a/src/mainboard/amd/db-ft3b-lc/devicetree.cb b/src/mainboard/amd/db-ft3b-lc/devicetree.cb
index 1faebf4c70..dfbe3e27d7 100644
--- a/src/mainboard/amd/db-ft3b-lc/devicetree.cb
+++ b/src/mainboard/amd/db-ft3b-lc/devicetree.cb
@@ -22,42 +22,40 @@ 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
-				device pci 0.2 off end # IOMMU
-				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 # PCIe Host Bridge
-				device pci 2.1 on  end # x4 PCIe slot
-				device pci 2.2 on  end # mPCIe slot
-				device pci 2.3 on  end # Realtek NIC
-				device pci 2.4 off end # Edge Connector
-				device pci 2.5 off end # Edge Connector
-				device pci 8.0 off end # Platform Security Processor
-			end	#chip northbridge/amd/pi/00730F01
+		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
+			device pci 1.1 on  end # Internal Multimedia
+			device pci 2.0 on  end # PCIe Host Bridge
+			device pci 2.1 on  end # x4 PCIe slot
+			device pci 2.2 on  end # mPCIe slot
+			device pci 2.3 on  end # Realtek NIC
+			device pci 2.4 off end # Edge Connector
+			device pci 2.5 off end # Edge Connector
+			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
-				device pci 10.0 on  end # XHCI HC0
-				device pci 11.0 on  end # SATA
-				device pci 12.0 on  end # EHCI #0
-				device pci 13.0 on  end # EHCI #1
-				device pci 14.0 on  end # SMBus
-				device pci 14.2 on  end # HDA	0x4383
-				device pci 14.3 on  end # LPC	0x439d
-				device pci 14.7 on  end # SD
-				device pci 16.0 on  end # EHCI #2
-				register "sd_mode" = "3"
-			end	#chip southbridge/amd/pi/hudson
+		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
+			device pci 13.0 on  end # EHCI #1
+			device pci 14.0 on  end # SMBus
+			device pci 14.2 on  end # HDA	0x4383
+			device pci 14.3 on  end # LPC	0x439d
+			device pci 14.7 on  end # SD
+			device pci 16.0 on  end # EHCI #2
+			register "sd_mode" = "3"
+		end	#chip southbridge/amd/pi/hudson
 
-			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
+		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
 
-		end #chip northbridge/amd/pi/00730F01 # CPU side of HT root complex
 	end #domain
 end #northbridge/amd/pi/00730F01/root_complex
diff --git a/src/mainboard/amd/lamar/devicetree.cb b/src/mainboard/amd/lamar/devicetree.cb
index 593f95be66..d7f3f05023 100644
--- a/src/mainboard/amd/lamar/devicetree.cb
+++ b/src/mainboard/amd/lamar/devicetree.cb
@@ -22,81 +22,81 @@ 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
-				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
-				device pci 1.1 on end   # 0x1308 DisplayPort/HDMI Audio
-				device pci 2.0 on end   # 0x1424 GFX PCIe Host Bridge
-				device pci 2.1 on end   # 0x1425 P2P Bridge for GFX PCIe Port 0 (PCIe x16 slot J119)
-				device pci 2.2 off end  # 0x1425 P2P Bridge for GFX PCIe Port 1
-				device pci 3.0 on end   # 0x1424 GPP PCIe Host Bridge
-				device pci 3.1 on end   # 0x1426 P2P Bridge for GPP PCIe Port 0 (PCIe x4 slot J118)
-				device pci 3.2 on end   # 0x1426 P2P Bridge for GPP PCIe Port 1 (PCIe x4 slot J120)
-				device pci 3.3 off end  # 0x1426 P2P Bridge for GPP PCIe Port 2
-				device pci 3.4 off end  # 0x1426 P2P Bridge for GPP PCIe Port 3
-				device pci 3.5 off end  # 0x1426 P2P Bridge for GPP PCIe Port 4
-				device pci 4.0 on end   # 0x1424 UMI PCIe Host Bridge
+		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
+			device pci 1.1 on end   # 0x1308 DisplayPort/HDMI Audio
+			device pci 2.0 on end   # 0x1424 GFX PCIe Host Bridge
+			device pci 2.1 on end   # 0x1425 P2P Bridge for GFX PCIe Port 0 (PCIe x16 slot J119)
+			device pci 2.2 off end  # 0x1425 P2P Bridge for GFX PCIe Port 1
+			device pci 3.0 on end   # 0x1424 GPP PCIe Host Bridge
+			device pci 3.1 on end   # 0x1426 P2P Bridge for GPP PCIe Port 0 (PCIe x4 slot J118)
+			device pci 3.2 on end   # 0x1426 P2P Bridge for GPP PCIe Port 1 (PCIe x4 slot J120)
+			device pci 3.3 off end  # 0x1426 P2P Bridge for GPP PCIe Port 2
+			device pci 3.4 off end  # 0x1426 P2P Bridge for GPP PCIe Port 3
+			device pci 3.5 off end  # 0x1426 P2P Bridge for GPP PCIe Port 4
+			device pci 4.0 on end   # 0x1424 UMI PCIe Host Bridge
 #				device pci 4.1 on end   # 0x1426 P2P bridge for UMI link
 #				device pci 4.2 off end  # 0x1426 Virtual P2P bridge for SB PCIe Port 3
 #				device pci 4.3 off end  # 0x1426 Virtual P2P bridge for SB PCIe Port 2
 #				device pci 4.4 off end  # 0x1426 Virtual P2P bridge for SB PCIe Port 1
 #				device pci 4.5 off end  # 0x1426 Virtual P2P bridge for SB PCIe Port 0
-			end	#chip northbridge/amd/pi/00630F01
+		end	#chip northbridge/amd/pi/00630F01
 
-			chip southbridge/amd/pi/hudson
-				device pci 10.0 on end  # 0x7814 XHCI HC0
-				device pci 10.1 on end  # 0x7814 XHCI HC1
-				device pci 11.0 on end  # 0x7800-0x7805 SATA (device ID depends on mode)
-				device pci 12.0 on end  # 0x7807 USB OHCI
-				device pci 12.2 on end  # 0x7808 USB EHCI
-				device pci 13.0 on end  # 0x7807 USB OHCI
-				device pci 13.2 on end  # 0x7808 USB EHCI
-				device pci 14.0 on      # 0x780B SMBus
-					chip drivers/generic/generic #dimm 0-0-0
-						device i2c 50 on end
+		chip southbridge/amd/pi/hudson
+			device pci 10.0 on end  # 0x7814 XHCI HC0
+			device pci 10.1 on end  # 0x7814 XHCI HC1
+			device pci 11.0 on end  # 0x7800-0x7805 SATA (device ID depends on mode)
+			device pci 12.0 on end  # 0x7807 USB OHCI
+			device pci 12.2 on end  # 0x7808 USB EHCI
+			device pci 13.0 on end  # 0x7807 USB OHCI
+			device pci 13.2 on end  # 0x7808 USB EHCI
+			device pci 14.0 on      # 0x780B SMBus
+				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
+				chip drivers/generic/generic #dimm 0-1-0
+					device i2c 52 on end
+				end
+				chip drivers/generic/generic #dimm 0-1-1
+					device i2c 53 on end
+				end
+			end # SM
+			device pci 14.1 on end  # 0x780C IDE
+			device pci 14.2 on end  # 0x780D HDA
+			device pci 14.3 on      # 0x780E LPC
+				chip superio/fintek/f81216h
+					register "conf_key_mode" = "0x77"
+					device pnp 4e.0 on			# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
 					end
-					chip drivers/generic/generic #dimm 0-0-1
-						device i2c 51 on end
+					device pnp 4e.1 on			# COM2
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
 					end
-					chip drivers/generic/generic #dimm 0-1-0
-						device i2c 52 on end
-					end
-					chip drivers/generic/generic #dimm 0-1-1
-						device i2c 53 on end
-					end
-				end # SM
-				device pci 14.1 on end  # 0x780C IDE
-				device pci 14.2 on end  # 0x780D HDA
-				device pci 14.3 on      # 0x780E LPC
-					chip superio/fintek/f81216h
-						register "conf_key_mode" = "0x77"
-						device pnp 4e.0 on			# COM1
-							io 0x60 = 0x3f8
-							irq 0x70 = 4
-						end
-						device pnp 4e.1 on			# COM2
-							io 0x60 = 0x2f8
-							irq 0x70 = 3
-						end
-						device pnp 4e.2 off end		# COM3
-						device pnp 4e.3 off end		# COM4
-						device pnp 4e.8 off end		# WDT
-					end # f81865f
-				end #LPC
-				device pci 14.4 on end  # 0x780F PCI :: PCI-b conflict with GPIO.
-				device pci 14.5 on end  # 0x7809 USB OHCI
-				device pci 14.7 on end  # 0x7806 SD Flash Controller
-				device pci 15.0 on end  # 0x43A0 SB GPP Port 0 (Integrated Realtek GbE Controller)
-				device pci 15.1 on end  # 0x43A1 SB GPP Port 1 (mPCIe slot J122)
-				device pci 15.2 on end  # 0x43A2 SB GPP Port 2 (mPCIe slot J123)
-				device pci 15.3 off end # 0x43A3 SB GPP Port 3
-					register "gpp_configuration" = "4"
-				device pci 16.0 on end  # 0x7809 USB OHCI (when the xHCI device is disabled)
-			end	#southbridge/amd/pi/hudson
+					device pnp 4e.2 off end		# COM3
+					device pnp 4e.3 off end		# COM4
+					device pnp 4e.8 off end		# WDT
+				end # f81865f
+			end #LPC
+			device pci 14.4 on end  # 0x780F PCI :: PCI-b conflict with GPIO.
+			device pci 14.5 on end  # 0x7809 USB OHCI
+			device pci 14.7 on end  # 0x7806 SD Flash Controller
+			device pci 15.0 on end  # 0x43A0 SB GPP Port 0 (Integrated Realtek GbE Controller)
+			device pci 15.1 on end  # 0x43A1 SB GPP Port 1 (mPCIe slot J122)
+			device pci 15.2 on end  # 0x43A2 SB GPP Port 2 (mPCIe slot J123)
+			device pci 15.3 off end # 0x43A3 SB GPP Port 3
+				register "gpp_configuration" = "4"
+			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
diff --git a/src/mainboard/amd/olivehillplus/devicetree.cb b/src/mainboard/amd/olivehillplus/devicetree.cb
index ee0cd98bfe..430b17b0ec 100644
--- a/src/mainboard/amd/olivehillplus/devicetree.cb
+++ b/src/mainboard/amd/olivehillplus/devicetree.cb
@@ -21,52 +21,53 @@ 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
-				device pci 0.2 off end # IOMMU
-				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 # PCIe Host Bridge
-				device pci 2.1 on  end # x4 PCIe slot
-				device pci 2.2 on  end # mPCIe slot
-				device pci 2.3 on  end # Realtek NIC
-				device pci 2.4 on  end # Edge Connector
-				device pci 2.5 on  end # Edge Connector
-				device pci 8.0 on  end # Platform Security Processor
-			end	#chip northbridge/amd/pi/00730F01
+		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
+			device pci 1.1 on  end # Internal Multimedia
+			device pci 2.0 on  end # PCIe Host Bridge
+			device pci 2.1 on  end # x4 PCIe slot
+			device pci 2.2 on  end # mPCIe slot
+			device pci 2.3 on  end # Realtek NIC
+			device pci 2.4 on  end # Edge Connector
+			device pci 2.5 on  end # Edge Connector
+			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
-				device pci 10.0 on  end # XHCI HC0
-				device pci 11.0 on  end # SATA
-				device pci 12.0 on  end # EHCI #0
-				device pci 13.0 on  end # EHCI #1
-				device pci 14.0 on      # SMBus
-					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 # SMbus
-				device pci 14.2 on  end # HDA	0x4383
-				device pci 14.3 on  end # LPC	0x439d
-				device pci 14.7 on  end # SD
-				device pci 16.0 on  end # EHCI #2
-			end	#chip southbridge/amd/pi/hudson
+		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
+			device pci 13.0 on  end # EHCI #1
+			device pci 14.0 on      # SMBus
+				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 # SMbus
+			device pci 14.2 on  end # HDA	0x4383
+			device pci 14.3 on  end # LPC	0x439d
+			device pci 14.7 on  end # SD
+			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