[coreboot-gerrit] New patch to review for coreboot: 02d471a devicetree.cb: Remove some trailing whitespace

HAOUAS Elyes (ehaouas@noos.fr) gerrit at coreboot.org
Thu Jul 24 18:51:08 CEST 2014


HAOUAS Elyes (ehaouas at noos.fr) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6356

-gerrit

commit 02d471a0e266c70458a1ec177ccb4ed14f7710c5
Author: Elyes HAOUAS <ehaouas at noos.fr>
Date:   Thu Jul 24 18:51:08 2014 +0200

    devicetree.cb: Remove some trailing whitespace
    
    Change-Id: I5601be1c4053020335bd29dc0f07c8d0daac1e97
    Signed-off-by: Elyes HAOUAS <ehaouas at noos.fr>
---
 src/mainboard/asi/mb_5blgp/devicetree.cb           | 106 +++---
 src/mainboard/asi/mb_5blmp/devicetree.cb           |  90 +++---
 src/mainboard/broadcom/blast/devicetree.cb         |  48 ++-
 src/mainboard/digitallogic/adl855pc/devicetree.cb  |  50 +--
 src/mainboard/digitallogic/msm800sev/devicetree.cb |  38 +--
 src/mainboard/eaglelion/5bcm/devicetree.cb         |  96 +++---
 src/mainboard/kontron/kt690/devicetree.cb          |  78 ++---
 src/mainboard/lippert/frontrunner-af/devicetree.cb |  10 +-
 src/mainboard/lippert/toucan-af/devicetree.cb      |  12 +-
 src/mainboard/mitac/6513wu/devicetree.cb           | 122 +++----
 src/mainboard/nec/powermate2000/devicetree.cb      | 102 +++---
 src/mainboard/nvidia/l1_2pvv/devicetree.cb         | 356 ++++++++++-----------
 src/mainboard/rca/rm4100/devicetree.cb             | 129 ++++----
 src/mainboard/via/epia-cn/devicetree.cb            | 118 +++----
 src/mainboard/via/epia-n/devicetree.cb             | 152 ++++-----
 src/mainboard/winent/mb6047/devicetree.cb          | 236 +++++++-------
 src/mainboard/winent/pl6064/devicetree.cb          |   4 +-
 17 files changed, 871 insertions(+), 876 deletions(-)

diff --git a/src/mainboard/asi/mb_5blgp/devicetree.cb b/src/mainboard/asi/mb_5blgp/devicetree.cb
index d84bf0e..40856b1 100644
--- a/src/mainboard/asi/mb_5blgp/devicetree.cb
+++ b/src/mainboard/asi/mb_5blgp/devicetree.cb
@@ -1,55 +1,55 @@
 chip northbridge/amd/gx1		# Northbridge
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    chip southbridge/amd/cs5530		# Southbridge
-      device pci 0f.0 on end		# Ethernet
-      device pci 12.0 on		# ISA bridge
-        chip superio/nsc/pc87351	# Super I/O
-          device pnp 2e.0 off		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 2e.1 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 2e.2 on		# COM2
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 2e.e on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 2e.4 on		# System wake-up control (SWC)
-            irq 0x60 = 0x500
-          end
-          device pnp 2e.5 on		# PS/2 mouse
-            irq 0x70 = 12
-          end
-          device pnp 2e.6 on		# PS/2 keyboard
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1
-          end
-          device pnp 2e.7 on		# GPIO
-            irq 0x60 = 0x800
-          end
-          device pnp 2e.8 on		# Fan speed control
-            irq 0x60 = 0x900
-          end
-        end
-      end
-      device pci 12.1 off end		# SMI
-      device pci 12.2 on end		# IDE
-      device pci 12.3 on end		# Audio
-      device pci 12.4 on end		# VGA
-      device pci 13.0 on end		# USB
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "0"	# No connector on this board
-    end
-  end
-  chip cpu/amd/geode_gx1		# CPU
-  end
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		chip southbridge/amd/cs5530		# Southbridge
+			device pci 0f.0 on end		# Ethernet
+			device pci 12.0 on		# ISA bridge
+				chip superio/nsc/pc87351	# Super I/O
+					device pnp 2e.0 off		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 2e.1 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 2e.2 on		# COM2
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 2e.e on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 2e.4 on		# System wake-up control (SWC)
+						irq 0x60 = 0x500
+					end
+					device pnp 2e.5 on		# PS/2 mouse
+						irq 0x70 = 12
+					end
+					device pnp 2e.6 on		# PS/2 keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1
+					end
+					device pnp 2e.7 on		# GPIO
+						irq 0x60 = 0x800
+					end
+					device pnp 2e.8 on		# Fan speed control
+						irq 0x60 = 0x900
+					end
+				end
+			end
+			device pci 12.1 off end		# SMI
+			device pci 12.2 on end		# IDE
+			device pci 12.3 on end		# Audio
+			device pci 12.4 on end		# VGA
+			device pci 13.0 on end		# USB
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "0"	# No connector on this board
+		end
+	end
+	chip cpu/amd/geode_gx1	# CPU
+	end
 end
diff --git a/src/mainboard/asi/mb_5blmp/devicetree.cb b/src/mainboard/asi/mb_5blmp/devicetree.cb
index e8e6ac3..055ab15 100644
--- a/src/mainboard/asi/mb_5blmp/devicetree.cb
+++ b/src/mainboard/asi/mb_5blmp/devicetree.cb
@@ -1,48 +1,48 @@
 chip northbridge/amd/gx1		# Northbridge
-  device domain 0 on
-    device pci 0.0 on end		# Host bridge
-    chip southbridge/amd/cs5530		# Southbridge
-      device pci 0f.0 off end		# Ethernet (Realtek RTL8139B)
-      device pci 12.0 on		# ISA bridge
-        chip superio/nsc/pc87351	# Super I/O
-          device pnp 2e.4 on		# PS/2 keyboard (+ mouse?)
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1
-            # irq 0x72 = 12
-          end
-          device pnp 2e.a on		# PS/2 mouse
-            irq 0x70 = 12
-          end
-          device pnp 2e.e on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 2e.f off		# Floppy
-            io 0x60 = 0x3f2
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 2e.10 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 2e.12 on		# COM2
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-        end
-      end
-      device pci 12.1 off end		# SMI
-      device pci 12.2 on  end		# IDE
-      device pci 12.3 on  end		# Audio
-      device pci 12.4 on  end		# VGA (onboard)
-      device pci 13.0 on end		# USB
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-    end
-  end
-  chip cpu/amd/geode_gx1		# CPU
-  end
+	device domain 0 on
+		device pci 0.0 on end		# Host bridge
+		chip southbridge/amd/cs5530		# Southbridge
+			device pci 0f.0 off end		# Ethernet (Realtek RTL8139B)
+			device pci 12.0 on		# ISA bridge
+				chip superio/nsc/pc87351	# Super I/O
+					device pnp 2e.4 on		# PS/2 keyboard (+ mouse?)
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1
+						# irq 0x72 = 12
+					end
+					device pnp 2e.a on		# PS/2 mouse
+						irq 0x70 = 12
+					end
+					device pnp 2e.e on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 2e.f off		# Floppy
+						io 0x60 = 0x3f2
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 2e.10 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 2e.12 on		# COM2
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+				end
+			end
+			device pci 12.1 off end		# SMI
+			device pci 12.2 on end		# IDE
+			device pci 12.3 on end		# Audio
+			device pci 12.4 on end		# VGA (onboard)
+			device pci 13.0 on end		# USB
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+		end
+	end
+	chip cpu/amd/geode_gx1	# CPU
+	end
 end
 
diff --git a/src/mainboard/broadcom/blast/devicetree.cb b/src/mainboard/broadcom/blast/devicetree.cb
index 9de4331..d22cc43 100644
--- a/src/mainboard/broadcom/blast/devicetree.cb
+++ b/src/mainboard/broadcom/blast/devicetree.cb
@@ -7,25 +7,25 @@ chip northbridge/amd/amdk8/root_complex
 	device domain 0 on
 		subsystemid 0x161f 0x3050 inherit
 		chip northbridge/amd/amdk8
-			device pci 18.0 on #  northbridge
-				#  devices on link 0
+			device pci 18.0 on # northbridge
+				# devices on link 0
 				chip southbridge/broadcom/bcm5780 # HT2000
-					device pci 0.0 on end   # PXB 1 0x0130
-					device pci 1.0 on       # PXB 2 0x0130
+					device pci 0.0 on end	# PXB 1 0x0130
+					device pci 1.0 on	# PXB 2 0x0130
 						device pci 4.0 on end # GB E 0x1668 vid = 0x14e4
 						device pci 4.1 on end # GB E 0x1669 vid = 0x14e4
 					end
-					device pci 2.0 on end # PCI E 1  #0x0132
+					device pci 2.0 on end # PCI E 1 #0x0132
 					device pci 3.0 on end # PCI E 2
 					device pci 4.0 on end # PCI E 3
 					device pci 5.0 on end # PCI E 4
 				end
 				chip southbridge/broadcom/bcm5785 # HT1000
-					device pci 0.0 on  # HT PXB  0x0036
+					device pci 0.0 on	# HT PXB 0x0036
 						device pci d.0 on end # PPBX 0x0104
 						device pci e.0 on end # SATA 0x024a
 					end
-					device pci 1.0 on # Legacy  pci main  0x0205
+					device pci 1.0 on # Legacy pci main 0x0205
 						chip drivers/i2c/i2cmux2 # pca9554 smbus mux
 							device i2c 71 on end #0 pca9554 0
 							device i2c 71 on end #0 pca9554 1
@@ -64,51 +64,51 @@ chip northbridge/amd/amdk8/root_complex
 						end
 
 					end
