AGESA fam16kb 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: Id3a161c54341d0c5c569ea6118ee6f890b7f62e6
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30735
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

2 files changed, 137 insertions, 139 deletions

diff --git a/src/mainboard/biostar/a68n_5200/devicetree.cb b/src/mainboard/biostar/a68n_5200/devicetree.cb
index d102ed1603..fd9b6edfb5 100644
--- a/src/mainboard/biostar/a68n_5200/devicetree.cb
+++ b/src/mainboard/biostar/a68n_5200/devicetree.cb
@@ -23,74 +23,73 @@ chip northbridge/amd/agesa/family16kb/root_complex
 
 	device domain 0 on
 		subsystemid 0x1022 0x1410 inherit
-		chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
+		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 # PCIe Host Bridge
+			device pci 2.1 on  end # x4 PCIe slot
+			device pci 2.2 off  end # mPCIe slot
+			device pci 2.3 off  end # Realtek NIC
+			device pci 2.4 off  end # Edge Connector
+			device pci 2.5 off  end # Edge Connector
+		end	#chip northbridge/amd/agesa/family16kb
 
-			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 # PCIe Host Bridge
-				device pci 2.1 on  end # x4 PCIe slot
-				device pci 2.2 off  end # mPCIe slot
-				device pci 2.3 off  end # Realtek NIC
-				device pci 2.4 off  end # Edge Connector
-				device pci 2.5 off  end # Edge Connector
-			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/it8728f
+					#register "multi_function_register_1" = "0x01"
+					device pnp 2e.0 off end		# Floppy
+					device pnp 2e.1 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 2e.2 off end		# COM2
+					device pnp 2e.3 on		# Parallel Port
+						io 0x60 = 0x378
+						irq 0x70 = 5
+						drq 0x74 = 4
 					end
-					chip drivers/generic/generic #dimm 0-0-1
-						device i2c 51 on end
+					device pnp 2e.4 on		# Hardware Monitor
+						io 0x60 = 0xa00
+						io 0x62 = 0xa20
+						irq 0x70 = 0
+						irq 0xf1 = 0x00
+						irq 0xf2 = 0x04
+						irq 0xf3 = 0xa0
+						irq 0xf5 = 0x0f
+						irq 0xf9 = 0xa0
+						irq 0xfa = 0x04
 					end
