Parmer / Thatcher: devicetree.cb cleanup and whitespace
Re-formatting and cleaning up the devicetree.cb files for parmer and thatcher. Change-Id: Ic458e59701c1f2593b0a035b96cac60df476ee82 Signed-off-by: Martin Roth <martin.roth@se-eng.com> Reviewed-on: http://review.coreboot.org/2164 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones <marcj303@gmail.com> Reviewed-by: Zheng Bao <zheng.bao@amd.com>
This commit is contained in:
		@@ -17,17 +17,20 @@
 | 
				
			|||||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 | 
					# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
chip northbridge/amd/agesa/family15tn/root_complex
 | 
					chip northbridge/amd/agesa/family15tn/root_complex
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	device lapic_cluster 0 on
 | 
						device lapic_cluster 0 on
 | 
				
			||||||
		chip cpu/amd/agesa/family15tn
 | 
							chip cpu/amd/agesa/family15tn
 | 
				
			||||||
			device lapic 10 on end
 | 
								device lapic 10 on end
 | 
				
			||||||
		end
 | 
							end
 | 
				
			||||||
	end
 | 
						end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	device pci_domain 0 on
 | 
						device pci_domain 0 on
 | 
				
			||||||
		subsystemid 0x1022 0x1410 inherit
 | 
							subsystemid 0x1022 0x1410 inherit
 | 
				
			||||||
		chip northbridge/amd/agesa/family15tn # CPU side of HT root complex
 | 
							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 # PCI side of HT root complex
 | 
				
			||||||
				device pci 0.0 on  end # Root Complex
 | 
									device pci 0.0 on  end # Root Complex
 | 
				
			||||||
                                        device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
 | 
									device pci 1.0 on  end # Internal Graphics P2P bridge 0x99XX
 | 
				
			||||||
				device pci 1.1 on  end # Internal Multimedia
 | 
									device pci 1.1 on  end # Internal Multimedia
 | 
				
			||||||
				device pci 2.0 on  end # PCIE SLOT0 x16
 | 
									device pci 2.0 on  end # PCIE SLOT0 x16
 | 
				
			||||||
				device pci 3.0 on  end # PCIE SLOT0 x16
 | 
									device pci 3.0 on  end # PCIE SLOT0 x16
 | 
				
			||||||
@@ -36,7 +39,8 @@ chip northbridge/amd/agesa/family15tn/root_complex
 | 
				
			|||||||
				device pci 6.0 on  end # PCIE Slot1 x1
 | 
									device pci 6.0 on  end # PCIE Slot1 x1
 | 
				
			||||||
				device pci 7.0 on  end # LAN
 | 
									device pci 7.0 on  end # LAN
 | 
				
			||||||
				device pci 8.0 off end # NB/SB Link P2P bridge
 | 
									device pci 8.0 off end # NB/SB Link P2P bridge
 | 
				
			||||||
                       end
 | 
								end	#chip northbridge/amd/agesa/family15tn # PCI side of HT root complex
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			chip southbridge/amd/agesa/hudson # it is under NB/SB Link, but on the same pci bus
 | 
								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 10.0 on  end # XHCI HC0
 | 
				
			||||||
				device pci 10.1 on  end # XHCI HC1
 | 
									device pci 10.1 on  end # XHCI HC1
 | 
				
			||||||
@@ -45,11 +49,11 @@ chip northbridge/amd/agesa/family15tn/root_complex
 | 
				
			|||||||
				device pci 12.2 on  end # USB
 | 
									device pci 12.2 on  end # USB
 | 
				
			||||||
				device pci 13.0 on  end # USB
 | 
									device pci 13.0 on  end # USB
 | 
				
			||||||
				device pci 13.2 on  end # USB
 | 
									device pci 13.2 on  end # USB
 | 
				
			||||||
					device pci 14.0 on # SM
 | 
									device pci 14.0 on      # SMBUS
 | 
				
			||||||
						chip drivers/generic/generic #dimm 0-0-0
 | 
										chip drivers/generic/generic #dimm 0
 | 
				
			||||||
						device i2c 50 on end
 | 
											device i2c 50 on end
 | 
				
			||||||
					end
 | 
										end
 | 
				
			||||||
						chip drivers/generic/generic #dimm 0-0-1
 | 
										chip drivers/generic/generic #dimm 1
 | 
				
			||||||
						device i2c 51 on end
 | 
											device i2c 51 on end
 | 
				
			||||||
					end
 | 
										end
 | 
				
			||||||
					chip drivers/generic/generic #dimm 0-1-0
 | 
										chip drivers/generic/generic #dimm 0-1-0
 | 
				
			||||||