-					device pci 1.1 on end # IDE        0x0214
-					device pci 1.2 on     # LPC        0x0234
+					device pci 1.1 on end	# IDE	0x0214
+					device pci 1.2 on	# LPC	0x0234
 						chip superio/nsc/pc87417
-							device  pnp 2e.0 off  # Floppy
+							device pnp 2e.0 off	# Floppy
 								io 0x60 = 0x3f0
 								irq 0x70 = 6
 								drq 0x74 = 2
 							end
-							device pnp 2e.1 off  # Parallel Port
+							device pnp 2e.1 off	# Parallel Port
 								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 2e.2 off # Com 2
+							device pnp 2e.2 off	# Com 2
 								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 2e.3 on  # Com 1
+							device pnp 2e.3 on	# Com 1
 								io 0x60 = 0x3f8
 								irq 0x70 = 4
 							end
-							device pnp 2e.4 off end # SWC
-							device pnp 2e.5 off end # Mouse
-							device pnp 2e.6 on  # Keyboard
+							device pnp 2e.4 off end	# SWC
+							device pnp 2e.5 off end	# Mouse
+							device pnp 2e.6 on	# Keyboard
 								io 0x60 = 0x60
 								io 0x62 = 0x64
 								irq 0x70 = 1
 							end
-							device pnp 2e.7 off end # GPIO
-							device pnp 2e.f off end # XBUS
-							device pnp 2e.10 on #RTC
+							device pnp 2e.7 off end	# GPIO
+							device pnp 2e.f off end	# XBUS
+							device pnp 2e.10 on	#RTC
 								io 0x60 = 0x70
 								io 0x62 = 0x72
 							end
 						end
 					end
-					device pci 1.3 on end # WDTimer    0x0238
-					device pci 1.4 on end # XIOAPIC0   0x0235
+					device pci 1.3 on end # WDTimer		0x0238
+					device pci 1.4 on end # XIOAPIC0	0x0235
 					device pci 1.5 on end # XIOAPIC1
 					device pci 1.6 on end # XIOAPIC2
-					device pci 2.0 on end # USB        0x0223
+					device pci 2.0 on end # USB		0x0223
 					device pci 2.1 on end # USB
 					device pci 2.2 on end # USB
 					device pci 4.0 on end # it is in bcm5785_0 bus
 				end
-			end #	device pci 18.0
+			end # device pci 18.0
 
 			device pci 18.0 on end
 			device pci 18.0 on end
@@ -116,8 +116,6 @@ chip northbridge/amd/amdk8/root_complex
 			device pci 18.2 on end
 			device pci 18.3 on end
 		end
-
-
 	end #domain
 end
 
diff --git a/src/mainboard/digitallogic/adl855pc/devicetree.cb b/src/mainboard/digitallogic/adl855pc/devicetree.cb
index 3a9603b..58d1329 100644
--- a/src/mainboard/digitallogic/adl855pc/devicetree.cb
+++ b/src/mainboard/digitallogic/adl855pc/devicetree.cb
@@ -14,38 +14,38 @@ chip northbridge/intel/i855
 			register "enable_usb" = "0"
 			register "enable_native_ide" = "0"
 			chip superio/winbond/w83627hf # link 1
-                	        device pnp 2e.0 on      #  Floppy
-                	                 io 0x60 = 0x3f0
-                	                irq 0x70 = 6
-                	                drq 0x74 = 2
+				device pnp 2e.0 on	# Floppy
+					io 0x60 = 0x3f0
+					irq 0x70 = 6
+					drq 0x74 = 2
 				end
-                	        device pnp 2e.1 off     #  Parallel Port
-                	                 io 0x60 = 0x378
-                	                irq 0x70 = 7
+				device pnp 2e.1 off	# Parallel Port
+					io 0x60 = 0x378
+					irq 0x70 = 7
 				end
-                	        device pnp 2e.2 on      #  Com1
-                	                 io 0x60 = 0x3f8
-                	                irq 0x70 = 4
+				device pnp 2e.2 on	# Com1
+					io 0x60 = 0x3f8
+					irq 0x70 = 4
 				end
-                	        device pnp 2e.3 off     #  Com2
-                	                io 0x60 = 0x2f8
-                	                irq 0x70 = 3
+				device pnp 2e.3 off	# Com2
+					io 0x60 = 0x2f8
+					irq 0x70 = 3
 				end
-                	        device pnp 2e.5 on      #  Keyboard
-                	                 io 0x60 = 0x60
-                	                 io 0x62 = 0x64
-                	                irq 0x70 = 1
+				device pnp 2e.5 on	# Keyboard
+					io 0x60 = 0x60
+					io 0x62 = 0x64
+					irq 0x70 = 1
 					irq 0x72 = 12
 				end
-                	        device pnp 2e.6 off end #  CIR
-                	        device pnp 2e.7 off end #  GAME_MIDI_GIPO1
-                	        device pnp 2e.8 off end #  GPIO2
-                	        device pnp 2e.9 off end #  GPIO3
-                	        device pnp 2e.a off end #  ACPI
-                	        device pnp 2e.b on      #  HW Monitor
- 					 io 0x60 = 0x290
+				device pnp 2e.6 off end # CIR
+				device pnp 2e.7 off end # GAME_MIDI_GIPO1
+				device pnp 2e.8 off end # GPIO2
+				device pnp 2e.9 off end # GPIO3
+				device pnp 2e.a off end # ACPI
+				device pnp 2e.b on	# HW Monitor
+					io 0x60 = 0x290
 				end
-                	end
+			end
 		end
 	end
 	device cpu_cluster 0 on
diff --git a/src/mainboard/digitallogic/msm800sev/devicetree.cb b/src/mainboard/digitallogic/msm800sev/devicetree.cb
index 839b767..bec0412 100644
--- a/src/mainboard/digitallogic/msm800sev/devicetree.cb
+++ b/src/mainboard/digitallogic/msm800sev/devicetree.cb
@@ -1,9 +1,9 @@
 chip northbridge/amd/lx
-  	device domain 0 on
-    		device pci 1.0 on end
+	device domain 0 on
+		device pci 1.0 on end
 		device pci 1.1 on end
-      		chip southbridge/amd/cs5536
-			# IRQ 12 and 1 unmasked,  Keyboard and Mouse IRQs. OK
+		chip southbridge/amd/cs5536
+			# IRQ 12 and 1 unmasked, Keyboard and Mouse IRQs. OK
 			# SIRQ Mode = Active(Quiet) mode. Save power....
 			# Invert mask = IRQ 12 and 1 are active high. Keyboard and Mouse IRQs. OK
 			# How to get these? Boot linux and do this:
@@ -25,43 +25,43 @@ chip northbridge/amd/lx
 			register "com2_address" = "0x2F8"
 			register "com2_irq" = "3"
 			register "unwanted_vpci[0]" = "0"	# End of list has a zero
-        			device pci f.0 on	# ISA Bridge
+			device pci f.0 on	# ISA Bridge
 				chip superio/winbond/w83627hf
-					device pnp 2e.0 off #  Floppy
+					device pnp 2e.0 off # Floppy
 						io 0x60 = 0x3f0
 						irq 0x70 = 6
 						drq 0x74 = 2
 					end
-					device pnp 2e.1 off #  Parallel Port
+					device pnp 2e.1 off # Parallel Port
 						io 0x60 = 0x378
 						irq 0x70 = 7
 					end
-					device pnp 2e.2 on #  Com1
+					device pnp 2e.2 on # Com1
 						io 0x60 = 0x3f8
 						irq 0x70 = 4
 					end
-					device pnp 2e.3 on #  Com2
+					device pnp 2e.3 on # Com2
 						io 0x60 = 0x2f8
 						irq 0x70 = 3
 					end
-					device pnp 2e.5 on #  Keyboard
+					device pnp 2e.5 on # Keyboard
 						io 0x60 = 0x60
 						io 0x62 = 0x64
 						irq 0x70 = 1
 						irq 0x72 = 12
 					end
-					device pnp 2e.6 off #  CIR
+					device pnp 2e.6 off # CIR
 						io 0x60 = 0x100
 					end
-					device pnp 2e.7 off #  GAME_MIDI_GIPO1
+					device pnp 2e.7 off # GAME_MIDI_GIPO1
 						io 0x60 = 0x220
 						io 0x62 = 0x300
 						irq 0x70 = 9
 					end
-					device pnp 2e.8 off end #  GPIO2
-					device pnp 2e.9 off end #  GPIO3
-					device pnp 2e.a off end #  ACPI
-					device pnp 2e.b on #  HW Monitor
+					device pnp 2e.8 off end # GPIO2
+					device pnp 2e.9 off end # GPIO3
+					device pnp 2e.a off end # ACPI
+					device pnp 2e.b on # HW Monitor
 						io 0x60 = 0x290
 						irq 0x70 = 5
 					end
@@ -69,10 +69,10 @@ chip northbridge/amd/lx
 			end
 			device pci f.1 on end	# Flash controller
 			device pci f.2 on end	# IDE controller
-        			device pci f.3 on end 	# Audio
-        			device pci f.4 on end	# OHCI
+			device pci f.3 on end	# Audio
+			device pci f.4 on end	# OHCI
 			device pci f.5 on end	# EHCI
-      		end
+		end
 	end
 
 	# APIC cluster is late CPU init.
diff --git a/src/mainboard/eaglelion/5bcm/devicetree.cb b/src/mainboard/eaglelion/5bcm/devicetree.cb
index 33f1f90..5600b4d 100644
--- a/src/mainboard/eaglelion/5bcm/devicetree.cb
+++ b/src/mainboard/eaglelion/5bcm/devicetree.cb
@@ -1,52 +1,50 @@
 chip northbridge/amd/gx1
