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>

8 files changed, 465 insertions, 470 deletions

diff --git a/src/mainboard/amd/olivehill/devicetree.cb b/src/mainboard/amd/olivehill/devicetree.cb
index a027db9815..bf8d476512 100644
--- a/src/mainboard/amd/olivehill/devicetree.cb
+++ b/src/mainboard/amd/olivehill/devicetree.cb
@@ -21,40 +21,39 @@ 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 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
+		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 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
-			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
-					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/agesa/hudson
+		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  end # LPC	0x439d
+			device pci 14.7 on  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
@@ -66,7 +65,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/asrock/imb-a180/devicetree.cb b/src/mainboard/asrock/imb-a180/devicetree.cb
index 238326d6db..2c4a4aac12 100644
--- a/src/mainboard/asrock/imb-a180/devicetree.cb
+++ b/src/mainboard/asrock/imb-a180/devicetree.cb
@@ -21,81 +21,81 @@ 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 # 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
-			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 # 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
+		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
+				chip superio/winbond/w83627uhg
+					device pnp 2e.0 off end    # FDC
+					device pnp 2e.1 off end    # LPT1
+					device pnp 2e.2 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.3 on         # COM2
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
 					end
-				end # SM
-				device pci 14.2 on  end # HDA	0x4383
-				device pci 14.3 on
-					chip superio/winbond/w83627uhg
-						device pnp 2e.0 off end    # FDC
-						device pnp 2e.1 off end    # LPT1
-						device pnp 2e.2 on         # COM1
-							io 0x60 = 0x3f8
-							irq 0x70 = 4
-						end
-						device pnp 2e.3 on         # COM2
-							io 0x60 = 0x2f8
-							irq 0x70 = 3
-						end
-						device pnp 2e.5 on         # KEYBRD
-							io 0x60 = 0x60
-							io 0x62 = 0x64
-							irq 0x70 = 1
-							irq 0x72 = 12
-						end
-						device pnp 2e.6 on         # COM3
-							io 0x60 = 0x3e8
-							irq 0x70 = 4
-						end
-						device pnp 2e.7 off end    # GPIO
-						device pnp 2e.8 off end    # WDT
-						device pnp 2e.9 off end    # GPIO
-						device pnp 2e.a off end    # ACPI
-						device pnp 2e.b off end    # HWMON
-						device pnp 2e.c off end    # PECI
-						device pnp 2e.d on         # COM4
-							io 0x60 = 0x2e8
-							irq 0x70 = 3
-						end
-						device pnp 2e.e on         # COM5
-							io 0x60 = 0x3e0
-							irq 0x70 = 4
-						end
-						device pnp 2e.f on         # COM6
-							io 0x60 = 0x2e0
-							irq 0x70 = 3
-						end
-					end # w83627uhg
-				end # LPC	0x439d
-				device pci 14.7 on  end # SD
-			end	#chip southbridge/amd/agesa/hudson
+					device pnp 2e.5 on         # KEYBRD
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1
+						irq 0x72 = 12
+					end
+					device pnp 2e.6 on         # COM3
+						io 0x60 = 0x3e8
+						irq 0x70 = 4
+					end
+					device pnp 2e.7 off end    # GPIO
+					device pnp 2e.8 off end    # WDT
+					device pnp 2e.9 off end    # GPIO
+					device pnp 2e.a off end    # ACPI
+					device pnp 2e.b off end    # HWMON
+					device pnp 2e.c off end    # PECI
+					device pnp 2e.d on         # COM4
+						io 0x60 = 0x2e8
+						irq 0x70 = 3
+					end
+					device pnp 2e.e on         # COM5
+						io 0x60 = 0x3e0
+						irq 0x70 = 4
+					end
+					device pnp 2e.f on         # COM6
+						io 0x60 = 0x2e0
+						irq 0x70 = 3
+					end
+				end # w83627uhg
+			end # LPC	0x439d
+			device pci 14.7 on  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
@@ -107,7 +107,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/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
diff --git a/src/mainboard/bap/ode_e20XX/devicetree.cb b/src/mainboard/bap/ode_e20XX/devicetree.cb
index c2e428d80a..893d32366b 100644
--- a/src/mainboard/bap/ode_e20XX/devicetree.cb
+++ b/src/mainboard/bap/ode_e20XX/devicetree.cb
@@ -21,96 +21,95 @@ 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 0x9835
+			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 # PCIe Q7 Realtek GBit LAN
+			device pci 2.3 on  end # PCIe CB Realtek GBit LAN
+			device pci 2.4 on  end # x2 PCIe Microsemi FPGA
+		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 0x9835
-				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 # PCIe Q7 Realtek GBit LAN
-				device pci 2.3 on  end # PCIe CB Realtek GBit LAN
-				device pci 2.4 on  end # x2 PCIe Microsemi FPGA
-			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  end # SM
-				device pci 14.2 on  end # HDA	0x4383
-				device pci 14.3 on	# LPC	0x439d
-					chip superio/fintek/f81866d
-						register "hwm_amd_tsi_addr" = "0x98"	# Set to AMD
-						register "hwm_amd_tsi_control" = "0x02"	# Set to AMD
-						register "hwm_fan_select" = "0xC0"	# Sets Fan2 to PWM
-						register "hwm_fan_mode" = "0xD5"	# Sets FAN1-3 to Auto RPM mode
-						register "hwm_fan3_control" = "0x00"	# Fan control 23kHz
-						register "hwm_fan2_temp_map_select" = "0x1E"	# Fan control 23kHz
-						register "hwm_fan2_bound1" = "0x3C"	# 60°C
-						register "hwm_fan2_bound2" = "0x32"	# 50°C
-						register "hwm_fan2_bound3" = "0x28"	# 40°C
-						register "hwm_fan2_bound4" = "0x1E"	# 30°C
-						register "hwm_fan2_seg1_speed" = "0xFF"	# 100%
-						register "hwm_fan2_seg2_speed" = "0xD9"	# 85%
-						register "hwm_fan2_seg3_speed" = "0xB2"	# 70%
-						register "hwm_fan2_seg4_speed" = "0x99"	# 60%
-						register "hwm_fan2_seg5_speed" = "0x80"	# 50%
-						register "hwm_temp_sens_type" = "0x04"	# Sets temp sensor 1 type to to thermistor
-						device pnp 4e.0 off		# Floppy
-							io 0x60 = 0x3f0
-							irq 0x70 = 6
-							drq 0x74 = 2
-						end
-						device pnp 4e.3 off end			# Parallel Port
-						device pnp 4e.4 on			# Hardware Monitor
-							io 0x60 = 0x295
-							irq 0x70 = 0
-						end
-						device pnp 4e.5 off #  Keyboard
-							io 0x60 = 0x60
-							io 0x62 = 0x64
-							irq 0x70 = 1
-						end
-						device pnp 4e.6 off end			# GPIO
-						device pnp 4e.7 on end			# WDT
-						device pnp 4e.a off end			# PME
-						device pnp 4e.10 on			# COM1
-							io 0x60 = 0x3f8
-							irq 0x70 = 4
-						end
-						device pnp 4e.11 on			# COM2
-							io 0x60 = 0x2f8
-							irq 0x70 = 3
-						end
-						device pnp 4e.12 on			# COM3
-							io 0x60 = 0x3e8
-							irq 0x70 = 4
-						end
-						device pnp 4e.13 on			# COM4
-							io 0x60 = 0x2e8
-							irq 0x70 = 3
-						end
-						device pnp 4e.14 off			# COM5
-						end
-						device pnp 4e.15 off			# COM6
-						end
-					end # f81866d
-				end #LPC
-				device pci 14.7 on  end # SD
-			end	#chip southbridge/amd/agesa/hudson
+		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  end # SM
+			device pci 14.2 on  end # HDA	0x4383
+			device pci 14.3 on	# LPC	0x439d
+				chip superio/fintek/f81866d
+					register "hwm_amd_tsi_addr" = "0x98"	# Set to AMD
+					register "hwm_amd_tsi_control" = "0x02"	# Set to AMD
+					register "hwm_fan_select" = "0xC0"	# Sets Fan2 to PWM
+					register "hwm_fan_mode" = "0xD5"	# Sets FAN1-3 to Auto RPM mode
+					register "hwm_fan3_control" = "0x00"	# Fan control 23kHz
+					register "hwm_fan2_temp_map_select" = "0x1E"	# Fan control 23kHz
+					register "hwm_fan2_bound1" = "0x3C"	# 60°C
+					register "hwm_fan2_bound2" = "0x32"	# 50°C
+					register "hwm_fan2_bound3" = "0x28"	# 40°C
+					register "hwm_fan2_bound4" = "0x1E"	# 30°C
+					register "hwm_fan2_seg1_speed" = "0xFF"	# 100%
+					register "hwm_fan2_seg2_speed" = "0xD9"	# 85%
+					register "hwm_fan2_seg3_speed" = "0xB2"	# 70%
+					register "hwm_fan2_seg4_speed" = "0x99"	# 60%
+					register "hwm_fan2_seg5_speed" = "0x80"	# 50%
+					register "hwm_temp_sens_type" = "0x04"	# Sets temp sensor 1 type to to thermistor
+					device pnp 4e.0 off		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 4e.3 off end			# Parallel Port
+					device pnp 4e.4 on			# Hardware Monitor
+						io 0x60 = 0x295
+						irq 0x70 = 0
+					end
+					device pnp 4e.5 off #  Keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1
+					end
+					device pnp 4e.6 off end			# GPIO
+					device pnp 4e.7 on end			# WDT
+					device pnp 4e.a off end			# PME
+					device pnp 4e.10 on			# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 4e.11 on			# COM2
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 4e.12 on			# COM3
+						io 0x60 = 0x3e8
+						irq 0x70 = 4
+					end
+					device pnp 4e.13 on			# COM4
+						io 0x60 = 0x2e8
+						irq 0x70 = 3
+					end
+					device pnp 4e.14 off			# COM5
+					end
+					device pnp 4e.15 off			# COM6
+					end
+				end # f81866d
+			end #LPC
+			device pci 14.7 on  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
 			device pci 18.3 on  end
 			device pci 18.4 on  end
 			device pci 18.5 on  end