-				end # SM
-				device pci 14.2 on  end # HDA	0x4383
-				device pci 14.3 on      # LPC	0x439d
-					chip superio/ite/it8728f
-						#register "multi_function_register_1" = "0x01"
-						device pnp 2e.0 off end		# Floppy
-						device pnp 2e.1 on		# COM1
-							io 0x60 = 0x3f8
-							irq 0x70 = 4
-						end
-						device pnp 2e.2 off end		# COM2
-						device pnp 2e.3 on		# Parallel Port
-							io 0x60 = 0x378
-							irq 0x70 = 5
-							drq 0x74 = 4
-						end
-						device pnp 2e.4 on		# Hardware Monitor
-							io 0x60 = 0xa00
-							io 0x62 = 0xa20
-							irq 0x70 = 0
-							irq 0xf1 = 0x00
-							irq 0xf2 = 0x04
-							irq 0xf3 = 0xa0
-							irq 0xf5 = 0x0f
-							irq 0xf9 = 0xa0
-							irq 0xfa = 0x04
-						end
-						device pnp 2e.5 on		# KBC
-							io 0x60 = 0x60
-						end
-						device pnp 2e.6 off end		# KBC?
-						device pnp 2e.7 off end		# GPIO
-						device pnp 2e.8 off end
-						device pnp 2e.9 off end
-						device pnp 2e.a off end		# IR
-					end # ITE IT8728F
-				end #LPC
-				device pci 14.7 off  end # SD
-			end	#chip southbridge/amd/agesa/hudson
+					device pnp 2e.5 on		# KBC
+						io 0x60 = 0x60
+					end
+					device pnp 2e.6 off end		# KBC?
+					device pnp 2e.7 off end		# GPIO
+					device pnp 2e.8 off end
+					device pnp 2e.9 off end
+					device pnp 2e.a off end		# IR
+				end # ITE IT8728F
+			end #LPC
+			device pci 14.7 off  end # SD
+		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
@@ -102,7 +101,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
 				{ {0xA0, 0xA2}, {0x00, 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/family16kb # CPU side of HT root complex
 	end	#domain
 end	#northbridge/amd/agesa/family16kb/root_complex
diff --git a/src/mainboard/biostar/am1ml/devicetree.cb b/src/mainboard/biostar/am1ml/devicetree.cb
index 59fb593330..400653d67b 100644
--- a/src/mainboard/biostar/am1ml/devicetree.cb
+++ b/src/mainboard/biostar/am1ml/devicetree.cb
@@ -22,83 +22,82 @@ chip northbridge/amd/agesa/family16kb/root_complex
 
 	device domain 0 on
 		subsystemid 0x1002 0x439d inherit
-		chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
+		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
+			device pci 2.1 on  end
+			device pci 2.2 on  end
+			device pci 2.3 on  end
+			device pci 2.4 on  end
+			device pci 2.5 on  end
+		end	#chip northbridge/amd/agesa/family16kb
 
-			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
-				device pci 2.1 on  end
-				device pci 2.2 on  end
-				device pci 2.3 on  end
-				device pci 2.4 on  end
-				device pci 2.5 on  end
-			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.1 on  end # there is no legacy ide
+			device pci 14.2 on  end # HDA	0x4383
+			device pci 14.3 on      # LPC	0x439d
+				chip superio/ite/it8728f
+					device pnp 2e.0 off #  Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 2e.1 on #  Com1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 2e.2 off #  Com2
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 2e.3 on #  Parallel Port
+						io 0x60 = 0x378
+						io 0x62 = 0
+						drq 0x74 = 4
+						irq 0x70 = 5
 					end
-					chip drivers/generic/generic #dimm 0-0-1
-						device i2c 51 on end
+					device pnp 2e.4 on #  Env Controller
+						io 0x60 = 0xa00
+						io 0x62 = 0xa20
+						irq 0x70 = 0
 					end
-				end # SM
-				device pci 14.1 on  end # there is no legacy ide
-				device pci 14.2 on  end # HDA	0x4383
-				device pci 14.3 on      # LPC	0x439d
-					chip superio/ite/it8728f
-						device pnp 2e.0 off #  Floppy
-							io 0x60 = 0x3f0
-							irq 0x70 = 6
-							drq 0x74 = 2
-						end
-						device pnp 2e.1 on #  Com1
-							io 0x60 = 0x3f8
-							irq 0x70 = 4
-						end
-						device pnp 2e.2 off #  Com2
-							io 0x60 = 0x2f8
-							irq 0x70 = 3
-						end
-						device pnp 2e.3 on #  Parallel Port
-							io 0x60 = 0x378
-							io 0x62 = 0
-							drq 0x74 = 4
-							irq 0x70 = 5
-						end
-						device pnp 2e.4 on #  Env Controller
-							io 0x60 = 0xa00
-							io 0x62 = 0xa20
-							irq 0x70 = 0
-						end
-						device pnp 2e.5 on #  Keyboard
-							io 0x60 = 0x60
-							io 0x62 = 0x64
-							irq 0x70 = 1
-						end
-						device pnp 2e.6 on #  Mouse
-							irq 0x70 = 12
-						end
-						device pnp 2e.7 on #  GPIO
-							io 0x60 = 0xa40
-							io 0x62 = 0xa40
-							io 0x64 = 0
-							irq 0x70 = 0
-						end
-						device pnp 2e.a off end #  CIR
-					end	#superio/ite/it8728f
-				end	#device pci 14.3 # LPC
-				device pci 14.7 off  end # SD
-			end	#chip southbridge/amd/agesa/hudson
+					device pnp 2e.5 on #  Keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1
+					end
+					device pnp 2e.6 on #  Mouse
+						irq 0x70 = 12
+					end
+					device pnp 2e.7 on #  GPIO
+						io 0x60 = 0xa40
+						io 0x62 = 0xa40
+						io 0x64 = 0
+						irq 0x70 = 0
+					end
+					device pnp 2e.a off end #  CIR
+				end	#superio/ite/it8728f
+			end	#device pci 14.3 # LPC
+			device pci 14.7 off  end # SD
+		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
@@ -109,7 +108,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