-  device domain 0 on
-    device pci 0.0 on end
-      chip southbridge/amd/cs5530
-        device pci 12.0 on
-          chip superio/nsc/pc97317
-            device pnp 2e.0 on		# Keyboard
-               io 0x60 = 0x60
-               io 0x62 = 0x64
-              irq 0x70 = 1
-            end
-            device pnp 2e.1 on		# Mouse
-              irq 0x70 = 12
-            end
-            device pnp 2e.2 on		# RTC
-               io 0x60 = 0x70
-              irq 0x70 = 8
-            end
-            device pnp 2e.3 off		# FDC
-            end
-            device pnp 2e.4 on		# Parallel Port
-               io 0x60 = 0x378
-              irq 0x70 = 7
-            end
-            device pnp 2e.5 on		# COM2
-               io 0x60 = 0x2f8
-              irq 0x70 = 3
-            end
-            device pnp 2e.6 on		# COM1
-               io 0x60 = 0x3f8
-              irq 0x70 = 4
-            end
-            device pnp 2e.7 on		# GPIO
-               io 0x60 = 0xe0
-            end
-            device pnp 2e.8 on		# Power Management
-               io 0x60 = 0xe800
-            end
-          end
-        device pci 12.1 off end		# SMI
-        device pci 12.2 on  end		# IDE
-        device pci 12.3 off end 	# Audio
-        device pci 12.4 off end		# VGA
-      end
-    end
-  end
-
-  chip cpu/amd/geode_gx1
-  end
+	device domain 0 on
+		device pci 0.0 on end
+			chip southbridge/amd/cs5530
+				device pci 12.0 on
+					chip superio/nsc/pc97317
+						device pnp 2e.0 on		# Keyboard
+							io 0x60 = 0x60
+							io 0x62 = 0x64
+							irq 0x70 = 1
+						end
+						device pnp 2e.1 on		# Mouse
+							irq 0x70 = 12
+						end
+						device pnp 2e.2 on		# RTC
+							io 0x60 = 0x70
+							irq 0x70 = 8
+						end
+						device pnp 2e.3 off		# FDC
+						end
+						device pnp 2e.4 on		# Parallel Port
+							io 0x60 = 0x378
+							irq 0x70 = 7
+						end
+						device pnp 2e.5 on		# COM2
+							io 0x60 = 0x2f8
+							irq 0x70 = 3
+						end
+						device pnp 2e.6 on		# COM1
+							io 0x60 = 0x3f8
+							irq 0x70 = 4
+						end
+						device pnp 2e.7 on		# GPIO
+							io 0x60 = 0xe0
+						end
+						device pnp 2e.8 on		# Power Management
+							io 0x60 = 0xe800
+						end
+					end
+				device pci 12.1 off end		# SMI
+				device pci 12.2 on end		# IDE
+				device pci 12.3 off end		# Audio
+				device pci 12.4 off end		# VGA
+			end
+		end
+	end
 
+	chip cpu/amd/geode_gx1
+	end
 end
-
diff --git a/src/mainboard/kontron/kt690/devicetree.cb b/src/mainboard/kontron/kt690/devicetree.cb
index 22bdae9..268356a 100644
--- a/src/mainboard/kontron/kt690/devicetree.cb
+++ b/src/mainboard/kontron/kt690/devicetree.cb
@@ -1,7 +1,7 @@
 #Define gpp_configuration,	A=0, B=1, C=2, D=3, E=4(default)
 #Define port_enable, (bit map): GFX(2,3), GPP(4,5,6,7)
 #Define gfx_dev2_dev3, 0: a link will never be established on Dev2 or Dev3,
-#					   1: the system allows a PCIE link to be established on Dev2 or Dev3.
+#			1: the system allows a PCIE link to be established on Dev2 or Dev3.
 #Define gfx_dual_slot, 0: single slot, 1: dual slot
 #Define gfx_lane_reversal, 0: disable lane reversal, 1: enable
 #Define gfx_tmds, 0: didn't support TMDS, 1: support
@@ -17,19 +17,19 @@ chip northbridge/amd/amdk8/root_complex
 	device domain 0 on
 		subsystemid 0x1488 0x6900 inherit
 		chip northbridge/amd/amdk8
-			device pci 18.0 on #  southbridge
+			device pci 18.0 on # southbridge
 				chip southbridge/amd/rs690
-					device pci 0.0 on end # HT  	0x7910
-					device pci 1.0 on  # Internal Graphics P2P bridge 0x7912
+					device pci 0.0 on end	# HT	0x7910
+					device pci 1.0 on	# Internal Graphics P2P bridge 0x7912
 						device pci 5.0 on end	# Internal Graphics 0x791F
 					end
-					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x7913
-					device pci 3.0 off end # PCIE P2P bridge	0x791b
-					device pci 4.0 on end # PCIE P2P bridge 0x7914
-					device pci 5.0 on end # PCIE P2P bridge 0x7915
-					device pci 6.0 on end # PCIE P2P bridge 0x7916
-					device pci 7.0 on end # PCIE P2P bridge 0x7917
-					device pci 8.0 off end # NB/SB Link P2P bridge
+					device pci 2.0 on end	# PCIE P2P bridge (external graphics) 0x7913
+					device pci 3.0 off end	# PCIE P2P bridge	0x791b
+					device pci 4.0 on end	# PCIE P2P bridge	0x7914
+					device pci 5.0 on end	# PCIE P2P bridge	0x7915
+					device pci 6.0 on end	# PCIE P2P bridge	0x7916
+					device pci 7.0 on end	# PCIE P2P bridge	0x7917
+					device pci 8.0 off end	# NB/SB Link P2P bridge
 					register "gpp_configuration" = "4"
 					register "port_enable" = "0xfc"
 					register "gfx_dev2_dev3" = "1"
@@ -40,15 +40,15 @@ chip northbridge/amd/amdk8/root_complex
 					register "gfx_reconfiguration" = "1"
 					register "gfx_link_width" = "0"
 				end
-				chip southbridge/amd/sb600 # it is under NB/SB Link, but on the same pri bus
-					device pci 12.0 on end # SATA  0x4380
-					device pci 13.0 on end # USB   0x4387
-					device pci 13.1 on end # USB   0x4388
-					device pci 13.2 on end # USB   0x4389
-					device pci 13.3 on end # USB   0x438a
-					device pci 13.4 on end # USB   0x438b
-					device pci 13.5 on end # USB 2 0x4386
-	 				device pci 14.0 on # SM        0x4385
+				chip southbridge/amd/sb600	# it is under NB/SB Link, but on the same pri bus
+					device pci 12.0 on end	# SATA	0x4380
+					device pci 13.0 on end	# USB	0x4387
+					device pci 13.1 on end	# USB	0x4388
+					device pci 13.2 on end	# USB	0x4389
+					device pci 13.3 on end	# USB	0x438a
+					device pci 13.4 on end	# USB	0x438b
+					device pci 13.5 on end	# USB 2	0x4386
+					device pci 14.0 on	# SM	0x4385
 						chip drivers/generic/generic #dimm 0-0-0
 							device i2c 50 on end
 						end
@@ -56,52 +56,52 @@ chip northbridge/amd/amdk8/root_complex
 							device i2c 51 on end
 						end
 					end # SM
-					device pci 14.1 on end # IDE    0x438c
-					device pci 14.2 on end # HDA    0x4383
-					device pci 14.3 on # LPC	0x438d
+					device pci 14.1 on end	# IDE	0x438c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on	# LPC	0x438d
 						chip superio/winbond/w83627dhg
-							device pnp 2e.0 off #  Floppy
+							device pnp 2e.0 off	# Floppy
 								io 0x60 = 0x3f0
 								irq 0x70 = 6
 								drq 0x74 = 2
 							end
-							device pnp 2e.1 off #  Parallel Port
+							device pnp 2e.1 off	# Parallel Port
 								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 2e.2 on #  Com1
+							device pnp 2e.2 on	# Com1
 								io 0x60 = 0x3f8
 								irq 0x70 = 4
 							end
-							device pnp 2e.3 on #  Com2
+							device pnp 2e.3 on	# Com2
 								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 2e.5 on #  Keyboard
+							device pnp 2e.5 on	# Keyboard
 								io 0x60 = 0x60
 								io 0x62 = 0x64
 								irq 0x70 = 1
 							end
-							#device pnp 2e.6 off #  SPI
+							#device pnp 2e.6 off	# SPI
 							#end
-							device pnp 2e.307 off #  GPIO 1
+							device pnp 2e.307 off	# GPIO 1
 							end
-							device pnp 2e.8 on #  WDTO#, PLED
+							device pnp 2e.8 on	# WDTO#, PLED
 							end
-							device pnp 2e.009 off #  GPIO2
+							device pnp 2e.009 off	# GPIO2
 							end
-							device pnp 2e.109 off #  GPIO3
+							device pnp 2e.109 off	# GPIO3
 							end
-							device pnp 2e.209 off #  GPIO4
+							device pnp 2e.209 off	# GPIO4
 							end
-							device pnp 2e.309 off #  GPIO5
+							device pnp 2e.309 off	# GPIO5
 							end
-							device pnp 2e.a off #  ACPI
+							device pnp 2e.a off	# ACPI
 							end
-							device pnp 2e.b on # HWM
+							device pnp 2e.b on	# HWM
 								io 0x60 = 0xa10
 							end
-							device pnp 2e.c off # PECI, SST
+							device pnp 2e.c off	# PECI, SST
 							end
 						end	#superio/winbond/w83627dhg
 						#chip superio/smsc/fdc37n972
@@ -113,7 +113,7 @@ chip northbridge/amd/amdk8/root_complex
 					device pci 14.6 on end # MCI 0x438e
 					register "hda_viddid" = "0x10ec0888"
 				end	#southbridge/amd/sb600
-			end #  device pci 18.0
+			end # device pci 18.0
 
 			device pci 18.0 on end
 			device pci 18.0 on end