@@ -64,22 +68,23 @@ chip northbridge/amd/agesa/family15tn/root_complex
 | 
				
			|||||||
				device pci 14.3 on  end # LPC	0x439d
 | 
									device pci 14.3 on  end # LPC	0x439d
 | 
				
			||||||
				device pci 14.4 on  end # PCI	0x4384 # PCI-b conflict with GPIO.
 | 
									device pci 14.4 on  end # PCI	0x4384 # PCI-b conflict with GPIO.
 | 
				
			||||||
				device pci 14.5 on  end # USB 2
 | 
									device pci 14.5 on  end # USB 2
 | 
				
			||||||
#					device pci 14.6 on end # Gec
 | 
									device pci 14.6 off end # Gec
 | 
				
			||||||
					device pci 14.7 on end
 | 
									device pci 14.7 on  end # SD
 | 
				
			||||||
				device pci 15.0 off end # PCIe 0
 | 
									device pci 15.0 off end # PCIe 0
 | 
				
			||||||
				device pci 15.1 off end # PCIe 1
 | 
									device pci 15.1 off end # PCIe 1
 | 
				
			||||||
				device pci 15.2 off end # PCIe 2
 | 
									device pci 15.2 off end # PCIe 2
 | 
				
			||||||
				device pci 15.3 off end # PCIe 3
 | 
									device pci 15.3 off end # PCIe 3
 | 
				
			||||||
				register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 | 
									register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 | 
				
			||||||
				register "gpp_configuration" = "4"
 | 
									register "gpp_configuration" = "4"
 | 
				
			||||||
				end	#southbridge/amd/hudson
 | 
								end	#chip southbridge/amd/hudson
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			device pci 18.0 on end
 | 
								device pci 18.0 on end
 | 
				
			||||||
                        #device pci 18.0 on end
 | 
					 | 
				
			||||||
			device pci 18.1 on end
 | 
								device pci 18.1 on end
 | 
				
			||||||
			device pci 18.2 on end
 | 
								device pci 18.2 on end
 | 
				
			||||||
			device pci 18.3 on end
 | 
								device pci 18.3 on end
 | 
				
			||||||
			device pci 18.4 on end
 | 
								device pci 18.4 on end
 | 
				
			||||||
			device pci 18.5 on end
 | 
								device pci 18.5 on end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		end	#chip northbridge/amd/agesa/family15tn # CPU side of HT root complex
 | 
							end	#chip northbridge/amd/agesa/family15tn # CPU side of HT root complex
 | 
				
			||||||
	end	#pci_domain
 | 
						end	#pci_domain
 | 
				
			||||||
end #northbridge/amd/agesa/family15tn/root_complex
 | 
					end	#chip northbridge/amd/agesa/family15tn/root_complex
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,17 +17,20 @@
 | 
				
			|||||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 | 
					# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
chip northbridge/amd/agesa/family15tn/root_complex
 | 
					chip northbridge/amd/agesa/family15tn/root_complex
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	device lapic_cluster 0 on
 | 
						device lapic_cluster 0 on
 | 
				
			||||||
		chip cpu/amd/agesa/family15tn
 | 
							chip cpu/amd/agesa/family15tn
 | 
				
			||||||
			device lapic 10 on end
 | 
								device lapic 10 on end
 | 
				
			||||||
		end
 | 
							end
 | 
				
			||||||
	end
 | 
						end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	device pci_domain 0 on
 | 
						device pci_domain 0 on
 | 
				
			||||||
		subsystemid 0x1022 0x1410 inherit
 | 
							subsystemid 0x1022 0x1410 inherit
 | 
				
			||||||
		chip northbridge/amd/agesa/family15tn # CPU side of HT root complex
 | 
							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 # PCI side of HT root complex
 | 
				
			||||||
				device pci 0.0 on  end # Root Complex
 | 
									device pci 0.0 on  end # Root Complex
 | 
				
			||||||
                                        device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
 | 
									device pci 1.0 on  end # Internal Graphics P2P bridge 0x99XX
 | 
				
			||||||
				device pci 1.1 on  end # Internal Multimedia
 | 
									device pci 1.1 on  end # Internal Multimedia
 | 
				
			||||||
				device pci 2.0 on  end # PCIE SLOT0 x16
 | 
									device pci 2.0 on  end # PCIE SLOT0 x16
 | 
				
			||||||
				device pci 3.0 on  end # PCIE SLOT0 x16
 | 
									device pci 3.0 on  end # PCIE SLOT0 x16
 | 
				
			||||||
@@ -36,7 +39,8 @@ chip northbridge/amd/agesa/family15tn/root_complex
 | 
				
			|||||||
				device pci 6.0 on  end # PCIE Slot1 x1
 | 
									device pci 6.0 on  end # PCIE Slot1 x1
 | 
				
			||||||
				device pci 7.0 on  end # LAN
 | 
									device pci 7.0 on  end # LAN
 | 
				
			||||||
				device pci 8.0 off end # NB/SB Link P2P bridge
 | 
									device pci 8.0 off end # NB/SB Link P2P bridge
 | 
				
			||||||
								end
 | 
								end	#chip northbridge/amd/agesa/family15tn # PCI side of HT root complex
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			chip southbridge/amd/agesa/hudson # it is under NB/SB Link, but on the same pci bus
 | 
								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 10.0 on  end # XHCI HC0
 | 
				
			||||||
				device pci 10.1 on  end # XHCI HC1
 | 
									device pci 10.1 on  end # XHCI HC1
 | 
				
			||||||