+		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/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
diff --git a/src/mainboard/gizmosphere/gizmo2/devicetree.cb b/src/mainboard/gizmosphere/gizmo2/devicetree.cb
index 896c03d02f..e35249e734 100644
--- a/src/mainboard/gizmosphere/gizmo2/devicetree.cb
+++ b/src/mainboard/gizmosphere/gizmo2/devicetree.cb
@@ -21,40 +21,39 @@ 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 0x9835
+			device pci 1.1 on  end # Internal Multimedia
+			device pci 2.0 on  end # PCIe Host Bridge
+			device pci 2.1 on  end # PCIe GFX Bridge
+			device pci 2.2 on  end # PCIe GPP mini PCIe
+			device pci 2.3 on  end # PCIe LAN
+			device pci 2.4 on  end # PCIe x2 to high speed edge connector
+			device pci 2.5 on  end # PCIe x2 to high speed 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 0x9835
-				device pci 1.1 on  end # Internal Multimedia
-				device pci 2.0 on  end # PCIe Host Bridge
-				device pci 2.1 on  end # PCIe GFX Bridge
-				device pci 2.2 on  end # PCIe GPP mini PCIe
-				device pci 2.3 on  end # PCIe LAN
-				device pci 2.4 on  end # PCIe x2 to high speed edge connector
-				device pci 2.5 on  end # PCIe x2 to high speed 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  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/agesa/hudson
+		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  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/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
 			device pci 18.3 on  end
 			device pci 18.4 on  end
 			device pci 18.5 on  end