diff --git a/src/mainboard/lippert/frontrunner-af/devicetree.cb b/src/mainboard/lippert/frontrunner-af/devicetree.cb
index f77c973..87c57ac 100644
--- a/src/mainboard/lippert/frontrunner-af/devicetree.cb
+++ b/src/mainboard/lippert/frontrunner-af/devicetree.cb
@@ -25,7 +25,7 @@ chip northbridge/amd/agesa/family14/root_complex
 	device domain 0 on
 		subsystemid 0x1022 0x1510 inherit
 			chip northbridge/amd/agesa/family14 # CPU side of HT root complex
-#					device pci 18.0 on #  northbridge
+#					device pci 18.0 on # northbridge
 					chip northbridge/amd/agesa/family14 # PCI side of HT root complex
 						device pci 0.0 on end # Root Complex
 						device pci 1.0 on end # Internal Graphics P2P bridge 0x980[2456]
@@ -76,19 +76,19 @@ chip northbridge/amd/agesa/family14/root_complex
 						end
 					end # smscsuperio
 				end #LPC
-				device pci 14.4 on  end # PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0}
+				device pci 14.4 on end # PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0}
 				device pci 14.5 off end # OHCI FS/LS USB
 				device pci 14.6 off end # Hudson-E1 GbE MAC: Broadcom BCM5785 (14E4:1699)
 				device pci 15.0 off end # PCIe PortA
 				device pci 15.1 off end # PCIe PortB
 				device pci 15.2 off end # PCIe PortC
 				device pci 15.3 off end # PCIe PortD
-				device pci 16.0 on  end # OHCI USB 10-13
-				device pci 16.2 on  end # EHCI USB 10-13
+				device pci 16.0 on end # OHCI USB 10-13
+				device pci 16.2 on end # EHCI USB 10-13
 				register "gpp_configuration" = "4" #1:1:1:1
 				register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 			end	#southbridge/amd/cimx/sb800
-#			end #  device pci 18.0
+#			end # device pci 18.0
 # These seem unnecessary
 			device pci 18.0 on end
 			device pci 18.1 on end
diff --git a/src/mainboard/lippert/toucan-af/devicetree.cb b/src/mainboard/lippert/toucan-af/devicetree.cb
index afd6b25..40b5e84 100644
--- a/src/mainboard/lippert/toucan-af/devicetree.cb
+++ b/src/mainboard/lippert/toucan-af/devicetree.cb
@@ -25,7 +25,7 @@ chip northbridge/amd/agesa/family14/root_complex
 	device domain 0 on
 		subsystemid 0x1022 0x1510 inherit
 			chip northbridge/amd/agesa/family14 # CPU side of HT root complex
-#					device pci 18.0 on #  northbridge
+#					device pci 18.0 on # northbridge
 					chip northbridge/amd/agesa/family14 # PCI side of HT root complex
 						device pci 0.0 on end # Root Complex
 						device pci 1.0 on end # Internal Graphics P2P bridge 0x980[2456]
@@ -85,16 +85,16 @@ chip northbridge/amd/agesa/family14/root_complex
 				device pci 14.4 off end # PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0}
 				device pci 14.5 off end # OHCI FS/LS USB
 				device pci 14.6 off end # Hudson-E1 GbE MAC: Broadcom BCM5785 (14E4:1699)
-				device pci 15.0 on  end # PCIe PortA
-				device pci 15.1 on  end # PCIe PortB
-				device pci 15.2 on  end # PCIe PortC
-				device pci 15.3 on  end # PCIe PortD
+				device pci 15.0 on end # PCIe PortA
+				device pci 15.1 on end # PCIe PortB
+				device pci 15.2 on end # PCIe PortC
+				device pci 15.3 on end # PCIe PortD
 				device pci 16.0 off end # OHCI USB 10-13
 				device pci 16.2 off end # EHCI USB 10-13
 				register "gpp_configuration" = "4" #1:1:1:1
 				register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 			end	#southbridge/amd/cimx/sb800
-#			end #  device pci 18.0
+#			end # device pci 18.0
 # These seem unnecessary
 			device pci 18.0 on end
 			device pci 18.1 on end
diff --git a/src/mainboard/mitac/6513wu/devicetree.cb b/src/mainboard/mitac/6513wu/devicetree.cb
index 9694fc4..d49bc20 100644
--- a/src/mainboard/mitac/6513wu/devicetree.cb
+++ b/src/mainboard/mitac/6513wu/devicetree.cb
@@ -18,67 +18,67 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-chip northbridge/intel/i82810           # Northbridge
-  device cpu_cluster 0 on              # APIC cluster
-    chip cpu/intel/socket_PGA370        # CPU
-      device lapic 0 on end              # APIC
-    end
-  end
-  device domain 0 on                # PCI domain
-    device pci 0.0 on end               # Graphics Memory Controller Hub (GMCH)
-    device pci 1.0 on end
-    chip southbridge/intel/i82801ax     # Southbridge
-      register "pirqa_routing" = "0x03"
-      register "pirqb_routing" = "0x05"
-      register "pirqc_routing" = "0x09"
-      register "pirqd_routing" = "0x0b"
+chip northbridge/intel/i82810			# Northbridge
+	device cpu_cluster 0 on			# APIC cluster
+		chip cpu/intel/socket_PGA370	# CPU
+			device lapic 0 on end	# APIC
+		end
+	end
+	device domain 0 on			# PCI domain
+		device pci 0.0 on end		# Graphics Memory Controller Hub (GMCH)
+		device pci 1.0 on end
+		chip southbridge/intel/i82801ax	# Southbridge
+			register "pirqa_routing" = "0x03"
+			register "pirqb_routing" = "0x05"
+			register "pirqc_routing" = "0x09"
+			register "pirqd_routing" = "0x0b"
 
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
 
-      device pci 1e.0 on                # PCI bridge
-        device pci 5.0 on end           # Audio controller (ESS ES1988)
-      end
-      device pci 1f.0 on                # ISA bridge
-        chip superio/smsc/smscsuperio   # Super I/O (SMSC LPC47U332)
-          device pnp 4e.0 on            # Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 4e.3 on            # Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-            drq 0x74 = 3
-          end
-          device pnp 4e.4 on            # COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 4e.5 on            # MIDI port (MPU-401)
-            io 0x60 = 0x330
-            irq 0x70 = 10
-          end
-          device pnp 4e.7 on            # PS/2 keyboard / mouse
-            io 0x60 = 0x60              # XXX: not relocatable
-            io 0x62 = 0x64              # XXX: not relocatable
-            irq 0x70 = 1                # PS/2 keyboard interrupt
-            irq 0x72 = 12               # PS/2 mouse interrupt
-          end
-          device pnp 4e.9 on            # Game port
-            io 0x60 = 0x201
-          end
-          device pnp 4e.a on            # Runtime registers
-            io 0x60 = 0x400
-          end
-          device pnp 4e.b off end       # SMBus
-        end
-      end
-      device pci 1f.1 on end            # IDE
-      device pci 1f.2 on end            # USB
-      device pci 1f.3 on end            # SMbus
-      device pci 1f.5 off end           # Audio controller
-      device pci 1f.6 off end           # Modem
-    end
-  end
+			device pci 1e.0 on			# PCI bridge
+				device pci 5.0 on end		# Audio controller (ESS ES1988)
+			end
+			device pci 1f.0 on			# ISA bridge
+				chip superio/smsc/smscsuperio	# Super I/O (SMSC LPC47U332)
+					device pnp 4e.0 on		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 4e.3 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+						drq 0x74 = 3
+					end
+					device pnp 4e.4 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 4e.5 on		# MIDI port (MPU-401)
+						io 0x60 = 0x330
+						irq 0x70 = 10
+					end
+					device pnp 4e.7 on		# PS/2 keyboard / mouse
+						io 0x60 = 0x60		# XXX: not relocatable
+						io 0x62 = 0x64		# XXX: not relocatable
+						irq 0x70 = 1		# PS/2 keyboard interrupt
+						irq 0x72 = 12		# PS/2 mouse interrupt
+					end
+					device pnp 4e.9 on		# Game port
+						io 0x60 = 0x201
+					end
+					device pnp 4e.a on		# Runtime registers
+						io 0x60 = 0x400
+					end
+					device pnp 4e.b off end		# SMBus
+				end
+			end
+			device pci 1f.1 on end		# IDE
+			device pci 1f.2 on end		# USB
+			device pci 1f.3 on end		# SMbus
+			device pci 1f.5 off end		# Audio controller
+			device pci 1f.6 off end		# Modem
+		end
+	end
 end
diff --git a/src/mainboard/nec/powermate2000/devicetree.cb b/src/mainboard/nec/powermate2000/devicetree.cb
index cd4aefe..9d13b51 100644
--- a/src/mainboard/nec/powermate2000/devicetree.cb
+++ b/src/mainboard/nec/powermate2000/devicetree.cb
@@ -1,54 +1,54 @@
-chip northbridge/intel/i82810			# Northbridge
-  device cpu_cluster 0 on			# APIC cluster
-    chip cpu/intel/socket_PGA370		# CPU
-      device lapic 0 on end			# APIC
-    end
-  end
-  device domain 0 on
-    device pci 0.0 on end			# Host bridge
-    device pci 1.0 off end			# Onboard video
-    chip southbridge/intel/i82801ax		# Southbridge
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
+chip northbridge/intel/i82810				# Northbridge
+	device cpu_cluster 0 on				# APIC cluster
+		chip cpu/intel/socket_PGA370		# CPU
+			device lapic 0 on end		# APIC
+		end
+	end
+	device domain 0 on
+		device pci 0.0 on end			# Host bridge
+		device pci 1.0 off end			# Onboard video
+		chip southbridge/intel/i82801ax		# Southbridge
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
 