@@ -45,11 +49,11 @@ chip northbridge/amd/agesa/family15tn/root_complex
 | 
				
			|||||||
				device pci 12.2 on  end # USB
 | 
									device pci 12.2 on  end # USB
 | 
				
			||||||
				device pci 13.0 on  end # USB
 | 
									device pci 13.0 on  end # USB
 | 
				
			||||||
				device pci 13.2 on  end # USB
 | 
									device pci 13.2 on  end # USB
 | 
				
			||||||
					device pci 14.0 on # SM
 | 
									device pci 14.0 on      # SMBUS
 | 
				
			||||||
						chip drivers/generic/generic #dimm 0-0-0
 | 
										chip drivers/generic/generic #dimm 0
 | 
				
			||||||
						device i2c 50 on end
 | 
											device i2c 50 on end
 | 
				
			||||||
					end
 | 
										end
 | 
				
			||||||
						chip drivers/generic/generic #dimm 0-0-1
 | 
										chip drivers/generic/generic #dimm 1
 | 
				
			||||||
						device i2c 51 on end
 | 
											device i2c 51 on end
 | 
				
			||||||
					end
 | 
										end
 | 
				
			||||||
					chip drivers/generic/generic #dimm 0-1-0
 | 
										chip drivers/generic/generic #dimm 0-1-0
 | 
				
			||||||
@@ -75,28 +79,27 @@ chip northbridge/amd/agesa/family15tn/root_complex
 | 
				
			|||||||
							io 0x60 = 0x2f8
 | 
												io 0x60 = 0x2f8
 | 
				
			||||||
							irq 0x70 = 3
 | 
												irq 0x70 = 3
 | 
				
			||||||
						end
 | 
											end
 | 
				
			||||||
						end	#superio/smsc/lpc47n217
 | 
										end	#chip superio/smsc/lpc47n217
 | 
				
			||||||
					end
 | 
									end	#device pci 14.3 # LPC
 | 
				
			||||||
				device pci 14.4 on  end # PCI	0x4384 # PCI-b conflict with GPIO.
 | 
									device pci 14.4 on  end # PCI	0x4384 # PCI-b conflict with GPIO.
 | 
				
			||||||
				device pci 14.5 on  end # USB 2
 | 
									device pci 14.5 on  end # USB 2
 | 
				
			||||||
#					device pci 14.6 on end # Gec
 | 
									device pci 14.6 off end # Gec
 | 
				
			||||||
					device pci 14.7 on end
 | 
									device pci 14.7 on  end # SD
 | 
				
			||||||
				device pci 15.0 off end # PCIe 0
 | 
									device pci 15.0 off end # PCIe 0
 | 
				
			||||||
				device pci 15.1 off end # PCIe 1
 | 
									device pci 15.1 off end # PCIe 1
 | 
				
			||||||
				device pci 15.2 off end # PCIe 2
 | 
									device pci 15.2 off end # PCIe 2
 | 
				
			||||||
				device pci 15.3 off end # PCIe 3
 | 
									device pci 15.3 off end # PCIe 3
 | 
				
			||||||
#					device pci 16.0 off end # XHCI0 Hudson2 only
 | 
					 | 
				
			||||||
#					device pci 16.2 off end # XHCI1 Hudson2 only
 | 
					 | 
				
			||||||
				register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 | 
									register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 | 
				
			||||||
				register "gpp_configuration" = "4"
 | 
									register "gpp_configuration" = "4"
 | 
				
			||||||
				end	#southbridge/amd/hudson
 | 
								end	#chip southbridge/amd/hudson
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			device pci 18.0 on end
 | 
								device pci 18.0 on end
 | 
				
			||||||
                        #device pci 18.0 on end
 | 
					 | 
				
			||||||
			device pci 18.1 on end
 | 
								device pci 18.1 on end
 | 
				
			||||||
			device pci 18.2 on end
 | 
								device pci 18.2 on end
 | 
				
			||||||
			device pci 18.3 on end
 | 
								device pci 18.3 on end
 | 
				
			||||||
			device pci 18.4 on end
 | 
								device pci 18.4 on end
 | 
				
			||||||
			device pci 18.5 on end
 | 
								device pci 18.5 on end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		end	#chip northbridge/amd/agesa/family15tn # CPU side of HT root complex
 | 
							end	#chip northbridge/amd/agesa/family15tn # CPU side of HT root complex
 | 
				
			||||||
	end	#pci_domain
 | 
						end	#pci_domain
 | 
				
			||||||
end #northbridge/amd/agesa/family15tn/root_complex
 | 
					end	#chip northbridge/amd/agesa/family15tn/root_complex
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user