+		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/hp/abm/devicetree.cb b/src/mainboard/hp/abm/devicetree.cb
index c9ca1d8480..c7a7510157 100644
--- a/src/mainboard/hp/abm/devicetree.cb
+++ b/src/mainboard/hp/abm/devicetree.cb
@@ -22,60 +22,59 @@ 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 off end  # unused
+			device pci 2.2 on  end  # GPP0: NIC
+			device pci 2.3 on  end  # GPP1: NIC
+			device pci 2.4 off end  # GPP2: unused
+			device pci 2.5 off end  # GPP3: unused
+		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 off end  # unused
-				device pci 2.2 on  end  # GPP0: NIC
-				device pci 2.3 on  end  # GPP1: NIC
-				device pci 2.4 off end  # GPP2: unused
-				device pci 2.5 off end  # GPP3: unused
-			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 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 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
+			end # SM
+			device pci 14.2 off end             # HDA 0x4383
+			device pci 14.3 on                  # LPC 0x439d
+				chip superio/nuvoton/nct5104d
+					device pnp 4e.0  off end    # FDC
+					device pnp 4e.2  on         # COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 4e.3  on         # COM2
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 4e.7  off end    # GPIO
+					device pnp 4e.8  off end    # GPIO/WDT
+					device pnp 4e.f  off end    # GPIO
+					device pnp 4e.10 off end    # COM3 used by port 80
+					device pnp 4e.11 on         # COM4
+						io 0x60 = 0x2e8
+						irq 0x70 = 3
 					end
-				end # SM
-				device pci 14.2 off end             # HDA 0x4383
-				device pci 14.3 on                  # LPC 0x439d
-					chip superio/nuvoton/nct5104d
-						device pnp 4e.0  off end    # FDC
-						device pnp 4e.2  on         # COM1
-							io 0x60 = 0x3f8
-							irq 0x70 = 4
-						end
-						device pnp 4e.3  on         # COM2
-							io 0x60 = 0x2f8
-							irq 0x70 = 3
-						end
-						device pnp 4e.7  off end    # GPIO
-						device pnp 4e.8  off end    # GPIO/WDT
-						device pnp 4e.f  off end    # GPIO
-						device pnp 4e.10 off end    # COM3 used by port 80
-						device pnp 4e.11 on         # COM4
-							io 0x60 = 0x2e8
-							irq 0x70 = 3
-						end
-						device pnp 4e.14 off end    # PORT80
-						register "irq_trigger_type" = "0" # 0 edge, 1 level
-					end # nct5104d
-				end #LPC
-				device pci 14.7 off end # SD
-				device pci 16.0 on  end # USB
-				device pci 16.2 on  end # USB
-			end	#chip southbridge/amd/agesa/hudson
+					device pnp 4e.14 off end    # PORT80
+					register "irq_trigger_type" = "0" # 0 edge, 1 level
+				end # nct5104d
+			end #LPC
+			device pci 14.7 off end # SD
+			device pci 16.0 on  end # USB
+			device pci 16.2 on  end # USB
+		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
@@ -86,6 +85,7 @@ chip northbridge/amd/agesa/family16kb/root_complex
 			{
 				{ {0xA0, 0x00}, {0x00, 0x00}, }, // socket 0 - Channel 0 - 8-bit SPD addresses
 			}"
-		end	#chip northbridge/amd/agesa/family16kb # CPU side of HT root complex
+		end
+
 	end	#domain
 end	#northbridge/amd/agesa/family16kb/root_complex