-      device pci 1e.0 on end			# PCI bridge
-      device pci 1f.0 on			# ISA/LPC bridge
-        chip superio/smsc/smscsuperio		# Super I/O (SMSC LPC47B27x)
-          device pnp 2e.0 on			# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 2e.3 on			# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-            drq 0x74 = 3
-          end
-          device pnp 2e.4 on			# Com1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 2e.5 off end		# Com2 (N/A)
-          device pnp 2e.7 on			# PS/2 keyboard
-            irq 0x70 = 1
-            irq 0x72 = 0
-          end
-          device pnp 2e.9 off end		# Game port (N/A)
-          device pnp 2e.a on			# Power-management events (PME)
-            io 0x60 = 0x800
-          end
-          device pnp 2e.b on			# MIDI port
-            io 0x60 = 0x330
-            irq 0x70 = 5
-          end
-        end
-      end
-      device pci 1f.1 on end			# IDE
-      device pci 1f.2 on end			# USB
-      device pci 1f.3 on end			# SMBus
-      device pci 1f.5 on end			# AC'97 audio
-      device pci 1f.6 off end			# AC'97 modem (N/A)
-    end
-  end
+			device pci 1e.0 on end			# PCI bridge
+			device pci 1f.0 on			# ISA/LPC bridge
+				chip superio/smsc/smscsuperio		# Super I/O (SMSC LPC47B27x)
+					device pnp 2e.0 on			# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 2e.3 on			# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+						drq 0x74 = 3
+					end
+					device pnp 2e.4 on			# Com1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 2e.5 off end			# Com2 (N/A)
+					device pnp 2e.7 on			# PS/2 keyboard
+						irq 0x70 = 1
+						irq 0x72 = 0
+					end
+					device pnp 2e.9 off end			# Game port (N/A)
+					device pnp 2e.a on			# Power-management events (PME)
+						io 0x60 = 0x800
+					end
+					device pnp 2e.b on			# MIDI port
+						io 0x60 = 0x330
+						irq 0x70 = 5
+					end
+				end
+			end
+			device pci 1f.1 on end		# IDE
+			device pci 1f.2 on end		# USB
+			device pci 1f.3 on end		# SMBus
+			device pci 1f.5 on end		# AC'97 audio
+			device pci 1f.6 off end		# AC'97 modem (N/A)
+		end
+	end
 end
 
diff --git a/src/mainboard/nvidia/l1_2pvv/devicetree.cb b/src/mainboard/nvidia/l1_2pvv/devicetree.cb
index 5709db7..cefdd9c 100644
--- a/src/mainboard/nvidia/l1_2pvv/devicetree.cb
+++ b/src/mainboard/nvidia/l1_2pvv/devicetree.cb
@@ -1,180 +1,180 @@
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device cpu_cluster 0 on			# (L)APIC cluster
-    chip cpu/amd/socket_F			# CPU socket
-      device lapic 0 on end			# Local APIC of the CPU
-    end
-  end
-  device domain 0 on			# PCI domain
-    subsystemid 0x1022 0x2b80 inherit
-    chip northbridge/amd/amdk8			# Northbridge / RAM controller
-      device pci 18.0 on			# Link 0 == LDT 0
-        chip southbridge/nvidia/mcp55		# Southbridge
-          device pci 0.0 on end			# HT
-          device pci 1.0 on			# LPC
-            chip superio/winbond/w83627ehg	# Super I/O
-              device pnp 2e.0 off		# Floppy
-                io 0x60 = 0x3f0
-                irq 0x70 = 6
-                drq 0x74 = 2
-              end
-              device pnp 2e.1 off		# Parallel port
-                io 0x60 = 0x378
-                irq 0x70 = 7
-              end
-              device pnp 2e.2 on		# Com1
-                io 0x60 = 0x3f8
-                irq 0x70 = 4
-              end
-              device pnp 2e.3 off		# Com2
-                io 0x60 = 0x2f8
-                irq 0x70 = 3
-              end
-              device pnp 2e.5 on		# PS/2 keyboard & mouse
-                io 0x60 = 0x60
-                io 0x62 = 0x64
-                irq 0x70 = 1
-                irq 0x72 = 12
-              end
-              device pnp 2e.106 off		# Serial flash interface (SFI)
-                io 0x60 = 0x100
-              end
-              device pnp 2e.007 off		# GPIO 1
-              end
-              device pnp 2e.107 off		# Game port
-                io 0x60 = 0x220
-              end
-              device pnp 2e.207 off		# MIDI
-                io 0x62 = 0x300
-                irq 0x70 = 9
-              end
-              device pnp 2e.307 off		# GPIO 6
-              end
-              device pnp 2e.8 off		# WDTO#, PLED
-              end
-              device pnp 2e.009 off		# GPIO 2
-              end
-              device pnp 2e.109 off		# GPIO 3
-              end
-              device pnp 2e.209 off		# GPIO 4
-              end
-              device pnp 2e.309 off		# GPIO 5
-              end
-              device pnp 2e.a off end		# ACPI
-              device pnp 2e.b on		# Hardware monitor
-                io 0x60 = 0x290
-                irq 0x70 = 5
-              end
-            end
-          end
-          device pci 1.1 on			# SM 0
-            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
-            chip drivers/generic/generic	# DIMM 1-0-0
-              device i2c 54 on end
-            end
-            chip drivers/generic/generic	# DIMM 1-0-1
-              device i2c 55 on end
-            end
-            chip drivers/generic/generic	# DIMM 1-1-0
-              device i2c 56 on end
-            end
-            chip drivers/generic/generic	# DIMM 1-1-1
-              device i2c 57 on end
-            end
-          end
-          device pci 1.1 on			# SM 1
-            # PCI device SMBus address will
-            # depend on addon PCI device, do
-            # we need to scan_smbus_bus?
-            # chip drivers/generic/generic	# PCIXA slot 1
-            #   device i2c 50 on end
-            # end
-            # chip drivers/generic/generic	# PCIXB slot 1
-            #   device i2c 51 on end
-            # end
-            # chip drivers/generic/generic	# PCIXB slot 2
-            #   device i2c 52 on end
-            # end
-            # chip drivers/generic/generic	# PCI slot 1
-            #   device i2c 53 on end
-            # end
-            # chip drivers/generic/generic	# Master MCP55 PCI-E
-            #   device i2c 54 on end
-            # end
-            # chip drivers/generic/generic	# Slave MCP55 PCI-E
-            #   device i2c 55 on end
-            # end
-            chip drivers/generic/generic	# MAC EEPROM
-              device i2c 51 on end
-            end
-          end
-          device pci 2.0 on end			# USB 1.1
-          device pci 2.1 on end			# USB 2
-          device pci 4.0 on end			# IDE
-          device pci 5.0 on end			# SATA 0
-          device pci 5.1 on end			# SATA 1
-          device pci 5.2 on end			# SATA 2
-          device pci 6.0 on end			# PCI
-          device pci 6.1 on end			# AZA
-          device pci 8.0 on end			# NIC
-          device pci 9.0 on end			# NIC
-          device pci a.0 on end			# PCI E 5
-          device pci b.0 off end		# PCI E 4
-          device pci c.0 off end		# PCI E 3
-          device pci d.0 on end			# PCI E 2
-          device pci e.0 off end		# PCI E 1
-          device pci f.0 on end			# PCI E 0
-          register "ide0_enable" = "1"
-          register "sata0_enable" = "1"
-          register "sata1_enable" = "1"
-          # 1: SMBus under 2e.8, 2: SM0 3: SM1
-          register "mac_eeprom_smbus" = "3"
-          register "mac_eeprom_addr" = "0x51"
-        end
-      end
-      device pci 18.0 on end			# Link 1
-      device pci 18.0 on			# Link 2 == LDT 2
-        chip southbridge/nvidia/mcp55		# Southbridge
-          device pci 0.0 on end			# HT
-          device pci 1.0 on end			# LPC
-          device pci 1.1 on end			# SM 0
-          device pci 2.0 off end		# USB 1.1
-          device pci 2.1 off end		# USB 2
-          device pci 4.0 off end		# IDE
-          device pci 5.0 on end			# SATA 0
-          device pci 5.1 on end			# SATA 1
-          device pci 5.2 on end			# SATA 2
-          device pci 6.0 off end		# PCI
-          device pci 6.1 off end		# AZA
-          device pci 8.0 on end			# NIC
-          device pci 9.0 on end			# NIC
-          device pci a.0 on end			# PCI E 5
-          device pci b.0 off end		# PCI E 4
-          device pci c.0 off end		# PCI E 3
-          device pci d.0 on end			# PCI E 2
-          device pci e.0 on end			# PCI E 1
-          device pci f.0 on end			# PCI E 0
-          register "ide0_enable" = "1"
-          register "sata0_enable" = "1"
-          register "sata1_enable" = "1"
-          # 1: SMBus under 2e.8, 2: SM0 3: SM1
-          register "mac_eeprom_smbus" = "3"
-          register "mac_eeprom_addr" = "0x51"
-        end
-      end
-      device pci 18.1 on end
-      device pci 18.2 on end
-      device pci 18.3 on end
-    end
-  end
+	device cpu_cluster 0 on			# (L)APIC cluster
+		chip cpu/amd/socket_F			# CPU socket
+			device lapic 0 on end			# Local APIC of the CPU
+		end
+	end
+	device domain 0 on			# PCI domain
+		subsystemid 0x1022 0x2b80 inherit
+		chip northbridge/amd/amdk8			# Northbridge / RAM controller
+			device pci 18.0 on			# Link 0 == LDT 0
+				chip southbridge/nvidia/mcp55		# Southbridge
+					device pci 0.0 on end			# HT
+					device pci 1.0 on			# LPC
+						chip superio/winbond/w83627ehg	# Super I/O
+							device pnp 2e.0 off		# Floppy
+								io 0x60 = 0x3f0
+								irq 0x70 = 6
+								drq 0x74 = 2
+							end
+							device pnp 2e.1 off		# Parallel port
+								io 0x60 = 0x378
+								irq 0x70 = 7
+							end
+							device pnp 2e.2 on		# Com1
+								io 0x60 = 0x3f8
+								irq 0x70 = 4
+							end
+							device pnp 2e.3 off		# Com2
+								io 0x60 = 0x2f8
+								irq 0x70 = 3
+							end
+							device pnp 2e.5 on		# PS/2 keyboard & mouse
+								io 0x60 = 0x60
+								io 0x62 = 0x64
+								irq 0x70 = 1
+								irq 0x72 = 12
+							end
+							device pnp 2e.106 off		# Serial flash interface (SFI)
+								io 0x60 = 0x100
+							end
+							device pnp 2e.007 off		# GPIO 1
+							end
+							device pnp 2e.107 off		# Game port
+								io 0x60 = 0x220
+							end
+							device pnp 2e.207 off		# MIDI
+								io 0x62 = 0x300
+								irq 0x70 = 9
+							end
+							device pnp 2e.307 off		# GPIO 6
+							end
+							device pnp 2e.8 off		# WDTO#, PLED
+							end
+							device pnp 2e.009 off		# GPIO 2
+							end
+							device pnp 2e.109 off		# GPIO 3
+							end
+							device pnp 2e.209 off		# GPIO 4
+							end
+							device pnp 2e.309 off		# GPIO 5
+							end
+							device pnp 2e.a off end		# ACPI
+							device pnp 2e.b on		# Hardware monitor
+								io 0x60 = 0x290
+								irq 0x70 = 5
+							end
+						end
+					end
+					device pci 1.1 on			# SM 0
+						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
+						chip drivers/generic/generic	# DIMM 1-0-0
+							device i2c 54 on end
+						end
+						chip drivers/generic/generic	# DIMM 1-0-1
+							device i2c 55 on end
+						end
+						chip drivers/generic/generic	# DIMM 1-1-0
+							device i2c 56 on end
+						end
+						chip drivers/generic/generic	# DIMM 1-1-1
+							device i2c 57 on end
+						end
+					end
+					device pci 1.1 on			# SM 1
+						# PCI device SMBus address will
+						# depend on addon PCI device, do
+						# we need to scan_smbus_bus?
+						# chip drivers/generic/generic	# PCIXA slot 1
+						#	 device i2c 50 on end
+						# end
+						# chip drivers/generic/generic	# PCIXB slot 1
+						#	 device i2c 51 on end
+						# end
+						# chip drivers/generic/generic	# PCIXB slot 2
+						#	 device i2c 52 on end
+						# end
+						# chip drivers/generic/generic	# PCI slot 1
+						#	 device i2c 53 on end
+						# end
+						# chip drivers/generic/generic	# Master MCP55 PCI-E
+						#	 device i2c 54 on end
+						# end
+						# chip drivers/generic/generic	# Slave MCP55 PCI-E
+						#	 device i2c 55 on end
+						# end
+						chip drivers/generic/generic	# MAC EEPROM
+							device i2c 51 on end
+						end
+					end
+					device pci 2.0 on end			# USB 1.1
+					device pci 2.1 on end			# USB 2
+					device pci 4.0 on end			# IDE
+					device pci 5.0 on end			# SATA 0
+					device pci 5.1 on end			# SATA 1
+					device pci 5.2 on end			# SATA 2
+					device pci 6.0 on end			# PCI
+					device pci 6.1 on end			# AZA
+					device pci 8.0 on end			# NIC
+					device pci 9.0 on end			# NIC
+					device pci a.0 on end			# PCI E 5
+					device pci b.0 off end		# PCI E 4
+					device pci c.0 off end		# PCI E 3
+					device pci d.0 on end			# PCI E 2
+					device pci e.0 off end		# PCI E 1
+					device pci f.0 on end			# PCI E 0
+					register "ide0_enable" = "1"
+					register "sata0_enable" = "1"
+					register "sata1_enable" = "1"
+					# 1: SMBus under 2e.8, 2: SM0 3: SM1
+					register "mac_eeprom_smbus" = "3"
+					register "mac_eeprom_addr" = "0x51"
+				end
+			end
+			device pci 18.0 on end			# Link 1
+			device pci 18.0 on			# Link 2 == LDT 2
+				chip southbridge/nvidia/mcp55		# Southbridge
+					device pci 0.0 on end			# HT
+					device pci 1.0 on end			# LPC
+					device pci 1.1 on end			# SM 0
+					device pci 2.0 off end		# USB 1.1
+					device pci 2.1 off end		# USB 2
+					device pci 4.0 off end		# IDE
+					device pci 5.0 on end			# SATA 0
+					device pci 5.1 on end			# SATA 1
+					device pci 5.2 on end			# SATA 2
+					device pci 6.0 off end		# PCI
+					device pci 6.1 off end		# AZA
+					device pci 8.0 on end			# NIC
+					device pci 9.0 on end			# NIC
+					device pci a.0 on end			# PCI E 5
+					device pci b.0 off end		# PCI E 4
+					device pci c.0 off end		# PCI E 3
+					device pci d.0 on end			# PCI E 2
+					device pci e.0 on end			# PCI E 1
+					device pci f.0 on end			# PCI E 0
+					register "ide0_enable" = "1"
+					register "sata0_enable" = "1"
+					register "sata1_enable" = "1"
+					# 1: SMBus under 2e.8, 2: SM0 3: SM1
+					register "mac_eeprom_smbus" = "3"
+					register "mac_eeprom_addr" = "0x51"
+				end
+			end
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
+	end
 end
diff --git a/src/mainboard/rca/rm4100/devicetree.cb b/src/mainboard/rca/rm4100/devicetree.cb
index d39126c..2fff89f 100644
--- a/src/mainboard/rca/rm4100/devicetree.cb
+++ b/src/mainboard/rca/rm4100/devicetree.cb
@@ -1,68 +1,67 @@
-chip northbridge/intel/i82830		# Northbridge
-  device cpu_cluster 0 on		# APIC cluster
-    chip cpu/intel/socket_mFCBGA479	# Mobile Celeron Micro-FCBGA Socket 479
-      device lapic 0 on end		# APIC
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 2.0 on end		# VGA (Intel 82830 CGC)
-    chip southbridge/intel/i82801dx	# Southbridge
-      register "pirqa_routing" = "0x05"
-      register "pirqb_routing" = "0x06"
-      register "pirqc_routing" = "0x07"
-      register "pirqd_routing" = "0x09"
-      register "pirqe_routing" = "0x0a"
-      register "pirqf_routing" = "0x80"
-      register "pirqg_routing" = "0x80"
-      register "pirqh_routing" = "0x0b"
+chip northbridge/intel/i82830			# Northbridge
+	device cpu_cluster 0 on			# APIC cluster
+		chip cpu/intel/socket_mFCBGA479	# Mobile Celeron Micro-FCBGA Socket 479
+			device lapic 0 on end	# APIC
+		end
+	end
+	device domain 0 on			# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 2.0 on end		# VGA (Intel 82830 CGC)
+		chip southbridge/intel/i82801dx	# Southbridge
+			register "pirqa_routing" = "0x05"
+			register "pirqb_routing" = "0x06"
+			register "pirqc_routing" = "0x07"
+			register "pirqd_routing" = "0x09"
+			register "pirqe_routing" = "0x0a"
+			register "pirqf_routing" = "0x80"
+			register "pirqg_routing" = "0x80"
+			register "pirqh_routing" = "0x0b"
 
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
 
-      device pci 1d.0 on end		# USB UHCI Controller #1
-      device pci 1d.1 on end		# USB UHCI Controller #2
-      device pci 1d.2 on end		# USB UHCI Controller #3
-      device pci 1d.7 on end		# USB2 EHCI Controller
-      device pci 1e.0 on end		# PCI bridge
-      device pci 1f.0 on		# ISA/LPC bridge
-        chip superio/smsc/smscsuperio	# Super I/O
-          device pnp 2e.0 off		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 2e.3 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-            drq 0x74 = 4
-          end
-          device pnp 2e.4 on		# Com1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 2e.5 on		# Com2 / IR
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 2e.7 on		# PS/2 keyboard/mouse
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1		# Keyboard interrupt
-            irq 0x72 = 12		# Mouse interrupt
-          end
-          device pnp 2e.9 off end	# Game port
-          device pnp 2e.a on		# PME
-            io 0x60 = 0x800
-          end
-          device pnp 2e.b off end	# MPU-401
-        end
-      end
-      device pci 1f.1 on end		# IDE
-      device pci 1f.3 on end		# SMBus
-      device pci 1f.5 on end		# AC'97 audio
-      device pci 1f.6 on end		# AC'97 modem
-    end
-  end
+			device pci 1d.0 on end		# USB UHCI Controller #1
+			device pci 1d.1 on end		# USB UHCI Controller #2
+			device pci 1d.2 on end		# USB UHCI Controller #3
+			device pci 1d.7 on end		# USB2 EHCI Controller
+			device pci 1e.0 on end		# PCI bridge
+			device pci 1f.0 on		# ISA/LPC bridge
+				chip superio/smsc/smscsuperio	# Super I/O
+					device pnp 2e.0 off		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 2e.3 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+						drq 0x74 = 4
+					end
+					device pnp 2e.4 on		# Com1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 2e.5 on		# Com2 / IR
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 2e.7 on		# PS/2 keyboard/mouse
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1		# Keyboard interrupt
+						irq 0x72 = 12		# Mouse interrupt
+					end
+					device pnp 2e.9 off end		# Game port
+					device pnp 2e.a on		# PME
+						io 0x60 = 0x800
+					end
+					device pnp 2e.b off end		# MPU-401
+				end
+			end
+			device pci 1f.1 on end	# IDE
+			device pci 1f.3 on end	# SMBus
+			device pci 1f.5 on end	# AC'97 audio
+			device pci 1f.6 on end	# AC'97 modem
+		end
+	end
 end
-
diff --git a/src/mainboard/via/epia-cn/devicetree.cb b/src/mainboard/via/epia-cn/devicetree.cb
index 028cb88..35d3941 100644
--- a/src/mainboard/via/epia-cn/devicetree.cb
+++ b/src/mainboard/via/epia-cn/devicetree.cb
@@ -1,61 +1,61 @@
 chip northbridge/via/cn700			# Northbridge
-  device domain 0 on			# PCI domain
-    device pci 0.0 on end			# AGP Bridge
-    device pci 0.1 on end			# Error Reporting
-    device pci 0.2 on end			# Host Bus Control
-    device pci 0.3 on end			# Memory Controller
-    device pci 0.4 on end			# Power Management
-    device pci 0.7 on end			# V-Link Controller
-    device pci 1.0 on end			# PCI Bridge
-    chip southbridge/via/vt8237r		# Southbridge
-      # Enable both IDE channels.
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      # Both cables are 40pin.
-      register "ide0_80pin_cable" = "0"
-      register "ide1_80pin_cable" = "0"
-      device pci f.0 on end			# IDE
-      register "fn_ctrl_lo" = "0x80"
-      register "fn_ctrl_hi" = "0x1d"
-      device pci 10.0 on end			# OHCI
-      device pci 10.1 on end			# OHCI
-      device pci 10.2 on end			# OHCI
-      device pci 10.3 on end			# OHCI
-      device pci 10.4 on end			# EHCI
-      device pci 10.5 on end			# UDCI
-      device pci 11.0 on			# Southbridge LPC
-        chip superio/via/vt1211			# Super I/O
-          device pnp 2e.0 off			# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 2e.1 on			# Parallel Port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-            drq 0x74 = 3
-          end
-          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.b on			# HWM
-            io 0x60 = 0xec00
-          end
-        end
-      end
-      device pci 11.5 on end			# AC'97 audio
-      # device pci 11.6 off end			# AC'97 Modem
-      device pci 12.0 on end			# Ethernet
-    end
-  end
-  device cpu_cluster 0 on			# APIC cluster
-    chip cpu/via/c7			# VIA C7
-      device lapic 0 on end			# APIC
-    end
-  end
+	device domain 0 on			# PCI domain
+		device pci 0.0 on end			# AGP Bridge
+		device pci 0.1 on end			# Error Reporting
+		device pci 0.2 on end			# Host Bus Control
+		device pci 0.3 on end			# Memory Controller
+		device pci 0.4 on end			# Power Management
+		device pci 0.7 on end			# V-Link Controller
+		device pci 1.0 on end			# PCI Bridge
+		chip southbridge/via/vt8237r		# Southbridge
+			# Enable both IDE channels.
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			# Both cables are 40pin.
+			register "ide0_80pin_cable" = "0"
+			register "ide1_80pin_cable" = "0"
+			device pci f.0 on end			# IDE
+			register "fn_ctrl_lo" = "0x80"
+			register "fn_ctrl_hi" = "0x1d"
+			device pci 10.0 on end			# OHCI
+			device pci 10.1 on end			# OHCI
+			device pci 10.2 on end			# OHCI
+			device pci 10.3 on end			# OHCI
+			device pci 10.4 on end			# EHCI
+			device pci 10.5 on end			# UDCI
+			device pci 11.0 on			# Southbridge LPC
+				chip superio/via/vt1211			# Super I/O
+					device pnp 2e.0 off		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 2e.1 on		# Parallel Port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+						drq 0x74 = 3
+					end
+					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.b on		# HWM
+						io 0x60 = 0xec00
+					end
+				end
+			end
+			device pci 11.5 on end		# AC'97 audio
+			# device pci 11.6 off end	# AC'97 Modem
+			device pci 12.0 on end		# Ethernet
+		end
+	end
+	device cpu_cluster 0 on			# APIC cluster
+		chip cpu/via/c7			# VIA C7
+			device lapic 0 on end	# APIC
+		end
+	end
 end
diff --git a/src/mainboard/via/epia-n/devicetree.cb b/src/mainboard/via/epia-n/devicetree.cb
index d17b96d..e3257cc 100644
--- a/src/mainboard/via/epia-n/devicetree.cb
+++ b/src/mainboard/via/epia-n/devicetree.cb
@@ -21,81 +21,81 @@
 
 chip northbridge/via/cn400			# Northbridge
 
-  device cpu_cluster 0 on			# APIC cluster
-    chip cpu/via/c3			# VIA C3
-      device lapic 0 on end			# APIC
-    end
-  end
+	device cpu_cluster 0 on			# APIC cluster
+		chip cpu/via/c3			# VIA C3
+			device lapic 0 on end	# APIC
+		end
+	end
 
-  device domain 0 on			# PCI domain
-    device pci 0.0 on end			# AGP Bridge
-    device pci 0.1 on end			# Error Reporting
-    device pci 0.2 on end			# Host Bus Control
-    device pci 0.3 on end			# Memory Controller
-    device pci 0.4 on end			# Power Management
-    device pci 0.7 on end			# V-Link Controller
-    device pci 1.0 on end			# PCI Bridge
-    chip southbridge/via/vt8237r		# Southbridge
-      # Enable both IDE channels.
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      # Both cables are 40pin.
-      register "ide0_80pin_cable" = "0"
-      register "ide1_80pin_cable" = "0"
-      device pci f.0 on end			# IDE/SATA
-	  device pci f.1 on end			# IDE
-      register "fn_ctrl_lo" = "0xC0"    # Disable AC/MC97
-      register "fn_ctrl_hi" = "0x9d"    # Disable USB Direct & LAN Gating
-      device pci 10.0 on end			# OHCI
-      device pci 10.1 on end			# OHCI
-      device pci 10.2 on end			# OHCI
-      device pci 10.3 on end			# OHCI
-      device pci 10.4 on end			# EHCI
-      device pci 10.5 off end			# USB Direct
-      device pci 11.0 on			# Southbridge LPC
-        chip superio/winbond/w83697hf		# Super I/O
-          device pnp 2e.0 off			# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 2e.1 off			# Parallel Port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-            drq 0x74 = 3
-          end
-          device pnp 2e.2 on			# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 2e.3 off			# COM2
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 2e.6 off			# IR Port
-            io 0x60 = 0x000
-          end
-          device pnp 2e.7 off			# GPIO 1
-            io 0x60 = 0x201			# 0x201
-          end
-          device pnp 2e.8 off			# GPIO 5
-            io 0x60 = 0x330			# 0x330
-          end
-          device pnp 2e.9 off			# GPIO 2, 3,and 4
-            io 0x60 = 0x000			#
-          end
-          device pnp 2e.a off			# ACPI
-            io 0x60 = 0x000			#
-          end
-          device pnp 2e.b on			# HWM
-            io 0x60 = 0x290
-			irq 0x70 = 0
-          end
-        end
-      end
-      device pci 11.5 off end			# AC'97 audio
-      device pci 11.6 off end			# AC'97 Modem
-      device pci 12.0 on end			# Ethernet
-    end
-  end
+	device domain 0 on			# PCI domain
+		device pci 0.0 on end			# AGP Bridge
+		device pci 0.1 on end			# Error Reporting
+		device pci 0.2 on end			# Host Bus Control
+		device pci 0.3 on end			# Memory Controller
+		device pci 0.4 on end			# Power Management
+		device pci 0.7 on end			# V-Link Controller
+		device pci 1.0 on end			# PCI Bridge
+		chip southbridge/via/vt8237r		# Southbridge
+			# Enable both IDE channels.
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			# Both cables are 40pin.
+			register "ide0_80pin_cable" = "0"
+			register "ide1_80pin_cable" = "0"
+			device pci f.0 on end			# IDE/SATA
+		device pci f.1 on end				# IDE
+			register "fn_ctrl_lo" = "0xC0"		# Disable AC/MC97
+			register "fn_ctrl_hi" = "0x9d"		# Disable USB Direct & LAN Gating
+			device pci 10.0 on end			# OHCI
+			device pci 10.1 on end			# OHCI
+			device pci 10.2 on end			# OHCI
+			device pci 10.3 on end			# OHCI
+			device pci 10.4 on end			# EHCI
+			device pci 10.5 off end			# USB Direct
+			device pci 11.0 on			# Southbridge LPC
+				chip superio/winbond/w83697hf		# Super I/O
+					device pnp 2e.0 off			# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 2e.1 off			# Parallel Port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+						drq 0x74 = 3
+					end
+					device pnp 2e.2 on			# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 2e.3 off			# COM2
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 2e.6 off			# IR Port
+						io 0x60 = 0x000
+					end
+					device pnp 2e.7 off			# GPIO 1
+						io 0x60 = 0x201			# 0x201
+					end
+					device pnp 2e.8 off			# GPIO 5
+						io 0x60 = 0x330			# 0x330
+					end
+					device pnp 2e.9 off			# GPIO 2, 3,and 4
+						io 0x60 = 0x000			#
+					end
+					device pnp 2e.a off			# ACPI
+						io 0x60 = 0x000			#
+					end
+					device pnp 2e.b on			# HWM
+						io 0x60 = 0x290
+						irq 0x70 = 0
+					end
+				end
+			end
+			device pci 11.5 off end		# AC'97 audio
+			device pci 11.6 off end		# AC'97 Modem
+			device pci 12.0 on end		# Ethernet
+		end
+	end
 end
diff --git a/src/mainboard/winent/mb6047/devicetree.cb b/src/mainboard/winent/mb6047/devicetree.cb
index 81f5aae..4895d71 100644
--- a/src/mainboard/winent/mb6047/devicetree.cb
+++ b/src/mainboard/winent/mb6047/devicetree.cb
@@ -1,120 +1,120 @@
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device cpu_cluster 0 on			# (L)APIC cluster
-    chip cpu/amd/socket_940			# CPU socket
-      device lapic 0 on end			# Local APIC of the CPU
-    end
-  end
-  device domain 0 on			# PCI domain
-    subsystemid 0x10de 0xcb84 inherit
-    chip northbridge/amd/amdk8			# Northbridge / RAM controller
-      device pci 18.0 on			# Link 0 == LDT 0
-        chip southbridge/nvidia/ck804		# Southbridge
-          device pci 0.0 on end			# HT
-          device pci 1.0 on			# LPC
-            chip superio/winbond/w83627thg	# Super I/O
-              device pnp 2e.0 off		# Floppy
-                io 0x60 = 0x3f0
-                irq 0x70 = 6
-                drq 0x74 = 2
-              end
-              device pnp 2e.1 off		# Parallel port
-                io 0x60 = 0x378
-                irq 0x70 = 7
-              end
-              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		# PS/2 keyboard & mouse
-                io 0x60 = 0x60
-                io 0x62 = 0x64
-                irq 0x70 = 1
-                irq 0x72 = 12
-              end
-              device pnp 2e.6 off end		# Consumer IR
-              device pnp 2e.7 off end		# Game port, MIDI, GPIO1
-              device pnp 2e.8 off end		# GPIO2
-              device pnp 2e.9 off end		# GPIO3
-              device pnp 2e.a off end		# ACPI
-              device pnp 2e.b on		# Hardware monitor
-                io 0x60 = 0x290
-                irq 0x70 = 0
-              end
-            end
-          end
-          device pci 1.1 on			# SM 0
-            # 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
-            # chip drivers/generic/generic	# DIMM 1-0-0
-            #   device i2c 54 on end
-            # end
-            # chip drivers/generic/generic	# DIMM 1-0-1
-            #   device i2c 55 on end
-            # end
-            # chip drivers/generic/generic	# DIMM 1-1-0
-            #   device i2c 56 on end
-            # end
-            # chip drivers/generic/generic	# DIMM 1-1-1
-            #   device i2c 57 on end
-            # end
-          end
-          # device pci 1.1 on			# SM 1
-          #   chip drivers/i2c/adm1027		# ADT7463A CPU0 temp, SYS FAN 2/3/4
-          #     device i2c 2d on end
-          #   end
-          #   chip drivers/i2c/adm1027		# ADT7463A CPU1 temp, CPU0/1 FAN , SYS FAN 1/5
-          #     device i2c 2e on end
-          #   end
-          #   chip drivers/generic/generic	# Winbond HWM 0x54 CPU0/1 VRM temp, SYSFAN 6/7, SB FAN
-          #     device i2c 2a on end
-          #   end
-          #   chip drivers/generic/generic	# Winbond HWM 0x92
-          #     device i2c 49 on end
-          #   end
-          #   chip drivers/generic/generic	# Winbond HWM 0x94
-          #     device i2c 4a on end
-          #   end
-          # end
-          device pci 2.0 on end			# USB 1.1
-          device pci 2.1 on end			# USB 2
-          device pci 4.0 on end			# ACI
-          device pci 4.1 off end		# MCI
-          device pci 6.0 on end			# IDE
-          device pci 7.0 on end			# SATA 1
-          device pci 8.0 on end			# SATA 0
-          device pci 9.0 on			# PCI
-          #  device pci 6.0 on end
-          end
-          device pci a.0 on end			# NIC
-          device pci b.0 on end			# PCI E 3
-          device pci c.0 on end			# PCI E 2
-          device pci d.0 on end			# PCI E 1
-          device pci e.0 on end			# PCI E 0
-          register "ide0_enable" = "1"
-          register "ide1_enable" = "0"
-          register "sata0_enable" = "1"
-          register "sata1_enable" = "1"
-        end
-      end
-      device pci 18.0 on end			# Link 1
-      device pci 18.0 on end			# Link 2 == LDT 2
-      device pci 18.1 on end
-      device pci 18.2 on end
-      device pci 18.3 on end
-    end
-  end
+	device cpu_cluster 0 on			# (L)APIC cluster
+		chip cpu/amd/socket_940			# CPU socket
+			device lapic 0 on end			# Local APIC of the CPU
+		end
+	end
+	device domain 0 on			# PCI domain
+		subsystemid 0x10de 0xcb84 inherit
+		chip northbridge/amd/amdk8			# Northbridge / RAM controller
+			device pci 18.0 on			# Link 0 == LDT 0
+				chip southbridge/nvidia/ck804		# Southbridge
+					device pci 0.0 on end			# HT
+					device pci 1.0 on			# LPC
+						chip superio/winbond/w83627thg	# Super I/O
+							device pnp 2e.0 off		# Floppy
+								io 0x60 = 0x3f0
+								irq 0x70 = 6
+								drq 0x74 = 2
+							end
+							device pnp 2e.1 off		# Parallel port
+								io 0x60 = 0x378
+								irq 0x70 = 7
+							end
+							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		# PS/2 keyboard & mouse
+								io 0x60 = 0x60
+								io 0x62 = 0x64
+								irq 0x70 = 1
+								irq 0x72 = 12
+							end
+							device pnp 2e.6 off end		# Consumer IR
+							device pnp 2e.7 off end		# Game port, MIDI, GPIO1
+							device pnp 2e.8 off end		# GPIO2
+							device pnp 2e.9 off end		# GPIO3
+							device pnp 2e.a off end		# ACPI
+							device pnp 2e.b on		# Hardware monitor
+								io 0x60 = 0x290
+								irq 0x70 = 0
+							end
+						end
+					end
+					device pci 1.1 on			# SM 0
+						# 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
+						# chip drivers/generic/generic	# DIMM 1-0-0
+						#	 device i2c 54 on end
+						# end
+						# chip drivers/generic/generic	# DIMM 1-0-1
+						#	 device i2c 55 on end
+						# end
+						# chip drivers/generic/generic	# DIMM 1-1-0
+						#	 device i2c 56 on end
+						# end
+						# chip drivers/generic/generic	# DIMM 1-1-1
+						#	 device i2c 57 on end
+						# end
+					end
+					# device pci 1.1 on			# SM 1
+					#	 chip drivers/i2c/adm1027		# ADT7463A CPU0 temp, SYS FAN 2/3/4
+					#		 device i2c 2d on end
+					#	 end
+					#	 chip drivers/i2c/adm1027		# ADT7463A CPU1 temp, CPU0/1 FAN , SYS FAN 1/5
+					#		 device i2c 2e on end
+					#	 end
+					#	 chip drivers/generic/generic	# Winbond HWM 0x54 CPU0/1 VRM temp, SYSFAN 6/7, SB FAN
+					#		 device i2c 2a on end
+					#	 end
+					#	 chip drivers/generic/generic	# Winbond HWM 0x92
+					#		 device i2c 49 on end
+					#	 end
+					#	 chip drivers/generic/generic	# Winbond HWM 0x94
+					#		 device i2c 4a on end
+					#	 end
+					# end
+					device pci 2.0 on end			# USB 1.1
+					device pci 2.1 on end			# USB 2
+					device pci 4.0 on end			# ACI
+					device pci 4.1 off end			# MCI
+					device pci 6.0 on end			# IDE
+					device pci 7.0 on end			# SATA 1
+					device pci 8.0 on end			# SATA 0
+					device pci 9.0 on			# PCI
+					#	device pci 6.0 on end
+					end
+					device pci a.0 on end			# NIC
+					device pci b.0 on end			# PCI E 3
+					device pci c.0 on end			# PCI E 2
+					device pci d.0 on end			# PCI E 1
+					device pci e.0 on end			# PCI E 0
+					register "ide0_enable" = "1"
+					register "ide1_enable" = "0"
+					register "sata0_enable" = "1"
+					register "sata1_enable" = "1"
+				end
+			end
+			device pci 18.0 on end			# Link 1
+			device pci 18.0 on end			# Link 2 == LDT 2
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
+	end
 end
diff --git a/src/mainboard/winent/pl6064/devicetree.cb b/src/mainboard/winent/pl6064/devicetree.cb
index f900f78..40c61ea 100644
--- a/src/mainboard/winent/pl6064/devicetree.cb
+++ b/src/mainboard/winent/pl6064/devicetree.cb
@@ -3,7 +3,7 @@ chip northbridge/amd/lx
 		device pci 1.0 on end				# Northbridge
 		device pci 1.1 on end				# Graphics
 		chip southbridge/amd/cs5536
-			# IRQ 12 and 1 unmasked,  Keyboard and Mouse IRQs. OK
+			# IRQ 12 and 1 unmasked, Keyboard and Mouse IRQs. OK
 			# SIRQ Mode = Active(Quiet) mode. Save power....
 			# Invert mask = IRQ 12 and 1 are active high. Keyboard and Mouse, UARTs, etc IRQs. OK
 			register "lpc_serirq_enable" = "0x0000105a"
@@ -57,7 +57,7 @@ chip northbridge/amd/lx
 					device pnp 2e.7 off end	# GAME_MIDI_GIPO1
 					device pnp 2e.8 off end	# GPIO2
 					device pnp 2e.9 off end	# GPIO3
-					device pnp 2e.a on  	# ACPI
+					device pnp 2e.a on	# ACPI
 						irq 0x70 = 9
 					end
 					device pnp 2e.b on	# HW Monitor



More information about the coreboot-gerrit mailing list