[coreboot-gerrit] Patch set updated for coreboot: 9b105a4 devicetree.cb: Remove some trailing whitespace

HAOUAS Elyes (ehaouas@noos.fr) gerrit at coreboot.org
Fri Jul 25 12:06:19 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 9b105a4d7166e1425f9eaeaef42169b1953063e6
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/a-trend/atc-6220/devicetree.cb       | 114 +++----
 src/mainboard/a-trend/atc-6240/devicetree.cb       | 134 ++++----
 src/mainboard/aaeon/pfm-540i_revb/devicetree.cb    |   3 +-
 src/mainboard/abit/be6-ii_v2_0/devicetree.cb       | 114 +++----
 src/mainboard/advansus/a785e-i/devicetree.cb       | 147 +++++----
 src/mainboard/advantech/pcm-5820/devicetree.cb     | 108 +++----
 src/mainboard/amd/bimini_fam10/devicetree.cb       |  77 +++--
 src/mainboard/amd/db800/devicetree.cb              |   3 +-
 src/mainboard/amd/dbm690t/devicetree.cb            |  73 +++--
 src/mainboard/amd/dinar/devicetree.cb              |  49 ++-
 src/mainboard/amd/inagua/devicetree.cb             |  61 ++--
 src/mainboard/amd/mahogany/devicetree.cb           |  78 ++---
 src/mainboard/amd/mahogany_fam10/devicetree.cb     |  98 +++---
 src/mainboard/amd/norwich/devicetree.cb            |   5 +-
 src/mainboard/amd/olivehill/devicetree.cb          |  52 +--
 src/mainboard/amd/parmer/devicetree.cb             |  56 ++--
 src/mainboard/amd/persimmon/devicetree.cb          |  86 ++---
 src/mainboard/amd/pistachio/devicetree.cb          |  39 ++-
 src/mainboard/amd/rumba/devicetree.cb              |  23 +-
 src/mainboard/amd/serengeti_cheetah/devicetree.cb  | 189 ++++++-----
 .../amd/serengeti_cheetah_fam10/devicetree.cb      |  49 ++-
 src/mainboard/amd/south_station/devicetree.cb      | 141 ++++----
 src/mainboard/amd/thatcher/devicetree.cb           |  60 ++--
 src/mainboard/amd/tilapia_fam10/devicetree.cb      |  99 +++---
 src/mainboard/amd/torpedo/devicetree.cb            | 121 ++++---
 src/mainboard/amd/union_station/devicetree.cb      | 123 ++++---
 src/mainboard/aopen/dxplplusu/devicetree.cb        |  36 +--
 src/mainboard/arima/hdama/devicetree.cb            |  41 ++-
 src/mainboard/artecgroup/dbe61/devicetree.cb       |   4 +-
 src/mainboard/asi/mb_5blgp/devicetree.cb           | 106 +++---
 src/mainboard/asi/mb_5blmp/devicetree.cb           |  90 +++---
 src/mainboard/asrock/939a785gmh/devicetree.cb      |  83 +++--
 src/mainboard/asrock/e350m1/devicetree.cb          |  76 ++---
 src/mainboard/asrock/imb-a180/devicetree.cb        |  80 ++---
 src/mainboard/asus/a8n_e/devicetree.cb             | 236 +++++++-------
 src/mainboard/asus/a8v-e_deluxe/devicetree.cb      | 190 +++++------
 src/mainboard/asus/a8v-e_se/devicetree.cb          | 190 +++++------
 src/mainboard/asus/dsbf/devicetree.cb              |  64 ++--
 src/mainboard/asus/f2a85-m/devicetree.cb           |  80 ++---
 src/mainboard/asus/k8v-x/devicetree.cb             | 192 +++++------
 src/mainboard/asus/m2n-e/devicetree.cb             | 198 ++++++------
 src/mainboard/asus/m2v-mx_se/devicetree.cb         | 150 ++++-----
 src/mainboard/asus/m2v/devicetree.cb               | 146 ++++-----
 src/mainboard/asus/m4a78-em/devicetree.cb          |  81 +++--
 src/mainboard/asus/m4a785-m/devicetree.cb          |  82 ++---
 src/mainboard/asus/m4a785t-m/devicetree.cb         |  83 +++--
 src/mainboard/asus/m5a88-v/devicetree.cb           |  93 +++---
 src/mainboard/asus/mew-am/devicetree.cb            | 114 +++----
 src/mainboard/asus/mew-vm/devicetree.cb            |  34 +-
 src/mainboard/asus/p2b-d/devicetree.cb             | 120 +++----
 src/mainboard/asus/p2b-ds/devicetree.cb            | 122 +++----
 src/mainboard/asus/p2b-f/devicetree.cb             | 114 +++----
 src/mainboard/asus/p2b-ls/devicetree.cb            | 114 +++----
 src/mainboard/asus/p2b/devicetree.cb               | 120 +++----
 src/mainboard/asus/p3b-f/devicetree.cb             | 114 +++----
 src/mainboard/avalue/eax-785e/devicetree.cb        | 144 ++++-----
 src/mainboard/axus/tc320/devicetree.cb             | 106 +++---
 src/mainboard/azza/pt-6ibd/devicetree.cb           | 114 +++----
 src/mainboard/bachmann/ot200/devicetree.cb         |   4 +-
 src/mainboard/bcom/winnet100/devicetree.cb         | 108 +++----
 src/mainboard/bcom/winnetp680/devicetree.cb        | 124 +++----
 src/mainboard/biostar/m6tba/devicetree.cb          | 102 +++---
 src/mainboard/broadcom/blast/devicetree.cb         |  48 ++-
 .../compaq/deskpro_en_sff_p600/devicetree.cb       | 122 +++----
 src/mainboard/digitallogic/adl855pc/devicetree.cb  |  50 +--
 src/mainboard/digitallogic/msm800sev/devicetree.cb |  38 +--
 src/mainboard/eaglelion/5bcm/devicetree.cb         |  96 +++---
 src/mainboard/ecs/p6iwp-fe/devicetree.cb           | 126 ++++----
 src/mainboard/getac/p470/devicetree.cb             |  94 +++---
 src/mainboard/gigabyte/ga-6bxc/devicetree.cb       | 110 +++----
 src/mainboard/gigabyte/ga-6bxe/devicetree.cb       | 110 +++----
 src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb   | 114 ++++---
 src/mainboard/gigabyte/m57sli/devicetree.cb        | 300 ++++++++---------
 src/mainboard/gigabyte/ma785gm/devicetree.cb       |  76 ++---
 src/mainboard/gigabyte/ma785gmt/devicetree.cb      |  80 ++---
 src/mainboard/gigabyte/ma78gm/devicetree.cb        |  80 ++---
 src/mainboard/gizmosphere/gizmo/devicetree.cb      |  50 +--
 src/mainboard/google/butterfly/devicetree.cb       |  44 +--
 src/mainboard/google/falco/devicetree.cb           |  60 ++--
 src/mainboard/google/link/devicetree.cb            |  48 +--
 src/mainboard/google/parrot/devicetree.cb          |  50 +--
 src/mainboard/google/rambi/devicetree.cb           |  62 ++--
 src/mainboard/google/stout/devicetree.cb           |  62 ++--
 src/mainboard/hp/dl145_g1/devicetree.cb            |  71 ++--
 src/mainboard/hp/dl145_g3/devicetree.cb            |  80 +++--
 src/mainboard/hp/dl165_g6_fam10/devicetree.cb      |  80 +++--
 src/mainboard/hp/e_vectra_p2706t/devicetree.cb     | 109 ++++---
 src/mainboard/hp/pavilion_m6_1035dx/devicetree.cb  |  46 +--
 src/mainboard/ibase/mb899/devicetree.cb            |  12 +-
 src/mainboard/ibm/e325/devicetree.cb               |  41 ++-
 src/mainboard/ibm/e326/devicetree.cb               |  43 ++-
 src/mainboard/iei/juki-511p/devicetree.cb          |  97 +++---
 src/mainboard/iei/kino-780am2-fam10/devicetree.cb  |  57 ++--
 src/mainboard/iei/nova4899r/devicetree.cb          | 119 ++++---
 src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb   |   3 +-
 src/mainboard/iei/pm-lx-800-r11/devicetree.cb      |  10 +-
 src/mainboard/intel/baskingridge/devicetree.cb     |   6 +-
 src/mainboard/intel/bayleybay_fsp/devicetree.cb    |  56 ++--
 src/mainboard/intel/d810e2cb/devicetree.cb         | 118 +++----
 src/mainboard/intel/d945gclf/devicetree.cb         |  98 +++---
 src/mainboard/intel/eagleheights/devicetree.cb     |  85 +++--
 src/mainboard/intel/emeraldlake2/devicetree.cb     |   6 +-
 src/mainboard/intel/mtarvon/devicetree.cb          |  84 ++---
 src/mainboard/intel/truxton/devicetree.cb          |  88 ++---
 src/mainboard/iwave/iWRainbowG6/devicetree.cb      |  27 +-
 src/mainboard/iwill/dk8_htx/devicetree.cb          |  70 ++--
 src/mainboard/iwill/dk8s2/devicetree.cb            |  37 ++-
 src/mainboard/iwill/dk8x/devicetree.cb             |   5 +-
 src/mainboard/jetway/j7f2/devicetree.cb            | 120 +++----
 src/mainboard/jetway/nf81-t56n-lf/devicetree.cb    |  54 ++--
 src/mainboard/jetway/pa78vm5/devicetree.cb         |  76 ++---
 src/mainboard/kontron/986lcd-m/devicetree.cb       | 133 ++++----
 src/mainboard/kontron/kt690/devicetree.cb          |  78 ++---
 src/mainboard/kontron/ktqm77/devicetree.cb         |  58 ++--
 src/mainboard/lanner/em8510/devicetree.cb          |  52 +--
 src/mainboard/lenovo/t520/devicetree.cb            |   8 +-
 src/mainboard/lenovo/t530/devicetree.cb            |   8 +-
 src/mainboard/lenovo/t60/devicetree.cb             |   8 +-
 src/mainboard/lenovo/x201/devicetree.cb            |   8 +-
 src/mainboard/lenovo/x230/devicetree.cb            |   8 +-
 src/mainboard/lenovo/x60/devicetree.cb             |   8 +-
 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/msi/ms6119/devicetree.cb             | 116 +++----
 src/mainboard/msi/ms6147/devicetree.cb             | 116 +++----
 src/mainboard/msi/ms6178/devicetree.cb             | 120 +++----
 src/mainboard/msi/ms7260/devicetree.cb             | 282 ++++++++--------
 src/mainboard/msi/ms9185/devicetree.cb             |  72 ++---
 src/mainboard/msi/ms9652_fam10/devicetree.cb       | 288 ++++++++---------
 src/mainboard/nec/powermate2000/devicetree.cb      | 102 +++---
 src/mainboard/newisys/khepri/devicetree.cb         |  55 ++--
 src/mainboard/nokia/ip530/devicetree.cb            | 176 +++++-----
 src/mainboard/nvidia/l1_2pvv/devicetree.cb         | 356 ++++++++++-----------
 src/mainboard/packardbell/ms2290/devicetree.cb     |   6 +-
 src/mainboard/pcengines/alix1c/devicetree.cb       |  39 ++-
 src/mainboard/pcengines/alix2d/devicetree.cb       |  15 +-
 src/mainboard/rca/rm4100/devicetree.cb             | 129 ++++----
 src/mainboard/roda/rk886ex/devicetree.cb           |  91 +++---
 src/mainboard/roda/rk9/devicetree.cb               |  12 +-
 src/mainboard/samsung/lumpy/devicetree.cb          |  16 +-
 src/mainboard/samsung/stumpy/devicetree.cb         |  50 +--
 src/mainboard/siemens/sitemp_g1p1/devicetree.cb    |  67 ++--
 src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb   | 102 +++---
 src/mainboard/sunw/ultra40/devicetree.cb           | 298 ++++++++---------
 src/mainboard/supermicro/h8dme/devicetree.cb       | 248 +++++++-------
 src/mainboard/supermicro/h8dmr/devicetree.cb       | 288 ++++++++---------
 src/mainboard/supermicro/h8dmr_fam10/devicetree.cb | 300 ++++++++---------
 src/mainboard/supermicro/h8qgi/devicetree.cb       | 101 +++---
 src/mainboard/supermicro/h8qme_fam10/devicetree.cb | 226 ++++++-------
 src/mainboard/supermicro/h8scm/devicetree.cb       | 107 +++----
 src/mainboard/supermicro/h8scm_fam10/devicetree.cb | 144 ++++-----
 src/mainboard/supermicro/x6dai_g/devicetree.cb     |   9 +-
 src/mainboard/supermicro/x6dhe_g/devicetree.cb     |  26 +-
 src/mainboard/supermicro/x6dhe_g2/devicetree.cb    |  26 +-
 src/mainboard/supermicro/x6dhr_ig/devicetree.cb    |  13 +-
 src/mainboard/supermicro/x6dhr_ig2/devicetree.cb   |   9 +-
 src/mainboard/supermicro/x7db8/devicetree.cb       |  44 +--
 src/mainboard/technexion/tim5690/devicetree.cb     |  73 +++--
 src/mainboard/technexion/tim8690/devicetree.cb     |  73 +++--
 src/mainboard/televideo/tc7020/devicetree.cb       | 110 +++----
 src/mainboard/traverse/geos/devicetree.cb          |   2 +-
 src/mainboard/tyan/s1846/devicetree.cb             | 106 +++---
 src/mainboard/tyan/s2735/devicetree.cb             | 151 +++++----
 src/mainboard/tyan/s2850/devicetree.cb             | 116 ++++---
 src/mainboard/tyan/s2875/devicetree.cb             |  47 ++-
 src/mainboard/tyan/s2880/devicetree.cb             | 106 +++---
 src/mainboard/tyan/s2881/devicetree.cb             | 255 ++++++++-------
 src/mainboard/tyan/s2882/devicetree.cb             | 155 +++++----
 src/mainboard/tyan/s2885/devicetree.cb             | 127 ++++----
 src/mainboard/tyan/s2891/devicetree.cb             | 270 ++++++++--------
 src/mainboard/tyan/s2892/devicetree.cb             | 276 ++++++++--------
 src/mainboard/tyan/s2895/devicetree.cb             | 302 ++++++++---------
 src/mainboard/tyan/s2912/devicetree.cb             | 272 ++++++++--------
 src/mainboard/tyan/s2912_fam10/devicetree.cb       | 278 ++++++++--------
 src/mainboard/tyan/s4880/devicetree.cb             | 107 +++----
 src/mainboard/tyan/s4882/devicetree.cb             | 290 +++++++++--------
 src/mainboard/tyan/s8226/devicetree.cb             | 100 +++---
 src/mainboard/via/epia-cn/devicetree.cb            | 118 +++----
 src/mainboard/via/epia-m/devicetree.cb             |  12 +-
 src/mainboard/via/epia-m700/devicetree.cb          |  44 +--
 src/mainboard/via/epia-m850/devicetree.cb          |  38 +--
 src/mainboard/via/epia-n/devicetree.cb             | 152 ++++-----
 src/mainboard/via/epia/devicetree.cb               |  72 ++---
 src/mainboard/via/pc2500e/devicetree.cb            | 174 +++++-----
 src/mainboard/via/vt8454c/devicetree.cb            |  35 +-
 src/mainboard/winent/mb6047/devicetree.cb          | 236 +++++++-------
 src/mainboard/winent/pl6064/devicetree.cb          |   4 +-
 188 files changed, 9016 insertions(+), 9122 deletions(-)

diff --git a/src/mainboard/a-trend/atc-6220/devicetree.cb b/src/mainboard/a-trend/atc-6220/devicetree.cb
index 0dea9ae..7aa67d1 100644
--- a/src/mainboard/a-trend/atc-6220/devicetree.cb
+++ b/src/mainboard/a-trend/atc-6220/devicetree.cb
@@ -1,59 +1,59 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device cpu_cluster 0 on		# APIC cluster
-    chip cpu/intel/slot_1		# CPU
-      device lapic 0 on end		# APIC
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 1.0 on end		# PCI/AGP bridge
-    chip southbridge/intel/i82371eb	# Southbridge
-      device pci 7.0 on			# ISA bridge
-        chip superio/winbond/w83977tf	# Super I/O (FIXME: It's W83977EF!)
-          device pnp 3f0.0 on		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 3f0.1 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 3f0.2 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 3f0.3 on		# COM2 / IR
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 3f0.5 on		# PS/2 keyboard
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1		# PS/2 keyboard interrupt
-            irq 0x72 = 12		# PS/2 mouse interrupt
-          end
-          device pnp 3f0.6 on		# Consumer IR
-          end
-          device pnp 3f0.7 on		# GPIO 1
-          end
-          device pnp 3f0.8 on		# GPIO 2
-          end
-          device pnp 3f0.a on		# ACPI
-          end
-        end
-      end
-      device pci 7.1 on	end		# IDE
-      device pci 7.2 on	end		# USB
-      device pci 7.3 on end		# ACPI
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      register "ide_legacy_enable" = "1"
-      # Enable UDMA/33 for higher speed if your IDE device(s) support it.
-      register "ide0_drive0_udma33_enable" = "0"
-      register "ide0_drive1_udma33_enable" = "0"
-      register "ide1_drive0_udma33_enable" = "0"
-      register "ide1_drive1_udma33_enable" = "0"
-    end
-  end
+	device cpu_cluster 0 on		# APIC cluster
+		chip cpu/intel/slot_1		# CPU
+			device lapic 0 on end		# APIC
+		end
+	end
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 1.0 on end		# PCI/AGP bridge
+		chip southbridge/intel/i82371eb	# Southbridge
+			device pci 7.0 on			# ISA bridge
+				chip superio/winbond/w83977tf	# Super I/O (FIXME: It's W83977EF!)
+					device pnp 3f0.0 on		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 3f0.1 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 3f0.2 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 3f0.3 on		# COM2 / IR
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 3f0.5 on		# PS/2 keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1		# PS/2 keyboard interrupt
+						irq 0x72 = 12		# PS/2 mouse interrupt
+					end
+					device pnp 3f0.6 on		# Consumer IR
+					end
+					device pnp 3f0.7 on		# GPIO 1
+					end
+					device pnp 3f0.8 on		# GPIO 2
+					end
+					device pnp 3f0.a on		# ACPI
+					end
+				end
+			end
+			device pci 7.1 on end		# IDE
+			device pci 7.2 on end		# USB
+			device pci 7.3 on end		# ACPI
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			register "ide_legacy_enable" = "1"
+			# Enable UDMA/33 for higher speed if your IDE device(s) support it.
+			register "ide0_drive0_udma33_enable" = "0"
+			register "ide0_drive1_udma33_enable" = "0"
+			register "ide1_drive0_udma33_enable" = "0"
+			register "ide1_drive1_udma33_enable" = "0"
+		end
+	end
 end
diff --git a/src/mainboard/a-trend/atc-6240/devicetree.cb b/src/mainboard/a-trend/atc-6240/devicetree.cb
index e0bfdac..34f6cf7 100644
--- a/src/mainboard/a-trend/atc-6240/devicetree.cb
+++ b/src/mainboard/a-trend/atc-6240/devicetree.cb
@@ -1,69 +1,69 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device cpu_cluster 0 on		# APIC cluster
-    chip cpu/intel/slot_1		# CPU
-      device lapic 0 on end		# APIC
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 1.0 on end		# PCI/AGP bridge
-    chip southbridge/intel/i82371eb	# Southbridge
-      device pci 7.0 on			# ISA bridge
-        chip superio/winbond/w83627hf	# Super I/O
-          device pnp 3f0.0 on		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 3f0.1 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-            drq 0x74 = 3
-          end
-          device pnp 3f0.2 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 3f0.3 on		# COM2 / IR
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 3f0.5 on		# PS/2 keyboard
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1		# PS/2 keyboard interrupt
-            irq 0x72 = 12		# PS/2 mouse interrupt
-          end
-          device pnp 3f0.6 on		# Consumer IR
-            io 0x60 = 0x00
-          end
-          device pnp 3f0.7 on		# Game port / MIDI / GPIO 1
-            io 0x60 = 0x201
-            io 0x62 = 0x330
-            irq 0x70 = 9
-          end
-          device pnp 3f0.8 off		# GPIO 2 / WDT
-          end
-          device pnp 3f0.9 off		# GPIO 3
-          end
-          device pnp 3f0.a off		# ACPI
-          end
-          device pnp 3f0.b off		# HWM (TODO)
-          end
-        end
-      end
-      device pci 7.1 on	end		# IDE
-      device pci 7.2 on	end		# USB
-      device pci 7.3 on end		# ACPI
-      device pci c.0 on end		# Onboard audio (ES1371)
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      register "ide_legacy_enable" = "1"
-      # Enable UDMA/33 for higher speed if your IDE device(s) support it.
-      register "ide0_drive0_udma33_enable" = "0"
-      register "ide0_drive1_udma33_enable" = "0"
-      register "ide1_drive0_udma33_enable" = "0"
-      register "ide1_drive1_udma33_enable" = "0"
-    end
-  end
+	device cpu_cluster 0 on		# APIC cluster
+		chip cpu/intel/slot_1		# CPU
+			device lapic 0 on end		# APIC
+		end
+	end
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 1.0 on end		# PCI/AGP bridge
+		chip southbridge/intel/i82371eb	# Southbridge
+			device pci 7.0 on			# ISA bridge
+				chip superio/winbond/w83627hf	# Super I/O
+					device pnp 3f0.0 on		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 3f0.1 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+						drq 0x74 = 3
+					end
+					device pnp 3f0.2 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 3f0.3 on		# COM2 / IR
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 3f0.5 on		# PS/2 keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1		# PS/2 keyboard interrupt
+						irq 0x72 = 12		# PS/2 mouse interrupt
+					end
+					device pnp 3f0.6 on		# Consumer IR
+						io 0x60 = 0x00
+					end
+					device pnp 3f0.7 on		# Game port / MIDI / GPIO 1
+						io 0x60 = 0x201
+						io 0x62 = 0x330
+						irq 0x70 = 9
+					end
+					device pnp 3f0.8 off		# GPIO 2 / WDT
+					end
+					device pnp 3f0.9 off		# GPIO 3
+					end
+					device pnp 3f0.a off		# ACPI
+					end
+					device pnp 3f0.b off		# HWM (TODO)
+					end
+				end
+			end
+			device pci 7.1 on end		# IDE
+			device pci 7.2 on end		# USB
+			device pci 7.3 on end		# ACPI
+			device pci c.0 on end		# Onboard audio (ES1371)
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			register "ide_legacy_enable" = "1"
+			# Enable UDMA/33 for higher speed if your IDE device(s) support it.
+			register "ide0_drive0_udma33_enable" = "0"
+			register "ide0_drive1_udma33_enable" = "0"
+			register "ide1_drive0_udma33_enable" = "0"
+			register "ide1_drive1_udma33_enable" = "0"
+		end
+	end
 end
diff --git a/src/mainboard/aaeon/pfm-540i_revb/devicetree.cb b/src/mainboard/aaeon/pfm-540i_revb/devicetree.cb
index 221b80c..7565b1e 100644
--- a/src/mainboard/aaeon/pfm-540i_revb/devicetree.cb
+++ b/src/mainboard/aaeon/pfm-540i_revb/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/lx
 		device pci 1.1 on end				# Graphics
 		device pci 1.2 on end				# AES
 		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"
@@ -71,4 +71,3 @@ chip northbridge/amd/lx
 		end
 	end
 end
-
diff --git a/src/mainboard/abit/be6-ii_v2_0/devicetree.cb b/src/mainboard/abit/be6-ii_v2_0/devicetree.cb
index 3a6648a..7cf61ea 100644
--- a/src/mainboard/abit/be6-ii_v2_0/devicetree.cb
+++ b/src/mainboard/abit/be6-ii_v2_0/devicetree.cb
@@ -1,59 +1,59 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device cpu_cluster 0 on		# APIC cluster
-    chip cpu/intel/slot_1		# CPU
-      device lapic 0 on end		# APIC
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 1.0 on end		# PCI/AGP bridge
-    chip southbridge/intel/i82371eb	# Southbridge
-      device pci 7.0 on			# ISA bridge
-        chip superio/winbond/w83977tf	# Super I/O (FIXME: It's W83977EF!)
-          device pnp 3f0.0 on		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 3f0.1 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 3f0.2 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 3f0.3 on		# COM2 / IR
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 3f0.5 on		# PS/2 keyboard
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1		# PS/2 keyboard interrupt
-            irq 0x72 = 12		# PS/2 mouse interrupt
-          end
-          device pnp 3f0.6 on		# Consumer IR
-          end
-          device pnp 3f0.7 on		# GPIO 1
-          end
-          device pnp 3f0.8 on		# GPIO 2
-          end
-          device pnp 3f0.a on		# ACPI
-          end
-        end
-      end
-      device pci 7.1 on	end		# IDE, UDMA/33 (part of 82371EB)
-      device pci 7.2 on	end		# USB
-      device pci 7.3 on end		# ACPI
-      device pci 13.0 on end		# IDE, UDMA/66 (HPT366 controller)
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      register "ide_legacy_enable" = "1"
-      register "ide0_drive0_udma33_enable" = "1"
-      register "ide0_drive1_udma33_enable" = "1"
-      register "ide1_drive0_udma33_enable" = "1"
-      register "ide1_drive1_udma33_enable" = "1"
-    end
-  end
+	device cpu_cluster 0 on		# APIC cluster
+		chip cpu/intel/slot_1		# CPU
+			device lapic 0 on end		# APIC
+		end
+	end
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 1.0 on end		# PCI/AGP bridge
+		chip southbridge/intel/i82371eb	# Southbridge
+			device pci 7.0 on			# ISA bridge
+				chip superio/winbond/w83977tf	# Super I/O (FIXME: It's W83977EF!)
+					device pnp 3f0.0 on		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 3f0.1 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 3f0.2 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 3f0.3 on		# COM2 / IR
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 3f0.5 on		# PS/2 keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1		# PS/2 keyboard interrupt
+						irq 0x72 = 12		# PS/2 mouse interrupt
+					end
+					device pnp 3f0.6 on		# Consumer IR
+					end
+					device pnp 3f0.7 on		# GPIO 1
+					end
+					device pnp 3f0.8 on		# GPIO 2
+					end
+					device pnp 3f0.a on		# ACPI
+					end
+				end
+			end
+			device pci 7.1 on end		# IDE, UDMA/33 (part of 82371EB)
+			device pci 7.2 on end		# USB
+			device pci 7.3 on end		# ACPI
+			device pci 13.0 on end		# IDE, UDMA/66 (HPT366 controller)
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			register "ide_legacy_enable" = "1"
+			register "ide0_drive0_udma33_enable" = "1"
+			register "ide0_drive1_udma33_enable" = "1"
+			register "ide1_drive0_udma33_enable" = "1"
+			register "ide1_drive1_udma33_enable" = "1"
+		end
+	end
 end
diff --git a/src/mainboard/advansus/a785e-i/devicetree.cb b/src/mainboard/advansus/a785e-i/devicetree.cb
index f7db1cc..fa5b2b5 100644
--- a/src/mainboard/advansus/a785e-i/devicetree.cb
+++ b/src/mainboard/advansus/a785e-i/devicetree.cb
@@ -1,26 +1,26 @@
 # sample config for advansus/A785E-I
 chip northbridge/amd/amdfam10/root_complex
 	device cpu_cluster 0 on
-		chip cpu/amd/socket_ASB2  #L1 and DDR3
-			 device lapic 0 on end
+		chip cpu/amd/socket_ASB2	#L1 and DDR3
+			device lapic 0 on end
 		end
 	end
 	device domain 0 on
 		subsystemid 0x1612 0x3060 inherit #TODO: Set the correctly subsystem id.
 		chip northbridge/amd/amdfam10
-			device pci 18.0 on #  northbridge
+			device pci 18.0 on	# northbridge
 				chip southbridge/amd/rs780
-					device pci 0.0 on end # HT  	0x9600
-					device pci 1.0 on end # Internal Graphics P2P bridge 0x9712
-					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x9603
-					device pci 3.0 off end # PCIE P2P bridge 0x960b
-					device pci 4.0 on end # PCIE P2P bridge 0x9604 wireless
-					device pci 5.0 off end # PCIE P2P bridge 0x9605
-					device pci 6.0 off end # PCIE P2P bridge 0x9606
-					device pci 7.0 off end # PCIE P2P bridge 0x9607
-					device pci 8.0 off end # NB/SB Link P2P bridge
-					device pci 9.0 on end # Ethernet
-					device pci a.0 on end # Ethernet
+					device pci 0.0 on end	# HT	0x9600
+					device pci 1.0 on end	# Internal Graphics P2P bridge 0x9712
+					device pci 2.0 on end	# PCIE P2P bridge (external graphics) 0x9603
+					device pci 3.0 off end	# PCIE P2P bridge 0x960b
+					device pci 4.0 on end	# PCIE P2P bridge 0x9604 wireless
+					device pci 5.0 off end	# PCIE P2P bridge 0x9605
+					device pci 6.0 off end	# PCIE P2P bridge 0x9606
+					device pci 7.0 off end	# PCIE P2P bridge 0x9607
+					device pci 8.0 off end	# NB/SB Link P2P bridge
+					device pci 9.0 on end	# Ethernet
+					device pci a.0 on end	# Ethernet
 					register "gppsb_configuration" = "4"	# Configuration E
 					register "gpp_configuration" = "3"	# Configuration D
 					register "port_enable" = "0x6f6"
@@ -31,8 +31,8 @@ chip northbridge/amd/amdfam10/root_complex
 					register "gfx_reconfiguration" = "1"
 					register "gfx_link_width" = "0"
 					register "gfx_tmds" = "1"
-					register "gfx_pcie_config" = "3" # 1x8 GFX on Lanes 8-15
-					register "gfx_ddi_config" = "1"  # Lanes 0-3 DDI_SL
+					register "gfx_pcie_config" = "3"	# 1x8 GFX on Lanes 8-15
+					register "gfx_ddi_config" = "1"		# Lanes 0-3 DDI_SL
 				end
 				chip southbridge/amd/cimx/sb800 # it is under NB/SB Link, but on the same pci bus
 					device pci 11.0 on end # SATA
@@ -40,7 +40,7 @@ chip northbridge/amd/amdfam10/root_complex
 					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
+					device pci 14.0 on # SM
 						chip drivers/generic/generic #dimm 0-0-0
 							device i2c 50 on end
 						end
@@ -54,67 +54,66 @@ chip northbridge/amd/amdfam10/root_complex
 							device i2c 53 on end
 						end
 					end # SM
-					device pci 14.1 on end # IDE    0x439c
-					device pci 14.2 on end # HDA    0x4383
+					device pci 14.1 on end	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
 					device pci 14.3 on
-                                                chip superio/winbond/w83627hf
-                                                        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 #  Keyboard
-                                                                io 0x60 = 0x60
-                                                                io 0x62 = 0x64
-                                                                irq 0x70 = 1
-                                                                irq 0x72 = 12
-                                                        end
-                                                        device pnp 2e.6 off  # SFI
-                                                                io 0x62 = 0x100
-                                                        end
-                                                        device pnp 2e.7 off #  GPIO_GAME_MIDI
-                                                                io 0x60 = 0x220
-                                                                io 0x62 = 0x300
-                                                                irq 0x70 = 9
-                                                        end
-                                                        device pnp 2e.8 off end #  WDTO_PLED
-                                                        device pnp 2e.9 off end #  GPIO_SUSLED
-                                                        device pnp 2e.a off end #  ACPI
-                                                        device pnp 2e.b on #  HW Monitor
-                                                                io 0x60 = 0x290
-                                                                irq 0x70 = 5
-                                                        end
-                                                end     #superio/winbond/w83627hf
+						chip superio/winbond/w83627hf
+							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	# Keyboard
+								io 0x60 = 0x60
+								io 0x62 = 0x64
+								irq 0x70 = 1
+								irq 0x72 = 12
+							end
+							device pnp 2e.6 off	# SFI
+								io 0x62 = 0x100
+							end
+							device pnp 2e.7 off	# GPIO_GAME_MIDI
+								io 0x60 = 0x220
+								io 0x62 = 0x300
+								irq 0x70 = 9
+							end
+							device pnp 2e.8 off end	# WDTO_PLED
+							device pnp 2e.9 off end	# GPIO_SUSLED
+							device pnp 2e.a off end	# ACPI
+							device pnp 2e.b on	# HW Monitor
+								io 0x60 = 0x290
+								irq 0x70 = 5
+							end
+						end	#superio/winbond/w83627hf
 					end # LPC	0x439d
-					device pci 14.4 off end # PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0}
-					device pci 14.5 on end # USB 2
-					device pci 14.6 off end # Gec
-					device pci 15.0 on end # PCIe 0
-					device pci 15.1 on end # PCIe 1
-					device pci 15.2 on end # PCIe 2
-					device pci 15.3 on end # PCIe 3
-					device pci 16.0 on end # USB
-					device pci 16.2 on end # USB
-					#register "gpp_configuration" = "0" #4:0:0:0
-					#register "gpp_configuration" = "2" #2:2:0:0
-					#register "gpp_configuration" = "3" #2:1:1:0
-					register "gpp_configuration" = "4" #1:1:1:1
+					device pci 14.4 off end	# PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0}
+					device pci 14.5 on end	# USB 2
+					device pci 14.6 off end	# Gec
+					device pci 15.0 on end	# PCIe 0
+					device pci 15.1 on end	# PCIe 1
+					device pci 15.2 on end	# PCIe 2
+					device pci 15.3 on end	# PCIe 3
+					device pci 16.0 on end	# USB
+					device pci 16.2 on end	# USB
+					#register "gpp_configuration" = "0"	#4:0:0:0
+					#register "gpp_configuration" = "2"	#2:2:0:0
+					#register "gpp_configuration" = "3"	#2:1:1:0
+					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
 			device pci 18.1 on end
 			device pci 18.2 on end
 			device pci 18.3 on end
diff --git a/src/mainboard/advantech/pcm-5820/devicetree.cb b/src/mainboard/advantech/pcm-5820/devicetree.cb
index 8027ee2..85ebaca 100644
--- a/src/mainboard/advantech/pcm-5820/devicetree.cb
+++ b/src/mainboard/advantech/pcm-5820/devicetree.cb
@@ -1,56 +1,56 @@
 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 12.0 on		# ISA bridge
-        chip superio/winbond/w83977f	# SUper I/O
-          device pnp 3f0.0 on		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 3f0.1 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 3f0.2 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 3f0.3 on		# COM2
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 3f0.4 on		# RTC / On-Now control
-            io 0x60 = 0x70
-            irq 0x70 = 8
-          end
-          device pnp 3f0.5 on		# PS/2 keyboard / mouse
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1		# PS/2 keyboard interrupt
-            irq 0x72 = 12		# PS/2 mouse interrupt
-          end
-          device pnp 3f0.6 on		# IR
-            # TODO?
-          end
-          device pnp 3f0.7 on		# GPIO 1
-            # TODO?
-          end
-          device pnp 3f0.8 on		# GPIO 2
-            # TODO?
-          end
-        end
-      end
-      device pci 12.1 on end		# SMI
-      device pci 12.2 on end		# IDE
-      device pci 12.3 on end		# Audio (onboard)
-      device pci 12.4 on end		# VGA
-      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		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		chip southbridge/amd/cs5530		# Southbridge
+			device pci 12.0 on		# ISA bridge
+				chip superio/winbond/w83977f	# SUper I/O
+					device pnp 3f0.0 on		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 3f0.1 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 3f0.2 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 3f0.3 on		# COM2
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 3f0.4 on		# RTC / On-Now control
+						io 0x60 = 0x70
+						irq 0x70 = 8
+					end
+					device pnp 3f0.5 on		# PS/2 keyboard / mouse
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1		# PS/2 keyboard interrupt
+						irq 0x72 = 12		# PS/2 mouse interrupt
+					end
+					device pnp 3f0.6 on		# IR
+						# TODO?
+					end
+					device pnp 3f0.7 on		# GPIO 1
+						# TODO?
+					end
+					device pnp 3f0.8 on		# GPIO 2
+						# TODO?
+					end
+				end
+			end
+			device pci 12.1 on end		# SMI
+			device pci 12.2 on end		# IDE
+			device pci 12.3 on end		# Audio (onboard)
+			device pci 12.4 on end		# VGA
+			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/amd/bimini_fam10/devicetree.cb b/src/mainboard/amd/bimini_fam10/devicetree.cb
index 0bcc9c1..6e47914 100644
--- a/src/mainboard/amd/bimini_fam10/devicetree.cb
+++ b/src/mainboard/amd/bimini_fam10/devicetree.cb
@@ -1,28 +1,28 @@
 	# sample config for amd/bimini_fam10
 chip northbridge/amd/amdfam10/root_complex
 	device cpu_cluster 0 on
-		chip cpu/amd/socket_ASB2  #L1 and DDR3
+		chip cpu/amd/socket_ASB2	#L1 and DDR3
 			 device lapic 0 on end
 		end
 	end
 	device domain 0 on
 		subsystemid 0x1022 0x3060 inherit
 		chip northbridge/amd/amdfam10
-			device pci 18.0 on #  northbridge
+			device pci 18.0 on	# northbridge
 				chip southbridge/amd/rs780
-					device pci 0.0 on end # HT  	0x9600
-					device pci 1.0 on end # Internal Graphics P2P bridge 0x9602
-					device pci 2.0 off end # PCIE P2P bridge (external graphics) 0x9603
-					device pci 3.0 off end # PCIE P2P bridge	0x960b
-					device pci 4.0 on end # PCIE P2P bridge 0x9604
-					device pci 5.0 on end # PCIE P2P bridge 0x9605
-					device pci 6.0 on end # PCIE P2P bridge 0x9606
-					device pci 7.0 on end # PCIE P2P bridge 0x9607
-					device pci 8.0 off end # NB/SB Link P2P bridge
-					device pci 9.0 on end #
-					device pci a.0 off end #
-					register "gppsb_configuration" = "4"   # Configuration E
-					register "gpp_configuration" = "2"   # Configuration C
+					device pci 0.0 on end	# HT	0x9600
+					device pci 1.0 on end	# Internal Graphics P2P bridge 0x9602
+					device pci 2.0 off end	# PCIE P2P bridge (external graphics) 0x9603
+					device pci 3.0 off end	# PCIE P2P bridge	0x960b
+					device pci 4.0 on end	# PCIE P2P bridge 0x9604
+					device pci 5.0 on end	# PCIE P2P bridge 0x9605
+					device pci 6.0 on end	# PCIE P2P bridge 0x9606
+					device pci 7.0 on end	# PCIE P2P bridge 0x9607
+					device pci 8.0 off end	# NB/SB Link P2P bridge
+					device pci 9.0 on end	#
+					device pci a.0 off end	#
+					register "gppsb_configuration" = "4"	# Configuration E
+					register "gpp_configuration" = "2"	# Configuration C
 					register "port_enable" = "0x6fc"
 					register "gfx_dev2_dev3" = "1"
 					register "gfx_dual_slot" = "0"
@@ -38,7 +38,7 @@ chip northbridge/amd/amdfam10/root_complex
 					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
+					device pci 14.0 on # SM
 						chip drivers/generic/generic #dimm 0-0-0
 							device i2c 50 on end
 						end
@@ -52,22 +52,22 @@ chip northbridge/amd/amdfam10/root_complex
 							device i2c 53 on end
 						end
 					end # SM
-					device pci 14.1 on end # IDE    0x439c
-					device pci 14.2 on end # HDA    0x4383
-					device pci 14.3 on end # LPC	0x439d
-					device pci 14.4 off end # PCI	0x4384 # PCI-b conflict with GPIO.
-					device pci 14.5 on end # USB 2
-					device pci 14.6 on end # Gec
-					device pci 15.0 on end # PCIe 0
-					device pci 15.1 on end # PCIe 1
-					device pci 15.2 on end # PCIe 2
-					device pci 15.3 on end # PCIe 3
-					device pci 16.0 on end # USB
-					device pci 16.2 on end # USB
+					device pci 14.1 on end	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on end	# LPC	0x439d
+					device pci 14.4 off end	# PCI	0x4384 # PCI-b conflict with GPIO.
+					device pci 14.5 on end	# USB 2
+					device pci 14.6 on end	# Gec
+					device pci 15.0 on end	# PCIe 0
+					device pci 15.1 on end	# PCIe 1
+					device pci 15.2 on end	# PCIe 2
+					device pci 15.3 on end	# PCIe 3
+					device pci 16.0 on end	# USB
+					device pci 16.2 on end	# USB
 					register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 					register "gpp_configuration" = "4"
 				end	#southbridge/amd/sb800
-			end #  device pci 18.0
+			end # device pci 18.0
 
 			device pci 18.0 on end
 			device pci 18.0 on end
@@ -80,16 +80,15 @@ chip northbridge/amd/amdfam10/root_complex
 	#for node 32 to node 63
 #	device domain 0 on
 #		chip northbridge/amd/amdfam10
-#			  device pci 00.0 on end#  northbridge
-#			  device pci 00.0 on end
-#			  device pci 00.0 on end
-#			  device pci 00.0 on end
-#			  device pci 00.1 on end
-#			  device pci 00.2 on end
-#			  device pci 00.3 on end
-#			  device pci 00.4 on end
-#			 device pci 00.5 on end
+#			device pci 00.0 on end# northbridge
+#			device pci 00.0 on end
+#			device pci 00.0 on end
+#			device pci 00.0 on end
+#			device pci 00.1 on end
+#			device pci 00.2 on end
+#			device pci 00.3 on end
+#			device pci 00.4 on end
+#			device pci 00.5 on end
 #		end
 #	end #domain
-
 end
diff --git a/src/mainboard/amd/db800/devicetree.cb b/src/mainboard/amd/db800/devicetree.cb
index 3331a12..fd51761 100644
--- a/src/mainboard/amd/db800/devicetree.cb
+++ b/src/mainboard/amd/db800/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"
@@ -65,4 +65,3 @@ chip northbridge/amd/lx
 		end
 	end
 end
-
diff --git a/src/mainboard/amd/dbm690t/devicetree.cb b/src/mainboard/amd/dbm690t/devicetree.cb
index 8dd971e..24de336 100644
--- a/src/mainboard/amd/dbm690t/devicetree.cb
+++ b/src/mainboard/amd/dbm690t/devicetree.cb
@@ -17,19 +17,19 @@ chip northbridge/amd/amdk8/root_complex
 	device domain 0 on
 		subsystemid 0x1022 0x3050 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"
@@ -41,14 +41,14 @@ chip northbridge/amd/amdk8/root_complex
 					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
+					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
@@ -62,54 +62,54 @@ chip northbridge/amd/amdk8/root_complex
 							device i2c 53 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/ite/it8712f
-							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 on #  Com1
+							device pnp 2e.1 on	# Com1
 								io 0x60 = 0x3f8
 								irq 0x70 = 4
 							end
-							device pnp 2e.2 off #  Com2
+							device pnp 2e.2 off	# Com2
 								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 2e.3 off #  Parallel Port
+							device pnp 2e.3 off	# Parallel Port
 								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 2e.4 off end #  EC
-							device pnp 2e.5 on #  Keyboard
+							device pnp 2e.4 off end	# EC
+							device pnp 2e.5 on	# Keyboard
 								io 0x60 = 0x60
 								io 0x62 = 0x64
 								irq 0x70 = 1
 							end
-							device pnp 2e.6 on #  Mouse
+							device pnp 2e.6 on	# Mouse
 								irq 0x70 = 12
 							end
-							device pnp 2e.7 off #  GPIO, must be closed for unresolved reason.
+							device pnp 2e.7 off	# GPIO, must be closed for unresolved reason.
 							end
-							device pnp 2e.8 off #  MIDI
+							device pnp 2e.8 off	# MIDI
 								io 0x60 = 0x300
 								irq 0x70 = 9
 							end
-							device pnp 2e.9 off #  GAME
+							device pnp 2e.9 off	# GAME
 								io 0x60 = 0x220
 							end
-							device pnp 2e.a off end #  CIR
+							device pnp 2e.a off end	# CIR
 						end	#superio/ite/it8712f
 					end		#LPC
-					device pci 14.4 on end # PCI 0x4384
-					device pci 14.5 on end # ACI 0x4382
-					device pci 14.6 on end # MCI 0x438e
+					device pci 14.4 on end	# PCI 0x4384
+					device pci 14.5 on end	# ACI 0x4382
+					device pci 14.6 on end	# MCI 0x438e
 					register "hda_viddid" = "0x10ec0882"
 				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
@@ -119,4 +119,3 @@ chip northbridge/amd/amdk8/root_complex
 		end		#northbridge/amd/amdk8
 	end #domain
 end		#northbridge/amd/amdk8/root_complex
-
diff --git a/src/mainboard/amd/dinar/devicetree.cb b/src/mainboard/amd/dinar/devicetree.cb
index 09becd4..680e718 100644
--- a/src/mainboard/amd/dinar/devicetree.cb
+++ b/src/mainboard/amd/dinar/devicetree.cb
@@ -26,25 +26,25 @@ chip northbridge/amd/agesa/family15/root_complex
 	device domain 0 on
 		subsystemid 0x1022 0x1705 inherit
 		chip northbridge/amd/agesa/family15 # CPU side of HT root complex
-			device pci 18.0 on     # Put IO-HUB at link_num 0, Instead of HT Link topology to satisfy both f10 and f15 CPUs
+			device pci 18.0 on	# Put IO-HUB at link_num 0, Instead of HT Link topology to satisfy both f10 and f15 CPUs
 				chip northbridge/amd/cimx/rd890 # North Bridge PCI side of HT Root complex
-					device pci 0.0 on  end # HT Root Complex
-					device pci 0.1 off end # CLKCONFIG
-					device pci 2.0 on  end # GPP1 Port0
-					device pci 3.0 off end # GPP1 Port1
-					device pci 4.0 off end # GPP3a Port0
-					device pci 5.0 off end # GPP3a Port1
-					device pci 6.0 off end # GPP3a Port2
-					device pci 7.0 off end # GPP3a Port3
-					device pci 8.0 off end # NB/SB Link P2P bridge, should be hidden at boot time
-					device pci 9.0 off end # GPP3a Port4
-					device pci a.0 off end # GPP3a Port5
-					device pci b.0 off end # GPP2 Port0 (Not for sr5650)
-					device pci c.0 off end # GPP2 Port1 (Not for sr5650/sr5670)
-					device pci d.0 on  end # GPP3b Port0 (Not for sr5650/sr5670) 0x5A1E, Intel 82576
-					register "gpp1_configuration" = "0"   # Configuration 16:0 default
-					register "gpp2_configuration" = "1"   # Configuration 8:8
-					register "gpp3a_configuration" = "2"   # 2 Configuration 4:1:1:0:0:0, 11 Configuration 1:1:1:1:1:1
+					device pci 0.0 on end	# HT Root Complex
+					device pci 0.1 off end	# CLKCONFIG
+					device pci 2.0 on end	# GPP1 Port0
+					device pci 3.0 off end	# GPP1 Port1
+					device pci 4.0 off end	# GPP3a Port0
+					device pci 5.0 off end	# GPP3a Port1
+					device pci 6.0 off end	# GPP3a Port2
+					device pci 7.0 off end	# GPP3a Port3
+					device pci 8.0 off end	# NB/SB Link P2P bridge, should be hidden at boot time
+					device pci 9.0 off end	# GPP3a Port4
+					device pci a.0 off end	# GPP3a Port5
+					device pci b.0 off end	# GPP2 Port0 (Not for sr5650)
+					device pci c.0 off end	# GPP2 Port1 (Not for sr5650/sr5670)
+					device pci d.0 on end	# GPP3b Port0 (Not for sr5650/sr5670) 0x5A1E, Intel 82576
+					register "gpp1_configuration" = "0"	# Configuration 16:0 default
+					register "gpp2_configuration" = "1"	# Configuration 8:8
+					register "gpp3a_configuration" = "2"	# 2 Configuration 4:1:1:0:0:0, 11 Configuration 1:1:1:1:1:1
 					register "port_enable" = "0x2104"
 				end # northbridge/amd/cimx/rd890
 				chip southbridge/amd/cimx/sb700 # it is under NB/SB Link, but on the same pri bus
@@ -57,11 +57,11 @@ chip northbridge/amd/agesa/family15/root_complex
 					device pci 13.2 on end # USB2
 					device pci 14.0 on # SM
 					end # SM
-					device pci 14.1 off end # IDE  0x439c
-					device pci 14.2 off end # HDA  0x4383
-					device pci 14.3 on # LPC
-						chip superio/smsc/sch4037  # SIO SMSC SCH4037
-							device pnp 2e.0 on # Floppy
+					device pci 14.1 off end	# IDE	0x439c
+					device pci 14.2 off end	# HDA	0x4383
+					device pci 14.3 on	# LPC
+						chip superio/smsc/sch4037	# SIO SMSC SCH4037
+							device pnp 2e.0 on	# Floppy
 							io 0x60 = 0x3f0
 							irq 0x70 = 6
 							irq 0x74 = 2
@@ -89,7 +89,7 @@ chip northbridge/amd/agesa/family15/root_complex
 				end #LPC
 				device pci 14.4 on end # PCI bridge, 0x4384
 					device pci 14.5 on end # USB 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
 				end #southbridge/amd/cimx/sb700
 			end # device pci 18.0
 			device pci 18.1 on end
@@ -106,4 +106,3 @@ chip northbridge/amd/agesa/family15/root_complex
 		end #chip northbridge/amd/agesa/family15 # CPU side of HT root complex
 	end #domain
 end #northbridge/amd/agesa/family15/root_complex
-
diff --git a/src/mainboard/amd/inagua/devicetree.cb b/src/mainboard/amd/inagua/devicetree.cb
index 67c3a1a..8f28742 100644
--- a/src/mainboard/amd/inagua/devicetree.cb
+++ b/src/mainboard/amd/inagua/devicetree.cb
@@ -25,25 +25,25 @@ 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, 9802 to 9806
-					device pci 1.1 on end # Internal HDMI Audio
-					device pci 4.0 on  end # PCIE P2P bridge MXM lane 0
-					device pci 5.0 off end # PCIE P2P bridge MXM lane 1
-					device pci 6.0 on end # PCIE P2P bridge  LAN
-					device pci 7.0 on end # PCIE P2P bridge  MINIPCIE SLOT1
-					device pci 8.0 off end # NB/SB Link P2P bridge
+					device pci 0.0 on end	# Root Complex
+					device pci 1.0 on end	# Internal Graphics P2P bridge, 9802 to 9806
+					device pci 1.1 on end	# Internal HDMI Audio
+					device pci 4.0 on end	# PCIE P2P bridge MXM lane 0
+					device pci 5.0 off end	# PCIE P2P bridge MXM lane 1
+					device pci 6.0 on end	# PCIE P2P bridge LAN
+					device pci 7.0 on end	# PCIE P2P bridge MINIPCIE SLOT1
+					device pci 8.0 off end	# NB/SB Link P2P bridge
 				end # agesa northbridge
 
 				chip southbridge/amd/cimx/sb800 # it is under NB/SB Link, but on the same pri bus
-					device pci 11.0 on end # SATA
-					device pci 12.0 on end # OHCI USB 0-4
-					device pci 12.2 on end # EHCI USB 0-4
-					device pci 13.0 on end # OHCI USB 5-9
-					device pci 13.2 on end # EHCI USB 5-9
-					device pci 14.0 on # SM
+					device pci 11.0 on end	# SATA
+					device pci 12.0 on end	# OHCI USB 0-4
+					device pci 12.2 on end	# EHCI USB 0-4
+					device pci 13.0 on end	# OHCI USB 5-9
+					device pci 13.2 on end	# EHCI USB 5-9
+					device pci 14.0 on	# SM
 						chip drivers/generic/generic #dimm 0-0-0
 							device i2c 50 on end
 						end
@@ -51,11 +51,11 @@ chip northbridge/amd/agesa/family14/root_complex
 							device i2c 51 on end
 						end
 					end # SM
-					device pci 14.1 on end # IDE    0x439c
-					device pci 14.2 on end # HDA    0x4383
-					device pci 14.3 on # LPC	0x439d
+					device pci 14.1 on end	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on	# LPC	0x439d
 						chip superio/smsc/kbc1100
-							device pnp 2e.7 on #  Keyboard
+							device pnp 2e.7 on	# Keyboard
 								io 0x60 = 0x60
 								io 0x62 = 0x64
 								irq 0x70 = 1
@@ -63,19 +63,19 @@ chip northbridge/amd/agesa/family14/root_complex
 							end
 						end # kbc1100
 					end #LPC
-					device pci 14.4 off end # PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0}
-					device pci 14.5 on end # OHCI FS/LS USB
-					device pci 14.6 on end # Hudson-E1 GbE MAC: Broadcom BCM5785 (14E4:1699)
-					device pci 15.0 on end # PCIe PortA  Express Card
-					device pci 15.1 on end # PCIe PortB  NEC USB3.0
-					device pci 15.2 on end # PCIe PortC  MINIPCIE SLOT2
-					device pci 15.3 on end # PCIe PortD  PCIE X1 SLOT
-					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
+					device pci 14.4 off end	# PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0}
+					device pci 14.5 on end	# OHCI FS/LS USB
+					device pci 14.6 on end	# Hudson-E1 GbE MAC: Broadcom BCM5785 (14E4:1699)
+					device pci 15.0 on end	# PCIe PortA Express Card
+					device pci 15.1 on end	# PCIe PortB NEC USB3.0
+					device pci 15.2 on end	# PCIe PortC MINIPCIE SLOT2
+					device pci 15.3 on end	# PCIe PortD PCIE X1 SLOT
+					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.0 on end
@@ -94,4 +94,3 @@ chip northbridge/amd/agesa/family14/root_complex
 		end #chip northbridge/amd/agesa/family14 # CPU side of HT root complex
 	end #domain
 end #northbridge/amd/agesa/family14/root_complex
-
diff --git a/src/mainboard/amd/mahogany/devicetree.cb b/src/mainboard/amd/mahogany/devicetree.cb
index 56efd84..6cd26e2 100644
--- a/src/mainboard/amd/mahogany/devicetree.cb
+++ b/src/mainboard/amd/mahogany/devicetree.cb
@@ -17,21 +17,21 @@ chip northbridge/amd/amdk8/root_complex
 	device domain 0 on
 		subsystemid 0x1022 0x3060 inherit
 		chip northbridge/amd/amdk8
-			device pci 18.0 on #  southbridge
+			device pci 18.0 on	# southbridge
 				chip southbridge/amd/rs780
-					device pci 0.0 on end # HT  	0x9600
-					device pci 1.0 on end # Internal Graphics P2P bridge 0x9602
-					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x9603
-					device pci 3.0 on end # PCIE P2P bridge	0x960b
-					device pci 4.0 on end # PCIE P2P bridge 0x9604
-					device pci 5.0 off end # PCIE P2P bridge 0x9605
-					device pci 6.0 off end # PCIE P2P bridge 0x9606
-					device pci 7.0 off end # PCIE P2P bridge 0x9607
-					device pci 8.0 off end # NB/SB Link P2P bridge
-					device pci 9.0 on end #
-					device pci a.0 on end #
-					register "gppsb_configuration" = "1"   # Configuration B
-					register "gpp_configuration" = "3"   # Configuration D default
+					device pci 0.0 on end	# HT	0x9600
+					device pci 1.0 on end	# Internal Graphics P2P bridge 0x9602
+					device pci 2.0 on end	# PCIE P2P bridge (external graphics) 0x9603
+					device pci 3.0 on end	# PCIE P2P bridge	0x960b
+					device pci 4.0 on end	# PCIE P2P bridge 0x9604
+					device pci 5.0 off end	# PCIE P2P bridge 0x9605
+					device pci 6.0 off end	# PCIE P2P bridge 0x9606
+					device pci 7.0 off end	# PCIE P2P bridge 0x9607
+					device pci 8.0 off end	# NB/SB Link P2P bridge
+					device pci 9.0 on end	#
+					device pci a.0 on end	#
+					register "gppsb_configuration" = "1"	# Configuration B
+					register "gpp_configuration" = "3"	# Configuration D default
 					register "port_enable" = "0x6fc"
 					register "gfx_dev2_dev3" = "1"
 					register "gfx_dual_slot" = "1"
@@ -42,14 +42,14 @@ chip northbridge/amd/amdk8/root_complex
 					register "gfx_link_width" = "0"
 				end
 				chip southbridge/amd/sb700 # it is under NB/SB Link, but on the same pri bus
-					device pci 11.0 on end # SATA
-					device pci 12.0 on end # USB
-					device pci 12.1 on end # USB
-					device pci 12.2 on end # USB
-					device pci 13.0 on end # USB
-					device pci 13.1 on end # USB
-					device pci 13.2 on end # USB
-	 				device pci 14.0 on # SM
+					device pci 11.0 on end	# SATA
+					device pci 12.0 on end	# USB
+					device pci 12.1 on end	# USB
+					device pci 12.2 on end	# USB
+					device pci 13.0 on end	# USB
+					device pci 13.1 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
@@ -63,53 +63,53 @@ chip northbridge/amd/amdk8/root_complex
 							device i2c 53 on end
 						end
 					end # SM
-					device pci 14.1 on end # IDE    0x439c
-					device pci 14.2 on end # HDA    0x4383
-					device pci 14.3 on # LPC	0x439d
+					device pci 14.1 on end	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on	# LPC	0x439d
 						chip superio/ite/it8718f
-							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 on #  Com1
+							device pnp 2e.1 on	# Com1
 								io 0x60 = 0x3f8
 								irq 0x70 = 4
 							end
-							device pnp 2e.2 off #  Com2
+							device pnp 2e.2 off	# Com2
 								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 2e.3 off #  Parallel Port
+							device pnp 2e.3 off	# Parallel Port
 								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 2e.4 off end #  EC
-							device pnp 2e.5 on #  Keyboard
+							device pnp 2e.4 off end	# EC
+							device pnp 2e.5 on	# Keyboard
 								io 0x60 = 0x60
 								io 0x62 = 0x64
 								irq 0x70 = 1
 							end
-							device pnp 2e.6 on #  Mouse
+							device pnp 2e.6 on	# Mouse
 								irq 0x70 = 12
 							end
-							device pnp 2e.7 off #  GPIO, must be closed for unresolved reason.
+							device pnp 2e.7 off	# GPIO, must be closed for unresolved reason.
 							end
-							device pnp 2e.8 off #  MIDI
+							device pnp 2e.8 off	# MIDI
 								io 0x60 = 0x300
 								irq 0x70 = 9
 							end
-							device pnp 2e.9 off #  GAME
+							device pnp 2e.9 off	# GAME
 								io 0x60 = 0x220
 							end
-							device pnp 2e.a off end #  CIR
+							device pnp 2e.a off end	# CIR
 						end	#superio/ite/it8718f
 					end		#LPC
-					device pci 14.4 on end # PCI 0x4384
-					device pci 14.5 on end # USB 2
+					device pci 14.4 on end	# PCI 0x4384
+					device pci 14.5 on end	# USB 2
 					register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				end	#southbridge/amd/sb700
-			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/amd/mahogany_fam10/devicetree.cb b/src/mainboard/amd/mahogany_fam10/devicetree.cb
index 5000b0c..4069d55 100644
--- a/src/mainboard/amd/mahogany_fam10/devicetree.cb
+++ b/src/mainboard/amd/mahogany_fam10/devicetree.cb
@@ -1,28 +1,28 @@
 # sample config for amd/mahogany_fam10
 chip northbridge/amd/amdfam10/root_complex
 	device cpu_cluster 0 on
-		chip cpu/amd/socket_AM2r2  #L1 and DDR2
+		chip cpu/amd/socket_AM2r2	#L1 and DDR2
 			 device lapic 0 on end
 		end
 	end
 	device domain 0 on
 		subsystemid 0x1022 0x3060 inherit
 		chip northbridge/amd/amdfam10
-			device pci 18.0 on #  northbridge
+			device pci 18.0 on	# northbridge
 				chip southbridge/amd/rs780
-					device pci 0.0 on end # HT  	0x9600
-					device pci 1.0 on end # Internal Graphics P2P bridge 0x9602
-					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x9603
-					device pci 3.0 on end # PCIE P2P bridge	0x960b
-					device pci 4.0 on end # PCIE P2P bridge 0x9604
-					device pci 5.0 off end # PCIE P2P bridge 0x9605
-					device pci 6.0 off end # PCIE P2P bridge 0x9606
-					device pci 7.0 off end # PCIE P2P bridge 0x9607
-					device pci 8.0 off end # NB/SB Link P2P bridge
-					device pci 9.0 on end #
-					device pci a.0 on end #
-					register "gppsb_configuration" = "1"   # Configuration B
-					register "gpp_configuration" = "3"   # Configuration D default
+					device pci 0.0 on end	# HT	0x9600
+					device pci 1.0 on end	# Internal Graphics P2P bridge 0x9602
+					device pci 2.0 on end	# PCIE P2P bridge (external graphics) 0x9603
+					device pci 3.0 on end	# PCIE P2P bridge	0x960b
+					device pci 4.0 on end	# PCIE P2P bridge 0x9604
+					device pci 5.0 off end	# PCIE P2P bridge 0x9605
+					device pci 6.0 off end	# PCIE P2P bridge 0x9606
+					device pci 7.0 off end	# PCIE P2P bridge 0x9607
+					device pci 8.0 off end	# NB/SB Link P2P bridge
+					device pci 9.0 on end	#
+					device pci a.0 on end	#
+					register "gppsb_configuration" = "1"	# Configuration B
+					register "gpp_configuration" = "3"	# Configuration D default
 					register "port_enable" = "0x6fc"
 					register "gfx_dev2_dev3" = "1"
 					register "gfx_dual_slot" = "1"
@@ -33,14 +33,14 @@ chip northbridge/amd/amdfam10/root_complex
 					register "gfx_link_width" = "0"
 				end
 				chip southbridge/amd/sb700 # it is under NB/SB Link, but on the same pri bus
-					device pci 11.0 on end # SATA
-					device pci 12.0 on end # USB
-					device pci 12.1 on end # USB
-					device pci 12.2 on end # USB
-					device pci 13.0 on end # USB
-					device pci 13.1 on end # USB
-					device pci 13.2 on end # USB
-	 				device pci 14.0 on # SM
+					device pci 11.0 on end	# SATA
+					device pci 12.0 on end	# USB
+					device pci 12.1 on end	# USB
+					device pci 12.2 on end	# USB
+					device pci 13.0 on end	# USB
+					device pci 13.1 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
@@ -54,53 +54,53 @@ chip northbridge/amd/amdfam10/root_complex
 							device i2c 53 on end
 						end
 					end # SM
-					device pci 14.1 on end # IDE    0x439c
-					device pci 14.2 on end # HDA    0x4383
-					device pci 14.3 on # LPC	0x439d
+					device pci 14.1 on end	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on	# LPC	0x439d
 						chip superio/ite/it8718f
-							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 on #  Com1
+							device pnp 2e.1 on	# Com1
 								io 0x60 = 0x3f8
 								irq 0x70 = 4
 							end
-							device pnp 2e.2 off #  Com2
+							device pnp 2e.2 off	# Com2
 								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 2e.3 off #  Parallel Port
+							device pnp 2e.3 off	# Parallel Port
 								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 2e.4 off end #  EC
-							device pnp 2e.5 on #  Keyboard
+							device pnp 2e.4 off end	# EC
+							device pnp 2e.5 on	# Keyboard
 								io 0x60 = 0x60
 								io 0x62 = 0x64
 								irq 0x70 = 1
 							end
-							device pnp 2e.6 on #  Mouse
+							device pnp 2e.6 on	# Mouse
 								irq 0x70 = 12
 							end
-							device pnp 2e.7 off #  GPIO, must be closed for unresolved reason.
+							device pnp 2e.7 off	# GPIO, must be closed for unresolved reason.
 							end
-							device pnp 2e.8 off #  MIDI
+							device pnp 2e.8 off	# MIDI
 								io 0x60 = 0x300
 								irq 0x70 = 9
 							end
-							device pnp 2e.9 off #  GAME
+							device pnp 2e.9 off	# GAME
 								io 0x60 = 0x220
 							end
-							device pnp 2e.a off end #  CIR
+							device pnp 2e.a off end	# CIR
 						end	#superio/ite/it8718f
 					end		#LPC
-					device pci 14.4 on end # PCI 0x4384
-					device pci 14.5 on end # USB 2
+					device pci 14.4 on end	# PCI 0x4384
+					device pci 14.5 on end	# USB 2
 					register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				end	#southbridge/amd/sb700
-			end #  device pci 18.0
+			end # device pci 18.0
 
 			device pci 18.0 on end
 			device pci 18.0 on end
@@ -114,15 +114,15 @@ chip northbridge/amd/amdfam10/root_complex
 	#for node 32 to node 63
 #	device domain 0 on
 #		chip northbridge/amd/amdfam10
-#			  device pci 00.0 on end#  northbridge
-#			  device pci 00.0 on end
-#			  device pci 00.0 on end
-#			  device pci 00.0 on end
-#			  device pci 00.1 on end
-#			  device pci 00.2 on end
-#			  device pci 00.3 on end
-#			  device pci 00.4 on end
-#			 device pci 00.5 on end
+#			device pci 00.0 on end# northbridge
+#			device pci 00.0 on end
+#			device pci 00.0 on end
+#			device pci 00.0 on end
+#			device pci 00.1 on end
+#			device pci 00.2 on end
+#			device pci 00.3 on end
+#			device pci 00.4 on end
+#			device pci 00.5 on end
 #		end
 #	end #domain
 
diff --git a/src/mainboard/amd/norwich/devicetree.cb b/src/mainboard/amd/norwich/devicetree.cb
index 93effaa..9840e91 100644
--- a/src/mainboard/amd/norwich/devicetree.cb
+++ b/src/mainboard/amd/norwich/devicetree.cb
@@ -3,14 +3,14 @@ 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 IRQs. OK
 			register "lpc_serirq_enable" = "0x00001002"
 			register "lpc_serirq_polarity" = "0x0000EFFD"
 			register "lpc_serirq_mode" = "1"
 			register "enable_gpio_int_route" = "0x0D0C0700"
-			register "enable_ide_nand_flash" = "0" # 0:ide mode, 1:flash
+			register "enable_ide_nand_flash" = "0"	# 0:ide mode, 1:flash
 			register "enable_USBP4_device" = "0"	#0: host, 1:device
 			register "enable_USBP4_overcurrent" = "0" #0:off, xxxx:overcurrent setting CS5536 Data Book (pages 380-381)
 			register "com1_enable" = "1"
@@ -38,4 +38,3 @@ chip northbridge/amd/lx
 		end
 	end
 end
-
diff --git a/src/mainboard/amd/olivehill/devicetree.cb b/src/mainboard/amd/olivehill/devicetree.cb
index 3bcaaee..bfb74ef 100644
--- a/src/mainboard/amd/olivehill/devicetree.cb
+++ b/src/mainboard/amd/olivehill/devicetree.cb
@@ -19,7 +19,7 @@
 chip northbridge/amd/agesa/family16kb/root_complex
 	device cpu_cluster 0 on
 		chip cpu/amd/agesa/family16kb
-			device lapic 0 on  end
+			device lapic 0 on end
 		end
 	end
 
@@ -28,25 +28,25 @@ chip northbridge/amd/agesa/family16kb/root_complex
 		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
+				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
+				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
@@ -54,17 +54,17 @@ chip northbridge/amd/agesa/family16kb/root_complex
 						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
+				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/hudson
 
-			device pci 18.0 on  end
-			device pci 18.1 on  end
-			device pci 18.2 on  end
-			device pci 18.3 on  end
-			device pci 18.4 on  end
-			device pci 18.5 on  end
+			device pci 18.0 on end
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+			device pci 18.4 on end
+			device pci 18.5 on end
 			register "spdAddrLookup" = "
 			{
 				{ {0xA0, 0xA2}, {0x00, 0x00}, }, // socket 0 - Channel 0 & 1 - 8-bit SPD addresses
diff --git a/src/mainboard/amd/parmer/devicetree.cb b/src/mainboard/amd/parmer/devicetree.cb
index 62b37e1..206305e 100644
--- a/src/mainboard/amd/parmer/devicetree.cb
+++ b/src/mainboard/amd/parmer/devicetree.cb
@@ -29,27 +29,27 @@ chip northbridge/amd/agesa/family15tn/root_complex
 		chip northbridge/amd/agesa/family15tn # CPU 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 1.0 on  end # Internal Graphics P2P bridge 0x99XX
-				device pci 1.1 on  end # Internal Multimedia
-				device pci 2.0 on  end # PCIE SLOT0 x16
+				device pci 0.0 on end	# Root Complex
+				device pci 1.0 on end	# Internal Graphics P2P bridge 0x99XX
+				device pci 1.1 on end	# Internal Multimedia
+				device pci 2.0 on end	# PCIE SLOT0 x16
 				device pci 3.0 off end
-				device pci 4.0 on  end # PCIE MINI0
-				device pci 5.0 on  end # PCIE MINI1
-				device pci 6.0 on  end # PCIE Slot1 x1
-				device pci 7.0 on  end # LAN
-				device pci 8.0 off end # NB/SB Link P2P bridge
+				device pci 4.0 on end	# PCIE MINI0
+				device pci 5.0 on end	# PCIE MINI1
+				device pci 6.0 on end	# PCIE Slot1 x1
+				device pci 7.0 on end	# LAN
+				device pci 8.0 off end	# NB/SB Link P2P bridge
 			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
-				device pci 10.0 on  end # XHCI HC0
-				device pci 10.1 on  end # XHCI HC1
-				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      # SMBUS
+				device pci 10.0 on end	# XHCI HC0
+				device pci 10.1 on end	# XHCI HC1
+				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	# SMBUS
 					chip drivers/generic/generic #dimm 0
 						device i2c 50 on end # 7-bit SPD address
 					end
@@ -57,17 +57,17 @@ chip northbridge/amd/agesa/family15tn/root_complex
 						device i2c 51 on end # 7-bit SPD address
 					end
 				end # SM
-				device pci 14.1 on  end # IDE	0x439c
-				device pci 14.2 on  end # HDA	0x4383
-				device pci 14.3 on  end # LPC	0x439d
-				device pci 14.4 on  end # PCI	0x4384 # PCI-b conflict with GPIO.
-				device pci 14.5 on  end # USB 2
-				device pci 14.6 off end # Gec
-				device pci 14.7 on  end # SD
-				device pci 15.0 off end # PCIe 0
-				device pci 15.1 off end # PCIe 1
-				device pci 15.2 off end # PCIe 2
-				device pci 15.3 off end # PCIe 3
+				device pci 14.1 on end	# IDE	0x439c
+				device pci 14.2 on end	# HDA	0x4383
+				device pci 14.3 on end	# LPC	0x439d
+				device pci 14.4 on end	# PCI	0x4384 # PCI-b conflict with GPIO.
+				device pci 14.5 on end	# USB 2
+				device pci 14.6 off end	# Gec
+				device pci 14.7 on end	# SD
+				device pci 15.0 off end	# PCIe 0
+				device pci 15.1 off end	# PCIe 1
+				device pci 15.2 off end	# PCIe 2
+				device pci 15.3 off end	# PCIe 3
 				register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				register "gpp_configuration" = "4"
 			end	#chip southbridge/amd/hudson
diff --git a/src/mainboard/amd/persimmon/devicetree.cb b/src/mainboard/amd/persimmon/devicetree.cb
index 8b1acd5..a25f53f 100644
--- a/src/mainboard/amd/persimmon/devicetree.cb
+++ b/src/mainboard/amd/persimmon/devicetree.cb
@@ -19,30 +19,30 @@
 chip northbridge/amd/agesa/family14/root_complex
 	device cpu_cluster 0 on
 			chip cpu/amd/agesa/family14
-			  device lapic 0 on end
+				device lapic 0 on end
 			end
 	end
 	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]
-						device pci 4.0 on end # PCIE P2P bridge on-board NIC
-						device pci 5.0 off end # PCIE P2P bridge
-						device pci 6.0 on end # PCIE P2P bridge PCIe slot
-						device pci 7.0 off end # PCIE P2P bridge
-						device pci 8.0 off end # NB/SB Link P2P bridge
+						device pci 0.0 on end	# Root Complex
+						device pci 1.0 on end	# Internal Graphics P2P bridge 0x980[2456]
+						device pci 4.0 on end	# PCIE P2P bridge on-board NIC
+						device pci 5.0 off end	# PCIE P2P bridge
+						device pci 6.0 on end	# PCIE P2P bridge PCIe slot
+						device pci 7.0 off end	# PCIE P2P bridge
+						device pci 8.0 off end	# NB/SB Link P2P bridge
 					end # agesa northbridge
 
 					chip southbridge/amd/cimx/sb800 # it is under NB/SB Link, but on the same pri bus
-						device pci 11.0 on end # SATA
-						device pci 12.0 on end # OHCI USB 0-4
-						device pci 12.2 on end # EHCI USB 0-4
-						device pci 13.0 on end # OHCI USB 5-9
-						device pci 13.2 on end # EHCI USB 5-9
-						device pci 14.0 on # SM
+						device pci 11.0 on end	# SATA
+						device pci 12.0 on end	# OHCI USB 0-4
+						device pci 12.2 on end	# EHCI USB 0-4
+						device pci 13.0 on end	# OHCI USB 5-9
+						device pci 13.2 on end	# EHCI USB 5-9
+						device pci 14.0 on	# SM
 						chip drivers/generic/generic #dimm 0-0-0
 							device i2c 50 on end
 						end
@@ -50,48 +50,48 @@ chip northbridge/amd/agesa/family14/root_complex
 							device i2c 51 on end
 						end
 					end # SM
-					device pci 14.1 on end # IDE	0x439c
-					device pci 14.2 on end # HDA	0x4383
-					device pci 14.3 on # LPC		0x439d
+					device pci 14.1 on end	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on	# LPC	0x439d
 					chip superio/fintek/f81865f
 						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 off end			# Hardware Monitor
-						device pnp 4e.5 on #  Keyboard
+						device pnp 4e.3 off end		# Parallel Port
+						device pnp 4e.4 off end		# Hardware Monitor
+						device pnp 4e.5 on		# Keyboard
 							io 0x60 = 0x60
 							io 0x62 = 0x64
 							irq 0x70 = 1
 						end
-						device pnp 4e.6 off end			# GPIO
-						device pnp 4e.a off end			# PME
-						device pnp 4e.10 on			# COM1
+						device pnp 4e.6 off end		# GPIO
+						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
+						device pnp 4e.11 on		# COM2
 							io 0x60 = 0x2f8
 							irq 0x70 = 3
 						end
 					end # f81865f
 				end #LPC
-				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 off end # OHCI USB 10-13
-				device pci 16.2 off end # EHCI USB 10-13
-				register "gpp_configuration" = "0" #4:0:0:0 (really need to disable all 4 somehow)
-				register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
+				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 off end	# OHCI USB 10-13
+				device pci 16.2 off end	# EHCI USB 10-13
+				register "gpp_configuration"	= "0"	#4:0:0:0 (really need to disable all 4 somehow)
+				register "boot_switch_sata_ide"	= "0"	# 0: boot from SATA. 1: IDE
 
 				#set up SB800 Fan control registers and IMC fan controls
-				register "imc_port_address" = "0x6E"	# 0x2E and 0x6E are common
+				register "imc_port_address"	= "0x6E"	# 0x2E and 0x6E are common
 				register "fan0_enabled" = "1"
 				register "fan1_enabled" = "1"
 				register "imc_fan_zone0_enabled" = "1"
@@ -130,16 +130,16 @@ chip northbridge/amd/agesa/family14/root_complex
 				register "imc_zone1_pwm_step" = "0x01"		# Fan PWM stepping rate
 				register "imc_zone1_ramping" = "0x00"		# Disable Fan PWM ramping and stepping
 
-				# T56N has a Maximum operating temperature  of 90C
+				# T56N has a Maximum operating temperature of 90C
 				# ZONEX_THRESHOLDS - _AC0 - _AC7, _CRT - Temp Threshold in degrees C
 				# ZONEX_FANSPEEDS - Fan speeds as a "percentage"
-				register "imc_zone0_thresholds" = "{ 87, 82, 77, 72, 65, 1, 0, 0, 90 }"
-				register "imc_zone0_fanspeeds"  = "{100,  7,  5,  4,  3, 2, 0, 0 }"
-				register "imc_zone1_thresholds" = "{ 85, 80, 75, 65,  1, 0, 0, 0, 90 }"
-				register "imc_zone1_fanspeeds"  = "{100, 10,  6,  4,  3, 0, 0, 0 }"
+				register "imc_zone0_thresholds"	= "{ 87, 82, 77, 72, 65, 1, 0, 0, 90 }"
+				register "imc_zone0_fanspeeds"	= "{100,  7,  5,  4,  3, 2, 0, 0 }"
+				register "imc_zone1_thresholds"	= "{ 85, 80, 75, 65,  1, 0, 0, 0, 90 }"
+				register "imc_zone1_fanspeeds"	= "{100, 10,  6,  4,  3, 0, 0, 0 }"
 
 			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/amd/pistachio/devicetree.cb b/src/mainboard/amd/pistachio/devicetree.cb
index 760e5ab..7bafc24 100644
--- a/src/mainboard/amd/pistachio/devicetree.cb
+++ b/src/mainboard/amd/pistachio/devicetree.cb
@@ -17,11 +17,11 @@ chip northbridge/amd/amdk8/root_complex
 	device domain 0 on
 		subsystemid 0x1022 0x3050 inherit
 		chip northbridge/amd/amdk8
-			device pci 18.0 on #  southbridge, K8 HT Configuration
+			device pci 18.0 on	# southbridge, K8 HT Configuration
 				chip southbridge/amd/rs690
-					device pci 0.0 on end # HT  	0x7910
-				#	device pci 0.1 off end # CLK
-					device pci 1.0 on  # Internal Graphics P2P bridge 0x7912
+					device pci 0.0 on end	# HT	0x7910
+				#	device pci 0.1 off end	# CLK
+					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
@@ -42,14 +42,14 @@ chip northbridge/amd/amdk8/root_complex
 					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
+					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
@@ -63,14 +63,14 @@ chip northbridge/amd/amdk8/root_complex
 							device i2c 53 off 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 end # LPC	0x438d
-				device pci 14.4 on end # PCI 0x4384
-				device pci 14.5 on end # ACI 0x4382
-				device pci 14.6 on end # MCI 0x438e
+				device pci 14.1 on end	# IDE	0x438c
+				device pci 14.2 on end	# HDA	0x4383
+				device pci 14.3 on end	# LPC	0x438d
+				device pci 14.4 on end	# PCI	0x4384
+				device pci 14.5 on end	# ACI	0x4382
+				device pci 14.6 on end	# MCI	0x438e
 				end	#southbridge/amd/sb600
-			end #  device pci 18.0
+			end # device pci 18.0
 
 			device pci 18.1 on end		# K8 Address Map
 			device pci 18.2 on end		# K8 DRAM Controller and HT Trace Mode
@@ -78,4 +78,3 @@ chip northbridge/amd/amdk8/root_complex
 		end		#northbridge/amd/amdk8
 	end #domain
 end		#northbridge/amd/amdk8/root_complex
-
diff --git a/src/mainboard/amd/rumba/devicetree.cb b/src/mainboard/amd/rumba/devicetree.cb
index a7a352f..d047356 100644
--- a/src/mainboard/amd/rumba/devicetree.cb
+++ b/src/mainboard/amd/rumba/devicetree.cb
@@ -4,18 +4,17 @@ chip northbridge/amd/gx2
 			device lapic 0 on end
 		end
 	end
-  	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
-			register "lpc_serirq_enable" = "0x80"  # enabled with default timing
-        		device pci d.0 on end	# Realtek 8139 LAN
-        		device pci f.0 on end	# ISA Bridge
-        		device pci f.2 on end	# IDE Controller
-        		device pci f.3 on end 	# Audio
-        		device pci f.4 on end	# OHCI
+		chip southbridge/amd/cs5536
+			register "lpc_serirq_enable" = "0x80"	# enabled with default timing
+			device pci d.0 on end	# Realtek 8139 LAN
+			device pci f.0 on end	# ISA Bridge
+			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.5 on end	# EHCI
-      		end
-    	end
+		end
+	end
 end
-
diff --git a/src/mainboard/amd/serengeti_cheetah/devicetree.cb b/src/mainboard/amd/serengeti_cheetah/devicetree.cb
index 28b7e01..adfc36f 100644
--- a/src/mainboard/amd/serengeti_cheetah/devicetree.cb
+++ b/src/mainboard/amd/serengeti_cheetah/devicetree.cb
@@ -1,14 +1,14 @@
 chip northbridge/amd/amdk8/root_complex
-        device cpu_cluster 0 on
-                chip cpu/amd/socket_F
-                        device lapic 0 on end
-                end
-        end
+	device cpu_cluster 0 on
+		chip cpu/amd/socket_F
+			device lapic 0 on end
+		end
+	end
 	device domain 0 on
 		subsystemid 0x1022 0x2b80 inherit
 		chip northbridge/amd/amdk8
-			device pci 18.0 on #  northbridge
-				#  devices on link 0, link 0 == LDT 0
+			device pci 18.0 on	# northbridge
+				# devices on link 0, link 0 == LDT 0
 				chip southbridge/amd/amd8132
 					# the on/off keyword is mandatory
 					device pci 0.0 on end
@@ -27,123 +27,118 @@ chip northbridge/amd/amdk8/root_complex
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
-							device pnp 2e.0 off #  Floppy
-                	                 			io 0x60 = 0x3f0
-                	                			irq 0x70 = 6
-                	                			drq 0x74 = 2
+							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
+							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 #  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
- 					 			io 0x60 = 0x290
+							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
+							end
 						end
 					end
 					device pci 1.1 on end
 					device pci 1.2 on end
 					device pci 1.3 on
-                                                chip drivers/i2c/i2cmux # pca9556 smbus mux
-                                                        device i2c 18 on #0 pca9516 1
-                                                                chip drivers/generic/generic #dimm 0-0-0
-                                                                        device i2c 50 on end
-                                                                end
-                                                                chip drivers/generic/generic #dimm 0-0-1
-                                                                        device i2c 51 on end
-                                                                end
-                                                                chip drivers/generic/generic #dimm 0-1-0
-                                                                        device i2c 52 on end
-                                                                end
-                                                                chip drivers/generic/generic #dimm 0-1-1
-                                                                        device i2c 53 on end
-                                                                end
-                                                        end
-                                                        device i2c 18 on #1 pca9516 2
-                                                                chip drivers/generic/generic #dimm 1-0-0
-                                                                        device i2c 50 on end
-                                                                end
-                                                                chip drivers/generic/generic #dimm 1-0-1
-                                                                        device i2c 51 on end
-                                                                end
-                                                                chip drivers/generic/generic #dimm 1-1-0
-                                                                        device i2c 52 on end
-                                                                end
-                                                                chip drivers/generic/generic #dimm 1-1-1
-                                                                        device i2c 53 on end
-                                                                end
-                                                                chip drivers/generic/generic #dimm 1-2-0
-                                                                        device i2c 54 on end
-                                                                end
-                                                                chip drivers/generic/generic #dimm 1-2-1
-                                                                        device i2c 55 on end
-                                                                end
-                                                                chip drivers/generic/generic #dimm 1-3-0
-                                                                        device i2c 56 on end
-                                                                end
-                                                                chip drivers/generic/generic #dimm 1-3-1
-                                                                        device i2c 57 on end
-                                                                end
-                                                        end
+						chip drivers/i2c/i2cmux # pca9556 smbus mux
+							device i2c 18 on #0 pca9516 1
+								chip drivers/generic/generic #dimm 0-0-0
+									device i2c 50 on end
+								end
+								chip drivers/generic/generic #dimm 0-0-1
+									device i2c 51 on end
+								end
+								chip drivers/generic/generic #dimm 0-1-0
+									device i2c 52 on end
+								end
+								chip drivers/generic/generic #dimm 0-1-1
+									device i2c 53 on end
+								end
+							end
+							device i2c 18 on #1 pca9516 2
+								chip drivers/generic/generic #dimm 1-0-0
+									device i2c 50 on end
+								end
+								chip drivers/generic/generic #dimm 1-0-1
+									device i2c 51 on end
+								end
+								chip drivers/generic/generic #dimm 1-1-0
+									device i2c 52 on end
+								end
+								chip drivers/generic/generic #dimm 1-1-1
+									device i2c 53 on end
+								end
+								chip drivers/generic/generic #dimm 1-2-0
+									device i2c 54 on end
+								end
+								chip drivers/generic/generic #dimm 1-2-1
+									device i2c 55 on end
+								end
+								chip drivers/generic/generic #dimm 1-3-0
+									device i2c 56 on end
+								end
+								chip drivers/generic/generic #dimm 1-3-1
+									device i2c 57 on end
+								end
+							end
 						end
 					end # acpi
 					device pci 1.5 off end
 					device pci 1.6 off end
-                	                register "ide0_enable" = "1"
-                	                register "ide1_enable" = "1"
+					register "ide0_enable" = "1"
+					register "ide1_enable" = "1"
 				end
-			end #  device pci 18.0
+			end # device pci 18.0
 
-                        device pci 18.0 on end
-                        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.2 on end
 			device pci 18.3 on end
 		end
-                chip northbridge/amd/amdk8
-                        device pci 19.0 on #  northbridge
-                                chip southbridge/amd/amd8151
-                                        # the on/off keyword is mandatory
-                                        device pci 0.0 on end
-                                        device pci 1.0 on end
-                                end
-                        end #  device pci 19.0
-
-                        device pci 19.0 on end
-                        device pci 19.0 on end
-                        device pci 19.1 on end
-                        device pci 19.2 on end
-                        device pci 19.3 on end
-                end
-
-
+		chip northbridge/amd/amdk8
+			device pci 19.0 on # northbridge
+				chip southbridge/amd/amd8151
+					# the on/off keyword is mandatory
+					device pci 0.0 on end
+					device pci 1.0 on end
+				end
+			end # device pci 19.0
+			device pci 19.0 on end
+			device pci 19.0 on end
+			device pci 19.1 on end
+			device pci 19.2 on end
+			device pci 19.3 on end
+		end
 	end #domain
 end
-
-
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb b/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb
index 8b5d817..3bfd5ed 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb
@@ -1,14 +1,14 @@
 chip northbridge/amd/amdfam10/root_complex
 	device cpu_cluster 0 on
-		chip cpu/amd/socket_F_1207  #L1 and DDR2
+		chip cpu/amd/socket_F_1207	#L1 and DDR2
 			 device lapic 0 on end
 		end
 	end
 	device domain 0 on
 		subsystemid 0x1022 0x2b80 inherit
 		chip northbridge/amd/amdfam10
-			device pci 18.0 on #  northbridge
-				#  devices on link 0, link 0 == LDT 0
+			device pci 18.0 on	# northbridge
+				# devices on link 0, link 0 == LDT 0
 				chip southbridge/amd/amd8132
 					# the on/off keyword is mandatory
 					device pci 0.0 on end
@@ -27,41 +27,41 @@ chip northbridge/amd/amdfam10/root_complex
 					end
 					device pci 1.0 on
 						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 off #  Com2
+							device pnp 2e.3 off	# 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
@@ -108,7 +108,7 @@ chip northbridge/amd/amdfam10/root_complex
 					register "ide0_enable" = "1"
 					register "ide1_enable" = "1"
 				end
-			end #  device pci 18.0
+			end # device pci 18.0
 
 			device pci 18.0 on end
 			device pci 18.0 on end
@@ -122,18 +122,15 @@ chip northbridge/amd/amdfam10/root_complex
 	#for node 32 to node 63
 #	device domain 0 on
 #		chip northbridge/amd/amdfam10
-#			  device pci 00.0 on end#  northbridge
-#			  device pci 00.0 on end
-#			  device pci 00.0 on end
-#			  device pci 00.0 on end
-#			  device pci 00.1 on end
-#			  device pci 00.2 on end
-#			  device pci 00.3 on end
-#			  device pci 00.4 on end
+#			 device pci 00.0 on end# northbridge
+#			 device pci 00.0 on end
+#			 device pci 00.0 on end
+#			 device pci 00.0 on end
+#			 device pci 00.1 on end
+#			 device pci 00.2 on end
+#			 device pci 00.3 on end
+#			 device pci 00.4 on end
 #			 device pci 00.5 on end
 #		end
 #	end #domain
-
 end
-
-
diff --git a/src/mainboard/amd/south_station/devicetree.cb b/src/mainboard/amd/south_station/devicetree.cb
index 60335d7..7b5cc3a 100644
--- a/src/mainboard/amd/south_station/devicetree.cb
+++ b/src/mainboard/amd/south_station/devicetree.cb
@@ -17,96 +17,95 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 chip northbridge/amd/agesa/family14/root_complex
-        device cpu_cluster 0 on
-                chip cpu/amd/agesa/family14
-                  device lapic 0 on end
-                end
-        end
-        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
-                                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 0x9804
-                                        device pci 1.1 on end # Internal HDMI Audio
-                                        device pci 4.0 on end # PCIE P2P bridge 0x9604
-                                        device pci 5.0 on end # PCIE P2P bridge 0x9605
-                                        device pci 6.0 on end # PCIE P2P bridge 0x9606
-                                        device pci 7.0 on end # PCIE P2P bridge 0x9607
-                                        device pci 8.0 on end # NB/SB Link P2P bridge
-                                end # agesa northbridge
+	device cpu_cluster 0 on
+		chip cpu/amd/agesa/family14
+			device lapic 0 on end
+		end
+	end
+	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
+				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 0x9804
+					device pci 1.1 on end	# Internal HDMI Audio
+					device pci 4.0 on end	# PCIE P2P bridge 0x9604
+					device pci 5.0 on end	# PCIE P2P bridge 0x9605
+					device pci 6.0 on end	# PCIE P2P bridge 0x9606
+					device pci 7.0 on end	# PCIE P2P bridge 0x9607
+					device pci 8.0 on end	# NB/SB Link P2P bridge
+				end # agesa northbridge
 
-                                chip southbridge/amd/cimx/sb800 # it is under NB/SB Link, but on the same pri bus
-                                        device pci 11.0 on end # SATA
-                                        device pci 12.0 on end # USB
-                                        device pci 12.1 on end # USB
-                                        device pci 12.2 on end # USB
-                                        device pci 13.0 on end # USB
-                                        device pci 13.1 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 # IDE    0x439c
-                                        device pci 14.2 on end # HDA    0x4383
-                                        device pci 14.3 on # LPC        0x439d
-					        chip superio/fintek/f81865f
+				chip southbridge/amd/cimx/sb800 # it is under NB/SB Link, but on the same pri bus
+					device pci 11.0 on end	# SATA
+					device pci 12.0 on end	# USB
+					device pci 12.1 on end	# USB
+					device pci 12.2 on end	# USB
+					device pci 13.0 on end	# USB
+					device pci 13.1 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	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on	# LPC	0x439d
+						chip superio/fintek/f81865f
 							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 off end			# Hardware Monitor
-							device pnp 4e.5 on #  Keyboard
+							device pnp 4e.3 off end		# Parallel Port
+							device pnp 4e.4 off end		# Hardware Monitor
+							device pnp 4e.5 on		# Keyboard
 								io 0x60 = 0x60
 								io 0x62 = 0x64
 								irq 0x70 = 1
 							end
-							device pnp 4e.6 off end			# GPIO
-							device pnp 4e.a off end			# PME
-							device pnp 4e.10 on			# COM1
+							device pnp 4e.6 off end		# GPIO
+							device pnp 4e.a off end		# PME
+							device pnp 4e.10 on		# COM1
 								io 0x60 = 0x3f8
 								irq 0x70 = 4
 							end
-							device pnp 4e.11 off			# COM2
+							device pnp 4e.11 off		# COM2
 								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-                                                end # f81865f
+						end # f81865f
 					end #LPC
-					device pci 14.4 off end # PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0}
-	  				device pci 14.5 on  end # USB 2
-					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 off end # OHCI USB3
-					device pci 16.2 off end # EHCI USB3
-					register "gpp_configuration" = "0" #4:0:0:0 (really need to disable all 4 somehow)
-		  			register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
+					device pci 14.4 off end	# PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0}
+					device pci 14.5 on end	# USB 2
+					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 off end	# OHCI USB3
+					device pci 16.2 off end	# EHCI USB3
+					register "gpp_configuration" = "0"	#4:0:0:0 (really need to disable all 4 somehow)
+					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.1 on end
-                        device pci 18.2 on end
-                        device pci 18.3 on end
-                        device pci 18.4 on end
-                        device pci 18.5 on end
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+			device pci 18.4 on end
+			device pci 18.5 on end
 
-                        register "spdAddrLookup" = "
-                        {
-                            { {0xA0, 0xA2}, {0x00, 0x00}, }, // socket 0 - Channel 0 & 1 - 8-bit SPD addresses
-                            { {0x00, 0x00}, {0x00, 0x00}, }, // socket 1 - Channel 0 & 1 - 8-bit SPD addresses
-                        }"
+			register "spdAddrLookup" = "
+			{
+				{ {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 #chip northbridge/amd/agesa/family14 # CPU side of HT root complex
-        end #domain
+		end #chip northbridge/amd/agesa/family14 # CPU side of HT root complex
+	end #domain
 end #northbridge/amd/agesa/family14/root_complex
-
diff --git a/src/mainboard/amd/thatcher/devicetree.cb b/src/mainboard/amd/thatcher/devicetree.cb
index 330ee6b..5862e1e 100644
--- a/src/mainboard/amd/thatcher/devicetree.cb
+++ b/src/mainboard/amd/thatcher/devicetree.cb
@@ -29,27 +29,27 @@ chip northbridge/amd/agesa/family15tn/root_complex
 		chip northbridge/amd/agesa/family15tn # CPU 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 1.0 on  end # Internal Graphics P2P bridge 0x99XX
-				device pci 1.1 on  end # Internal Multimedia
-				device pci 2.0 on  end # PCIE SLOT0 x8
+				device pci 0.0 on end	# Root Complex
+				device pci 1.0 on end	# Internal Graphics P2P bridge 0x99XX
+				device pci 1.1 on end	# Internal Multimedia
+				device pci 2.0 on end	# PCIE SLOT0 x8
 				device pci 3.0 off end
-				device pci 4.0 on  end # LAN
-				device pci 5.0 on  end # PCIE MINI0
-				device pci 6.0 on  end # PCIE MINI1
+				device pci 4.0 on end	# LAN
+				device pci 5.0 on end	# PCIE MINI0
+				device pci 6.0 on end	# PCIE MINI1
 				device pci 7.0 off end
-				device pci 8.0 off end # NB/SB Link P2P bridge
+				device pci 8.0 off end	# NB/SB Link P2P bridge
 			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
-				device pci 10.0 on  end # XHCI HC0
-				device pci 10.1 on  end # XHCI HC1
-				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      # SMBUS
+				device pci 10.0 on end	# XHCI HC0
+				device pci 10.1 on end	# XHCI HC1
+				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	# SMBUS
 					chip drivers/generic/generic #dimm 0
 						device i2c 50 on end # 7-bit SPD address
 					end
@@ -57,32 +57,32 @@ chip northbridge/amd/agesa/family15tn/root_complex
 						device i2c 51 on end # 7-bit SPD address
 					end
 				end # SM
-				device pci 14.1 on  end # IDE	0x439c
-				device pci 14.2 on  end # HDA	0x4383
-				device pci 14.3 on      # LPC	0x439d
+				device pci 14.1 on end	# IDE	0x439c
+				device pci 14.2 on end	# HDA	0x4383
+				device pci 14.3 on	# LPC	0x439d
 					chip superio/smsc/lpc47n217
-						device pnp 2e.3 off #  Parallel
+						device pnp 2e.3 off	# Parallel
 							io 0x60 = 0x378
 							irq 0x70 = 7
 						end
-						device pnp 2e.4 on  #  Com1
+						device pnp 2e.4 on	# Com1
 							io 0x60 = 0x3f8
 							irq 0x70 = 4
 						end
-						device pnp 2e.5 off #  Com2
+						device pnp 2e.5 off	# Com2
 							io 0x60 = 0x2f8
 							irq 0x70 = 3
 						end
 					end	#chip superio/smsc/lpc47n217
 				end	#device pci 14.3 # LPC
-				device pci 14.4 on  end # PCI	0x4384 # PCI-b conflict with GPIO.
-				device pci 14.5 on  end # USB 2
-				device pci 14.6 off end # Gec
-				device pci 14.7 on  end # SD
-				device pci 15.0 off end # PCIe 0
-				device pci 15.1 off end # PCIe 1
-				device pci 15.2 off end # PCIe 2
-				device pci 15.3 off end # PCIe 3
+				device pci 14.4 on end	# PCI	0x4384 # PCI-b conflict with GPIO.
+				device pci 14.5 on end	# USB 2
+				device pci 14.6 off end	# Gec
+				device pci 14.7 on end	# SD
+				device pci 15.0 off end	# PCIe 0
+				device pci 15.1 off end	# PCIe 1
+				device pci 15.2 off end	# PCIe 2
+				device pci 15.3 off end	# PCIe 3
 				register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				register "gpp_configuration" = "4"
 			end	#chip southbridge/amd/hudson
diff --git a/src/mainboard/amd/tilapia_fam10/devicetree.cb b/src/mainboard/amd/tilapia_fam10/devicetree.cb
index 77fd875..05cc669 100644
--- a/src/mainboard/amd/tilapia_fam10/devicetree.cb
+++ b/src/mainboard/amd/tilapia_fam10/devicetree.cb
@@ -1,28 +1,28 @@
 # sample config for amd/tilapia_fam10
 chip northbridge/amd/amdfam10/root_complex
 	device cpu_cluster 0 on
-		chip cpu/amd/socket_AM3  #L1 and DDR3
+		chip cpu/amd/socket_AM3	#L1 and DDR3
 			 device lapic 0 on end
 		end
 	end
 	device domain 0 on
 		subsystemid 0x1022 0x3060 inherit
 		chip northbridge/amd/amdfam10
-			device pci 18.0 on #  northbridge
+			device pci 18.0 on	# northbridge
 				chip southbridge/amd/rs780
-					device pci 0.0 on end # HT  	0x9600
-					device pci 1.0 on end # Internal Graphics P2P bridge 0x9602
-					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x9603
-					device pci 3.0 on end # PCIE P2P bridge	0x960b
-					device pci 4.0 on end # PCIE P2P bridge 0x9604
-					device pci 5.0 off end # PCIE P2P bridge 0x9605
-					device pci 6.0 off end # PCIE P2P bridge 0x9606
-					device pci 7.0 off end # PCIE P2P bridge 0x9607
-					device pci 8.0 off end # NB/SB Link P2P bridge
-					device pci 9.0 on end #
-					device pci a.0 on end #
-					register "gppsb_configuration" = "1"   # Configuration B
-					register "gpp_configuration" = "3"   # Configuration D default
+					device pci 0.0 on end	# HT	0x9600
+					device pci 1.0 on end	# Internal Graphics P2P bridge 0x9602
+					device pci 2.0 on end	# PCIE P2P bridge (external graphics) 0x9603
+					device pci 3.0 on end	# PCIE P2P bridge	0x960b
+					device pci 4.0 on end	# PCIE P2P bridge 0x9604
+					device pci 5.0 off end	# PCIE P2P bridge 0x9605
+					device pci 6.0 off end	# PCIE P2P bridge 0x9606
+					device pci 7.0 off end	# PCIE P2P bridge 0x9607
+					device pci 8.0 off end	# NB/SB Link P2P bridge
+					device pci 9.0 on end	#
+					device pci a.0 on end	#
+					register "gppsb_configuration" = "1"	# Configuration B
+					register "gpp_configuration" = "3"	# Configuration D default
 					register "port_enable" = "0x6fc"
 					register "gfx_dev2_dev3" = "1"
 					register "gfx_dual_slot" = "2"
@@ -34,14 +34,14 @@ chip northbridge/amd/amdfam10/root_complex
 					register "gfx_link_width" = "0"
 				end
 				chip southbridge/amd/sb700 # it is under NB/SB Link, but on the same pri bus
-					device pci 11.0 on end # SATA
-					device pci 12.0 on end # USB
-					device pci 12.1 on end # USB
-					device pci 12.2 on end # USB
-					device pci 13.0 on end # USB
-					device pci 13.1 on end # USB
-					device pci 13.2 on end # USB
-	 				device pci 14.0 on # SM
+					device pci 11.0 on end	# SATA
+					device pci 12.0 on end	# USB
+					device pci 12.1 on end	# USB
+					device pci 12.2 on end	# USB
+					device pci 13.0 on end	# USB
+					device pci 13.1 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
@@ -55,53 +55,53 @@ chip northbridge/amd/amdfam10/root_complex
 							device i2c 53 on end
 						end
 					end # SM
-					device pci 14.1 on end # IDE    0x439c
-					device pci 14.2 on end # HDA    0x4383
-					device pci 14.3 on # LPC	0x439d
+					device pci 14.1 on end	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on	# LPC	0x439d
 						chip superio/ite/it8718f
-							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 on #  Com1
+							device pnp 2e.1 on	# Com1
 								io 0x60 = 0x3f8
 								irq 0x70 = 4
 							end
-							device pnp 2e.2 off #  Com2
+							device pnp 2e.2 off	# Com2
 								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 2e.3 off #  Parallel Port
+							device pnp 2e.3 off	# Parallel Port
 								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 2e.4 off end #  EC
-							device pnp 2e.5 on #  Keyboard
+							device pnp 2e.4 off end	# EC
+							device pnp 2e.5 on	# Keyboard
 								io 0x60 = 0x60
 								io 0x62 = 0x64
 								irq 0x70 = 1
 							end
-							device pnp 2e.6 on #  Mouse
+							device pnp 2e.6 on	# Mouse
 								irq 0x70 = 12
 							end
-							device pnp 2e.7 off #  GPIO, must be closed for unresolved reason.
+							device pnp 2e.7 off	# GPIO, must be closed for unresolved reason.
 							end
-							device pnp 2e.8 off #  MIDI
+							device pnp 2e.8 off	# MIDI
 								io 0x60 = 0x300
 								irq 0x70 = 9
 							end
-							device pnp 2e.9 off #  GAME
+							device pnp 2e.9 off	# GAME
 								io 0x60 = 0x220
 							end
-							device pnp 2e.a off end #  CIR
+							device pnp 2e.a off end	# CIR
 						end	#superio/ite/it8718f
 					end		#LPC
-					device pci 14.4 on end # PCI 0x4384
-					device pci 14.5 on end # USB 2
+					device pci 14.4 on end	# PCI 0x4384
+					device pci 14.5 on end	# USB 2
 					register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				end	#southbridge/amd/sb700
-			end #  device pci 18.0
+			end # device pci 18.0
 
 			device pci 18.0 on end
 			device pci 18.0 on end
@@ -115,16 +115,15 @@ chip northbridge/amd/amdfam10/root_complex
 	#for node 32 to node 63
 #	device domain 0 on
 #		chip northbridge/amd/amdfam10
-#			  device pci 00.0 on end#  northbridge
-#			  device pci 00.0 on end
-#			  device pci 00.0 on end
-#			  device pci 00.0 on end
-#			  device pci 00.1 on end
-#			  device pci 00.2 on end
-#			  device pci 00.3 on end
-#			  device pci 00.4 on end
-#			 device pci 00.5 on end
+#			device pci 00.0 on end# northbridge
+#			device pci 00.0 on end
+#			device pci 00.0 on end
+#			device pci 00.0 on end
+#			device pci 00.1 on end
+#			device pci 00.2 on end
+#			device pci 00.3 on end
+#			device pci 00.4 on end
+#			device pci 00.5 on end
 #		end
 #	end #domain
-
 end
diff --git a/src/mainboard/amd/torpedo/devicetree.cb b/src/mainboard/amd/torpedo/devicetree.cb
index bc53f13..7f7b5a1 100644
--- a/src/mainboard/amd/torpedo/devicetree.cb
+++ b/src/mainboard/amd/torpedo/devicetree.cb
@@ -17,56 +17,56 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 chip northbridge/amd/agesa/family12/root_complex
-        device cpu_cluster 0 on
-                chip cpu/amd/agesa/family12
-                  device lapic 0 on end
-                end
-        end
-        device domain 0 on
-                subsystemid 0x1022 0x1705 inherit
-                chip northbridge/amd/agesa/family12 # CPU side of HT root complex
-                                chip northbridge/amd/agesa/family12 # PCI side of HT root complex
-                                        device pci 0.0 on end # Root Complex
-                                        device pci 1.0 on end # Internal Graphics Bridge
-                                        device pci 1.1 on end # Audio Controller
-                                        device pci 2.0 on end # Root Port
-                                        device pci 3.0 on end # Root Port
-                                        device pci 4.0 on end # PCIE P2P bridge
-                                        device pci 5.0 on end # PCIE P2P bridge
-                                        device pci 6.0 on end # PCIE P2P bridge
-                                        device pci 7.0 on end # PCIE P2P bridge
-                                        device pci 8.0 on end # NB/SB Link P2P bridge
-                                end # agesa northbridge
-                                chip southbridge/amd/cimx/sb900 # it is under NB/SB Link, but on the same pri bus
-                                        device pci 10.0 on end # USB XHCI
-                                        device pci 10.1 on end # USB XHCI
-                                        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 # IDE
-                                        device pci 14.2 on end # HDA
-                                        device pci 14.3 on # LPC
-												chip superio/smsc/kbc1100
-                                                        device pnp 2e.7 on #  Keyboard
-                                                                io 0x60 = 0x60
-                                                                io 0x62 = 0x64
-                                                                irq 0x70 = 1
-                                                                irq 0x72 = 12
-                                                        end
-                                                end # kbc1100
-										end #LPC
+	device cpu_cluster 0 on
+		chip cpu/amd/agesa/family12
+			device lapic 0 on end
+		end
+	end
+	device domain 0 on
+		subsystemid 0x1022 0x1705 inherit
+		chip northbridge/amd/agesa/family12 # CPU side of HT root complex
+				chip northbridge/amd/agesa/family12 # PCI side of HT root complex
+					device pci 0.0 on end	# Root Complex
+					device pci 1.0 on end	# Internal Graphics Bridge
+					device pci 1.1 on end	# Audio Controller
+					device pci 2.0 on end	# Root Port
+					device pci 3.0 on end	# Root Port
+					device pci 4.0 on end	# PCIE P2P bridge
+					device pci 5.0 on end	# PCIE P2P bridge
+					device pci 6.0 on end	# PCIE P2P bridge
+					device pci 7.0 on end	# PCIE P2P bridge
+					device pci 8.0 on end	# NB/SB Link P2P bridge
+				end # agesa northbridge
+				chip southbridge/amd/cimx/sb900 # it is under NB/SB Link, but on the same pri bus
+					device pci 10.0 on end	# USB XHCI
+					device pci 10.1 on end	# USB XHCI
+					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	# IDE
+					device pci 14.2 on end	# HDA
+					device pci 14.3 on	# LPC
+						chip superio/smsc/kbc1100
+							device pnp 2e.7 on	# Keyboard
+								io 0x60 = 0x60
+								io 0x62 = 0x64
+								irq 0x70 = 1
+								irq 0x72 = 12
+							end
+						end # kbc1100
+					end #LPC
 					device pci 14.4 on end # PCI bridge
-	  				device pci 14.5 on end # USB 2
+					device pci 14.5 on end # USB 2
 					device pci 14.6 on end # Ethernet Controller
 					device pci 14.7 on end # SD Flash Controller
 					device pci 15.0 on end # PCIe PortA
@@ -74,17 +74,16 @@ chip northbridge/amd/agesa/family12/root_complex
 					device pci 15.2 on end # PCIe PortC
 					device pci 15.3 on end # PCIe PortD
 					register "gpp_configuration" = "4" #1:1:1:1
-		  			register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
+					register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				end	#southbridge/amd/cimx/sb900
-                        device pci 18.0 on end
-                        device pci 18.1 on end
-                        device pci 18.2 on end
-                        device pci 18.3 on end
-                        device pci 18.4 on end
-                        device pci 18.5 on end
-                        device pci 18.6 on end
-                        device pci 18.7 on end
-                end #chip northbridge/amd/agesa/family12 # CPU side of HT root complex
-        end #domain
+			device pci 18.0 on end
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+			device pci 18.4 on end
+			device pci 18.5 on end
+			device pci 18.6 on end
+			device pci 18.7 on end
+		end #chip northbridge/amd/agesa/family12 # CPU side of HT root complex
+	end #domain
 end #northbridge/amd/agesa/family12/root_complex
-
diff --git a/src/mainboard/amd/union_station/devicetree.cb b/src/mainboard/amd/union_station/devicetree.cb
index 2289126..38cc948 100644
--- a/src/mainboard/amd/union_station/devicetree.cb
+++ b/src/mainboard/amd/union_station/devicetree.cb
@@ -17,72 +17,71 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 chip northbridge/amd/agesa/family14/root_complex
-        device cpu_cluster 0 on
-                chip cpu/amd/agesa/family14
-                  device lapic 0 on end
-                end
-        end
-        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
-                                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 0x9804
-                                        device pci 1.1 on end # Internal HDMI Audio
-                                        device pci 4.0 on end # PCIE P2P bridge 0x9604
-                                        device pci 5.0 on end # PCIE P2P bridge 0x9605
-                                        device pci 6.0 on end # PCIE P2P bridge 0x9606
-                                        device pci 7.0 on end # PCIE P2P bridge 0x9607
-                                        device pci 8.0 on end # NB/SB Link P2P bridge
-                                end # agesa northbridge
+	device cpu_cluster 0 on
+		chip cpu/amd/agesa/family14
+			device lapic 0 on end
+		end
+	end
+	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
+				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 0x9804
+					device pci 1.1 on end # Internal HDMI Audio
+					device pci 4.0 on end # PCIE P2P bridge 0x9604
+					device pci 5.0 on end # PCIE P2P bridge 0x9605
+					device pci 6.0 on end # PCIE P2P bridge 0x9606
+					device pci 7.0 on end # PCIE P2P bridge 0x9607
+					device pci 8.0 on end # NB/SB Link P2P bridge
+				end # agesa northbridge
 
-                                chip southbridge/amd/cimx/sb800 # it is under NB/SB Link, but on the same pri bus
-                                        device pci 11.0 on end # SATA
-                                        device pci 12.0 on end # USB
-                                        device pci 12.1 on end # USB
-                                        device pci 12.2 on end # USB
-                                        device pci 13.0 on end # USB
-                                        device pci 13.1 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 # IDE    0x439c
-                                        device pci 14.2 on end # HDA    0x4383
-                                        device pci 14.3 on # LPC        0x439d
+				chip southbridge/amd/cimx/sb800 # it is under NB/SB Link, but on the same pri bus
+					device pci 11.0 on end # SATA
+					device pci 12.0 on end # USB
+					device pci 12.1 on end # USB
+					device pci 12.2 on end # USB
+					device pci 13.0 on end # USB
+					device pci 13.1 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	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on	# LPC	0x439d
 					end #LPC
-					device pci 14.4 off end # PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0}
-	  				device pci 14.5 on  end # USB 2
-					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 off end # OHCI USB3
-					device pci 16.2 off end # EHCI USB3
-					register "gpp_configuration" = "0" #4:0:0:0 (really need to disable all 4 somehow)
-		  			register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
+					device pci 14.4 off end	# PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0}
+					device pci 14.5 on end	# USB 2
+					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 off end	# OHCI USB3
+					device pci 16.2 off end	# EHCI USB3
+					register "gpp_configuration" = "0"	#4:0:0:0 (really need to disable all 4 somehow)
+					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.1 on end
-                        device pci 18.2 on end
-                        device pci 18.3 on end
-                        device pci 18.4 on end
-                        device pci 18.5 on end
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+			device pci 18.4 on end
+			device pci 18.5 on end
 
-                        register "spdAddrLookup" = "
-                        {
-                            { {0xA0, 0xA2}, {0x00, 0x00}, }, // socket 0 - Channel 0 & 1 - 8-bit SPD addresses
-                            { {0x00, 0x00}, {0x00, 0x00}, }, // socket 1 - Channel 0 & 1 - 8-bit SPD addresses
-                        }"
+			register "spdAddrLookup" = "
+			{
+				{ {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 #chip northbridge/amd/agesa/family14 # CPU side of HT root complex
-        end #domain
+		end #chip northbridge/amd/agesa/family14 # CPU side of HT root complex
+	end #domain
 end #northbridge/amd/agesa/family14/root_complex
-
diff --git a/src/mainboard/aopen/dxplplusu/devicetree.cb b/src/mainboard/aopen/dxplplusu/devicetree.cb
index f43aec8..6b94157 100644
--- a/src/mainboard/aopen/dxplplusu/devicetree.cb
+++ b/src/mainboard/aopen/dxplplusu/devicetree.cb
@@ -39,52 +39,52 @@ chip northbridge/intel/e7505
 				device pci 1f.0 on end # Hub to PCI-A bridge
 			end
 		end
-		device pci 4.0 off end #  (undocumented)
-		device pci 6.0 off end #  (undocumented)
+		device pci 4.0 off end	# (undocumented)
+		device pci 6.0 off end	# (undocumented)
 		chip southbridge/intel/i82801dx
-			device pci 1d.0 on end # USB UHCI
-			device pci 1d.1 on end # USB UHCI
-			device pci 1d.2 on end # USB UHCI
-			device pci 1d.7 on end # USB EHCI
-			device pci 1e.0 on # Hub to PCI bridge
+			device pci 1d.0 on end	# USB UHCI
+			device pci 1d.1 on end	# USB UHCI
+			device pci 1d.2 on end	# USB UHCI
+			device pci 1d.7 on end	# USB EHCI
+			device pci 1e.0 on	# Hub to PCI bridge
 				device pci 2.0 off end
 			end
 			device pci 1f.0 on # LPC bridge
 				chip superio/smsc/lpc47m10x
-					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.3 off # Parallel Port
+					device pnp 2e.3 off	# Parallel Port
 						io 0x60 = 0x378
 						irq 0x70 = 7
 					end
-					device pnp 2e.4 on # Com1
+					device pnp 2e.4 on	# Com1
 						io 0x60 = 0x3f8
 						irq 0x70 = 4
 					end
-					device pnp 2e.5 off # Com2
+					device pnp 2e.5 off	# Com2
 						io 0x60 = 0x2f8
 						irq 0x70 = 3
 					end
-					device pnp 2e.7 off # Keyboard
+					device pnp 2e.7 off	# Keyboard
 						io 0x60 = 0x60
 						io 0x62 = 0x64
-						irq 0x70 = 1 # Keyboard interrupt
-						irq 0x72 = 12 # Mouse interrupt
+						irq 0x70 = 1	# Keyboard interrupt
+						irq 0x72 = 12	# Mouse interrupt
 					end
 					device pnp 2e.a on # ACPI
 						io 0x60 = 0x0e00
 					end
 				end
 			end
-			device pci 1f.1 on end # IDE
+			device pci 1f.1 on end	# IDE
 			register "ide0_enable" = "1"
 			register "ide1_enable" = "1"
-			device pci 1f.3 on end # SMBus
-			device pci 1f.5 on end # AC97 Audio
-			device pci 1f.6 off end # AC97 Modem
+			device pci 1f.3 on end	# SMBus
+			device pci 1f.5 on end	# AC97 Audio
+			device pci 1f.6 off end	# AC97 Modem
 		end # SB
 	end # PCI domain
 end
diff --git a/src/mainboard/arima/hdama/devicetree.cb b/src/mainboard/arima/hdama/devicetree.cb
index 2035117..2710417 100644
--- a/src/mainboard/arima/hdama/devicetree.cb
+++ b/src/mainboard/arima/hdama/devicetree.cb
@@ -7,8 +7,8 @@ chip northbridge/amd/amdk8/root_complex
 	device domain 0 on
 		subsystemid 0x161f 0x3016 inherit
 		chip northbridge/amd/amdk8
-			device pci 18.0 on #  northbridge
-				#  devices on link 0, link 0 == LDT 0
+			device pci 18.0 on	# northbridge
+				# devices on link 0, link 0 == LDT 0
 				chip southbridge/amd/amd8131
 					# the on/off keyword is mandatory
 					device pci 0.0 on	# PCIX bridge
@@ -70,11 +70,11 @@ chip northbridge/amd/amdk8/root_complex
 					# this "device pci 0.0" is the parent of the next one
 					# PCI bridge
 					device pci 0.0 on
-						device pci 0.0 on  end	# USB0
-						device pci 0.1 on  end	# USB1
+						device pci 0.0 on end	# USB0
+						device pci 0.1 on end	# USB1
 						device pci 0.2 off end	# USB 2.0
 						device pci 1.0 off end	# LAN
-						device pci 6.0 on end # ATI Rage XL
+						device pci 6.0 on end	# ATI Rage XL
 						## PCI Slot 5 (correct?)
 						#chip drivers/generic/generic
 						#	device pci 5.0 on
@@ -98,39 +98,39 @@ chip northbridge/amd/amdk8/root_complex
 					# LPC bridge
 					device pci 1.0 on
 						chip superio/nsc/pc87360
-							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.8 off end # ACB
-							device pnp 2e.9 off end # FSCM
-							device pnp 2e.a off end # WDT
+							device pnp 2e.7 off end	# GPIO
+							device pnp 2e.8 off end	# ACB
+							device pnp 2e.9 off end	# FSCM
+							device pnp 2e.a off end	# WDT
 						end
 					end
 					device pci 1.1 on end	# IDE
 					device pci 1.2 on end	# SMBus 2.0
-					device pci 1.3 on 	# System Management
+					device pci 1.3 on	# System Management
 						chip drivers/generic/generic
 							#phillips pca9545 smbus mux
 							device i2c 70 on
@@ -169,18 +169,17 @@ chip northbridge/amd/amdk8/root_complex
 						end
 					end
 					device pci 1.5 off end	# AC97 Audio
-					device pci 1.6 on  end	# AC97 Modem
+					device pci 1.6 on end	# AC97 Modem
 					register "ide0_enable" = "1"
 					register "ide1_enable" = "1"
 				end
-			end #  device pci 18.0
+			end # device pci 18.0
 
 			device pci 18.0 on end # LDT1
 			device pci 18.0 on end # LDT2
 			device pci 18.1 on end
 			device pci 18.2 on end
 			device pci 18.3 on end
-		end  # chip northbridge/amd/amdk8
+		end # chip northbridge/amd/amdk8
 	end
 end
-
diff --git a/src/mainboard/artecgroup/dbe61/devicetree.cb b/src/mainboard/artecgroup/dbe61/devicetree.cb
index d270f3d..32bdba4 100644
--- a/src/mainboard/artecgroup/dbe61/devicetree.cb
+++ b/src/mainboard/artecgroup/dbe61/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 IRQs. OK
 			register "lpc_serirq_enable" = "0x00001002"
@@ -37,6 +37,4 @@ chip northbridge/amd/lx
 			device lapic 0 on end
 		end
 	end
-
 end
-
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/asrock/939a785gmh/devicetree.cb b/src/mainboard/asrock/939a785gmh/devicetree.cb
index f246dcf..d604357 100644
--- a/src/mainboard/asrock/939a785gmh/devicetree.cb
+++ b/src/mainboard/asrock/939a785gmh/devicetree.cb
@@ -18,21 +18,21 @@ chip northbridge/amd/amdk8/root_complex
 	device domain 0 on
 		subsystemid 0x1022 0x3060 inherit
 		chip northbridge/amd/amdk8
-			device pci 18.0 on #  southbridge
+			device pci 18.0 on	# southbridge
 				chip southbridge/amd/rs780
-					device pci 0.0 on end # HT  	0x9600
-					device pci 1.0 on end # Internal Graphics P2P bridge 0x9602
-					device pci 2.0 on end # PCIE P2P bridge 16x slot
-					device pci 3.0 off end # used in dual slot config
-					device pci 4.0 off end # GPPSB
-					device pci 5.0 off end # GPPSB
-					device pci 6.0 off end # GPPSB
-					device pci 7.0 off end # GPPSB
-					device pci 8.0 off end # NB/SB Link P2P bridge
-					device pci 9.0 on end # GPP for x1 slot
-					device pci a.0 on end # GPP for internal network adapter
-					register "gppsb_configuration" = "4"   # Configuration ?
-					register "gpp_configuration" = "3"   # Configuration D default
+					device pci 0.0 on end	# HT	0x9600
+					device pci 1.0 on end	# Internal Graphics P2P bridge 0x9602
+					device pci 2.0 on end	# PCIE P2P bridge 16x slot
+					device pci 3.0 off end	# used in dual slot config
+					device pci 4.0 off end	# GPPSB
+					device pci 5.0 off end	# GPPSB
+					device pci 6.0 off end	# GPPSB
+					device pci 7.0 off end	# GPPSB
+					device pci 8.0 off end	# NB/SB Link P2P bridge
+					device pci 9.0 on end	# GPP for x1 slot
+					device pci a.0 on end	# GPP for internal network adapter
+					register "gppsb_configuration" = "4"	# Configuration ?
+					register "gpp_configuration" = "3"	# Configuration D default
 					register "port_enable" = "0x60c"
 					register "gfx_dev2_dev3" = "1"
 					register "gfx_dual_slot" = "0"
@@ -43,14 +43,14 @@ chip northbridge/amd/amdk8/root_complex
 					register "gfx_link_width" = "0"
 				end
 				chip southbridge/amd/sb700 # it is under NB/SB Link, but on the same pri bus
-					device pci 11.0 on end # SATA
-					device pci 12.0 on end # USB
-					device pci 12.1 on end # USB
-					device pci 12.2 on end # USB
-					device pci 13.0 on end # USB
-					device pci 13.1 on end # USB
-					device pci 13.2 on end # USB
-	 				device pci 14.0 on # SM
+					device pci 11.0 on end	# SATA
+					device pci 12.0 on end	# USB
+					device pci 12.1 on end	# USB
+					device pci 12.2 on end	# USB
+					device pci 13.0 on end	# USB
+					device pci 13.1 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
@@ -64,53 +64,53 @@ chip northbridge/amd/amdk8/root_complex
 							device i2c 53 on end
 						end
 					end # SM
-					device pci 14.1 on end # IDE    0x439c
-					device pci 14.2 on end # HDA    0x4383
-					device pci 14.3 on # LPC	0x439d
+					device pci 14.1 on end	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on	# LPC	0x439d
 
 						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 #  PS/2 keyboard & mouse
+							device pnp 2e.5 on	# PS/2 keyboard & mouse
 								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 #  GPIO6
+							device pnp 2e.307 off	# GPIO6
 							end
-							device pnp 2e.8 on #  WDTO#, PLED
+							device pnp 2e.8 on	# WDTO#, PLED
 							end
-							device pnp 2e.009 on #  GPIO2
+							device pnp 2e.009 on	# GPIO2
 							end
-							device pnp 2e.109 on #  GPIO3
+							device pnp 2e.109 on	# GPIO3
 							end
-							device pnp 2e.209 on #  GPIO4
+							device pnp 2e.209 on	# 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 = 0x290
 							end
-							device pnp 2e.c off # PECI, SST
+							device pnp 2e.c off	# PECI, SST
 							end
 						end	#superio/winbond/w8362
 
@@ -119,7 +119,7 @@ chip northbridge/amd/amdk8/root_complex
 					device pci 14.5 on end # USB 2
 					register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				end	#southbridge/amd/sb700
-			end #  device pci 18.0
+			end # device pci 18.0
 
 			device pci 18.0 on end
 			device pci 18.0 on end
@@ -129,4 +129,3 @@ chip northbridge/amd/amdk8/root_complex
 		end		#northbridge/amd/amdk8
 	end #domain
 end		#northbridge/amd/amdk8/root_complex
-
diff --git a/src/mainboard/asrock/e350m1/devicetree.cb b/src/mainboard/asrock/e350m1/devicetree.cb
index e2096c0..5bbec2e 100644
--- a/src/mainboard/asrock/e350m1/devicetree.cb
+++ b/src/mainboard/asrock/e350m1/devicetree.cb
@@ -25,26 +25,26 @@ 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 0x9804
+					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 HDMI Audio
-					device pci 4.0 on end # PCIE P2P bridge 0x9604
-					device pci 5.0 off end # PCIE P2P bridge 0x9605
-					device pci 6.0 off end # PCIE P2P bridge 0x9606
-					device pci 7.0 off end # PCIE P2P bridge 0x9607
-					device pci 8.0 off end # NB/SB Link P2P bridge
+					device pci 1.1 on end	# Internal HDMI Audio
+					device pci 4.0 on end	# PCIE P2P bridge 0x9604
+					device pci 5.0 off end	# PCIE P2P bridge 0x9605
+					device pci 6.0 off end	# PCIE P2P bridge 0x9606
+					device pci 7.0 off end	# PCIE P2P bridge 0x9607
+					device pci 8.0 off end	# NB/SB Link P2P bridge
 				end # agesa northbridge
 
 				chip southbridge/amd/cimx/sb800 # it is under NB/SB Link, but on the same pri 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
+					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
@@ -52,58 +52,58 @@ chip northbridge/amd/agesa/family14/root_complex
 							device i2c 51 on end
 						end
 					end # SM
-					device pci 14.1 on end # IDE	0x439c
-					device pci 14.2 on end # HDA	0x4383
-					device pci 14.3 on # LPC		0x439d
+					device pci 14.1 on end	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on	# LPC	0x439d
 						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 off #  Com2
+							device pnp 2e.3 off	# 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 on 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 on end	# ACPI
+							device pnp 2e.b on	# HW Monitor
 								io 0x60 = 0x290
 								irq 0x70 = 5
 							end
 						end
 					end #LPC
-					device pci 14.4 on end # PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0}
-					device pci 14.5 on end # USB 2
-					device pci 15.0 on  end # PCIe PortA
-					device pci 15.1 on  end # PCIe PortB: NIC
-					device pci 15.2 on  end # PCIe PortC: USB3
-					device pci 15.3 off end # PCIe PortD
-					device pci 16.0 off end # OHCI USB3
-					device pci 16.2 off end # EHCI USB3
+					device pci 14.4 on end	# PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0}
+					device pci 14.5 on end	# USB 2
+					device pci 15.0 on end	# PCIe PortA
+					device pci 15.1 on end	# PCIe PortB: NIC
+					device pci 15.2 on end	# PCIe PortC: USB3
+					device pci 15.3 off end	# PCIe PortD
+					device pci 16.0 off end	# OHCI USB3
+					device pci 16.2 off end	# EHCI USB3
 
 					# gpp_configuration options
 					#0000: PortA lanes[3:0]
@@ -115,7 +115,7 @@ chip northbridge/amd/agesa/family14/root_complex
 
 					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
diff --git a/src/mainboard/asrock/imb-a180/devicetree.cb b/src/mainboard/asrock/imb-a180/devicetree.cb
index 6d6875d..fcc5a09 100644
--- a/src/mainboard/asrock/imb-a180/devicetree.cb
+++ b/src/mainboard/asrock/imb-a180/devicetree.cb
@@ -19,7 +19,7 @@
 chip northbridge/amd/agesa/family16kb/root_complex
 	device cpu_cluster 0 on
 		chip cpu/amd/agesa/family16kb
-			device lapic 0 on  end
+			device lapic 0 on end
 		end
 	end
 
@@ -28,25 +28,25 @@ chip northbridge/amd/agesa/family16kb/root_complex
 		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
+				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
+				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
@@ -54,58 +54,58 @@ chip northbridge/amd/agesa/family16kb/root_complex
 						device i2c 51 on end
 					end
 				end # SM
-				device pci 14.2 on  end # HDA	0x4383
+				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
+						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
+						device pnp 2e.3 on		# COM2
 							io 0x60 = 0x2f8
 							irq 0x70 = 3
 						end
-						device pnp 2e.5 on         # KEYBRD
+						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
+						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
+						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
+						device pnp 2e.e on		# COM5
 							io 0x60 = 0x3e0
 							irq 0x70 = 4
 						end
-						device pnp 2e.f on         # COM6
+						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
+				device pci 14.7 on end # SD
 			end	#chip southbridge/amd/hudson
 
-			device pci 18.0 on  end
-			device pci 18.1 on  end
-			device pci 18.2 on  end
-			device pci 18.3 on  end
-			device pci 18.4 on  end
-			device pci 18.5 on  end
+			device pci 18.0 on end
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+			device pci 18.4 on end
+			device pci 18.5 on end
 			register "spdAddrLookup" = "
 			{
 				{ {0xA0, 0xA2}, {0x00, 0x00}, }, // socket 0 - Channel 0 & 1 - 8-bit SPD addresses
diff --git a/src/mainboard/asus/a8n_e/devicetree.cb b/src/mainboard/asus/a8n_e/devicetree.cb
index bbbfeb8..a36093b 100644
--- a/src/mainboard/asus/a8n_e/devicetree.cb
+++ b/src/mainboard/asus/a8n_e/devicetree.cb
@@ -1,121 +1,121 @@
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device cpu_cluster 0 on			# (L)APIC cluster
-    chip cpu/amd/socket_939			# CPU socket
-      device lapic 0 on end			# Local APIC of the CPU
-    end
-  end
+	device cpu_cluster 0 on			# (L)APIC cluster
+		chip cpu/amd/socket_939			# CPU socket
+			device lapic 0 on end			# Local APIC of the CPU
+		end
+	end
 
-  device domain 0 on			# PCI domain
-    subsystemid 0x1043 0x815a 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/ite/it8712f		# Super I/O
-              device pnp 2e.0 on		# 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 (N/A on this board)
-                io 0x60 = 0x2f8
-                irq 0x70 = 3
-              end
-              device pnp 2e.3 on		# Parallel port
-                io 0x60 = 0x378
-                irq 0x70 = 7
-                drq 0x74 = 3
-              end
-              device pnp 2e.4 on		# Environment controller
-                io 0x60 = 0x290
-                io 0x62 = 0x0000
-                irq 0x70 = 0x00
-              end
-              device pnp 2e.5 on		# PS/2 keyboard
-                io 0x60 = 0x60
-                io 0x62 = 0x64
-                irq 0x70 = 1
-                irq 0x71 = 2
-              end
-              device pnp 2e.6 on		# PS/2 mouse
-                irq 0x70 = 12
-                irq 0x71 = 2
-              end
-              device pnp 2e.7 on		# GPIO config
-                io 0x60 = 0x0800
-		io 0x62 = 0x0808
-		io 0x64 = 0x0810
-                # Set GPIO 1 & 2
-                io 0x25 = 0x0000
-                # Set GPIO 3 & 4
-                io 0x27 = 0x2540
-                # GPIO Polarity for Set 3
-                io 0xb2 = 0x2100
-                # GPIO Pin Internal Pull up for Set 3
-                io 0xba = 0x0100
-                # Simple I/O register config
-                io 0xc0 = 0x0000
-                io 0xc2 = 0x2540
-                io 0xc8 = 0x0000
-                io 0xca = 0x0500
-              end
-              device pnp 2e.8 on		# MIDI port
-                io 0x60 = 0x300
-                irq 0x70 = 10
-              end
-              device pnp 2e.9 on		# Game port
-                io 0x60 = 0x201
-              end
-              device pnp 2e.a off		# IR (N/A on this board)
-                io 0x60 = 0x310
-                irq 0x70 = 11
-              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
-          end
-          device pci 2.0 on end			# USB 1.1
-          device pci 2.1 on end			# USB 2
-          device pci 4.0 on end			# Onboard audio (ACI)
-          device pci 4.1 off end		# Onboard modem (MCI), N/A
-          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 end			# PCI
-          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" = "1"
-          register "sata0_enable" = "1"
-          register "sata1_enable" = "1"
-          # TODO
-          # 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 domain 0 on			# PCI domain
+		subsystemid 0x1043 0x815a 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/ite/it8712f		# Super I/O
+							device pnp 2e.0 on		# 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 (N/A on this board)
+								io 0x60 = 0x2f8
+								irq 0x70 = 3
+							end
+							device pnp 2e.3 on		# Parallel port
+								io 0x60 = 0x378
+								irq 0x70 = 7
+								drq 0x74 = 3
+							end
+							device pnp 2e.4 on		# Environment controller
+								io 0x60 = 0x290
+								io 0x62 = 0x0000
+								irq 0x70 = 0x00
+							end
+							device pnp 2e.5 on		# PS/2 keyboard
+								io 0x60 = 0x60
+								io 0x62 = 0x64
+								irq 0x70 = 1
+								irq 0x71 = 2
+							end
+							device pnp 2e.6 on		# PS/2 mouse
+								irq 0x70 = 12
+								irq 0x71 = 2
+							end
+							device pnp 2e.7 on		# GPIO config
+								io 0x60 = 0x0800
+								io 0x62 = 0x0808
+								io 0x64 = 0x0810
+								# Set GPIO 1 & 2
+								io 0x25 = 0x0000
+								# Set GPIO 3 & 4
+								io 0x27 = 0x2540
+								# GPIO Polarity for Set 3
+								io 0xb2 = 0x2100
+								# GPIO Pin Internal Pull up for Set 3
+								io 0xba = 0x0100
+								# Simple I/O register config
+								io 0xc0 = 0x0000
+								io 0xc2 = 0x2540
+								io 0xc8 = 0x0000
+								io 0xca = 0x0500
+							end
+							device pnp 2e.8 on		# MIDI port
+								io 0x60 = 0x300
+								irq 0x70 = 10
+							end
+							device pnp 2e.9 on		# Game port
+								io 0x60 = 0x201
+							end
+							device pnp 2e.a off		# IR (N/A on this board)
+								io 0x60 = 0x310
+								irq 0x70 = 11
+							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
+					end
+					device pci 2.0 on end			# USB 1.1
+					device pci 2.1 on end			# USB 2
+					device pci 4.0 on end			# Onboard audio (ACI)
+					device pci 4.1 off end		# Onboard modem (MCI), N/A
+					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 end			# PCI
+					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" = "1"
+					register "sata0_enable" = "1"
+					register "sata1_enable" = "1"
+					# TODO
+					# 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/asus/a8v-e_deluxe/devicetree.cb b/src/mainboard/asus/a8v-e_deluxe/devicetree.cb
index 5e56acc..5de370d 100644
--- a/src/mainboard/asus/a8v-e_deluxe/devicetree.cb
+++ b/src/mainboard/asus/a8v-e_deluxe/devicetree.cb
@@ -1,97 +1,97 @@
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device cpu_cluster 0 on			# APIC cluster
-    chip cpu/amd/socket_939			# CPU
-      device lapic 0 on end			# APIC
-    end
-  end
-  device domain 0 on			# PCI domain
-    subsystemid 1043 0 inherit
-    chip northbridge/amd/amdk8			# mc0
-      device pci 18.0 on			# Northbridge
-        # Devices on link 0, link 0 == LDT 0
-        chip southbridge/via/vt8237r		# Southbridge
-          register "ide0_enable" = "1"		# Enable IDE channel 0
-          register "ide1_enable" = "1"		# Enable IDE channel 1
-          register "ide0_80pin_cable" = "1"	# 80pin cable on IDE channel 0
-          register "ide1_80pin_cable" = "1"	# 80pin cable on IDE channel 1
-          register "fn_ctrl_lo" = "0"		# Enable SB functions
-          register "fn_ctrl_hi" = "0xad"	# Enable SB functions
-          device pci 0.0 on end			# HT
-          device pci f.1 on end			# IDE
-          device pci 11.0 on			# LPC
-            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 superio/winbond/w83627ehg	# Super I/O
-              device pnp 2e.0 on		# 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 off		# Com2 (N/A on this board)
-                io 0x60 = 0x2f8
-                irq 0x70 = 3
-              end
-              device pnp 2e.5 off		# PS/2 keyboard & mouse (off)
-              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 on		# Game port
-                io 0x60 = 0x201
-              end
-              device pnp 2e.207 on		# MIDI
-                io 0x62 = 0x330
-                irq 0x70 = 0xa
-              end
-              device pnp 2e.307 off		# GPIO 6
-              end
-              device pnp 2e.8 off		# WDTO#, PLED
-              end
-              device pnp 2e.009 on		# GPIO 2
-              end
-              device pnp 2e.109 off		# GPIO 3
-              end
-              device pnp 2e.209 off		# GPIO 4
-              end
-              device pnp 2e.309 on		# GPIO 5
-              end
-              device pnp 2e.a off		# ACPI
-              end
-              device pnp 2e.b on		# Hardware monitor
-                io 0x60 = 0x290
-                irq 0x70 = 0
-              end
-            end
-          end
-          device pci 12.0 off end		# VIA LAN (off, other chip used)
-        end
-        chip southbridge/via/k8t890		# "Southbridge" K8T890
-        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			# APIC cluster
+		chip cpu/amd/socket_939			# CPU
+			device lapic 0 on end			# APIC
+		end
+	end
+	device domain 0 on			# PCI domain
+		subsystemid 1043 0 inherit
+		chip northbridge/amd/amdk8			# mc0
+			device pci 18.0 on			# Northbridge
+				# Devices on link 0, link 0 == LDT 0
+				chip southbridge/via/vt8237r		# Southbridge
+					register "ide0_enable" = "1"		# Enable IDE channel 0
+					register "ide1_enable" = "1"		# Enable IDE channel 1
+					register "ide0_80pin_cable" = "1"	# 80pin cable on IDE channel 0
+					register "ide1_80pin_cable" = "1"	# 80pin cable on IDE channel 1
+					register "fn_ctrl_lo" = "0"		# Enable SB functions
+					register "fn_ctrl_hi" = "0xad"		# Enable SB functions
+					device pci 0.0 on end			# HT
+					device pci f.1 on end			# IDE
+					device pci 11.0 on			# LPC
+						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 superio/winbond/w83627ehg	# Super I/O
+							device pnp 2e.0 on		# 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 off		# Com2 (N/A on this board)
+								io 0x60 = 0x2f8
+								irq 0x70 = 3
+							end
+							device pnp 2e.5 off		# PS/2 keyboard & mouse (off)
+							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 on		# Game port
+								io 0x60 = 0x201
+							end
+							device pnp 2e.207 on		# MIDI
+								io 0x62 = 0x330
+								irq 0x70 = 0xa
+							end
+							device pnp 2e.307 off		# GPIO 6
+							end
+							device pnp 2e.8 off		# WDTO#, PLED
+							end
+							device pnp 2e.009 on		# GPIO 2
+							end
+							device pnp 2e.109 off		# GPIO 3
+							end
+							device pnp 2e.209 off		# GPIO 4
+							end
+							device pnp 2e.309 on		# GPIO 5
+							end
+							device pnp 2e.a off		# ACPI
+							end
+							device pnp 2e.b on		# Hardware monitor
+								io 0x60 = 0x290
+								irq 0x70 = 0
+							end
+						end
+					end
+					device pci 12.0 off end		# VIA LAN (off, other chip used)
+				end
+				chip southbridge/via/k8t890		# "Southbridge" K8T890
+				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/asus/a8v-e_se/devicetree.cb b/src/mainboard/asus/a8v-e_se/devicetree.cb
index f2d078a..98ddca9 100644
--- a/src/mainboard/asus/a8v-e_se/devicetree.cb
+++ b/src/mainboard/asus/a8v-e_se/devicetree.cb
@@ -1,97 +1,97 @@
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device cpu_cluster 0 on			# APIC cluster
-    chip cpu/amd/socket_939			# CPU
-      device lapic 0 on end			# APIC
-    end
-  end
-  device domain 0 on			# PCI domain
-    subsystemid 0x1043 0 inherit
-    chip northbridge/amd/amdk8			# mc0
-      device pci 18.0 on			# Northbridge
-        # Devices on link 0, link 0 == LDT 0
-        chip southbridge/via/vt8237r		# Southbridge
-          register "ide0_enable" = "1"		# Enable IDE channel 0
-          register "ide1_enable" = "1"		# Enable IDE channel 1
-          register "ide0_80pin_cable" = "1"	# 80pin cable on IDE channel 0
-          register "ide1_80pin_cable" = "1"	# 80pin cable on IDE channel 1
-          register "fn_ctrl_lo" = "0"		# Enable SB functions
-          register "fn_ctrl_hi" = "0xad"	# Enable SB functions
-          device pci 0.0 on end			# HT
-          device pci f.1 on end			# IDE
-          device pci 11.0 on			# LPC
-            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 superio/winbond/w83627ehg	# Super I/O
-              device pnp 2e.0 on		# 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 off		# Com2 (N/A on this board)
-                io 0x60 = 0x2f8
-                irq 0x70 = 3
-              end
-              device pnp 2e.5 off		# PS/2 keyboard & mouse (off)
-              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 on		# Game port
-                io 0x60 = 0x201
-              end
-              device pnp 2e.207 on		# MIDI
-                io 0x62 = 0x330
-                irq 0x70 = 0xa
-              end
-              device pnp 2e.307 off		# GPIO 6
-              end
-              device pnp 2e.8 off		# WDTO#, PLED
-              end
-              device pnp 2e.009 on		# GPIO 2
-              end
-              device pnp 2e.109 off		# GPIO 3
-              end
-              device pnp 2e.209 off		# GPIO 4
-              end
-              device pnp 2e.309 on		# GPIO 5
-              end
-              device pnp 2e.a off		# ACPI
-              end
-              device pnp 2e.b on		# Hardware monitor
-                io 0x60 = 0x290
-                irq 0x70 = 0
-              end
-            end
-          end
-          device pci 12.0 off end		# VIA LAN (off, other chip used)
-        end
-        chip southbridge/via/k8t890		# "Southbridge" K8T890
-        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			# APIC cluster
+		chip cpu/amd/socket_939			# CPU
+			device lapic 0 on end			# APIC
+		end
+	end
+	device domain 0 on			# PCI domain
+		subsystemid 0x1043 0 inherit
+		chip northbridge/amd/amdk8			# mc0
+			device pci 18.0 on			# Northbridge
+				# Devices on link 0, link 0 == LDT 0
+				chip southbridge/via/vt8237r		# Southbridge
+					register "ide0_enable" = "1"		# Enable IDE channel 0
+					register "ide1_enable" = "1"		# Enable IDE channel 1
+					register "ide0_80pin_cable" = "1"	# 80pin cable on IDE channel 0
+					register "ide1_80pin_cable" = "1"	# 80pin cable on IDE channel 1
+					register "fn_ctrl_lo" = "0"		# Enable SB functions
+					register "fn_ctrl_hi" = "0xad"		# Enable SB functions
+					device pci 0.0 on end			# HT
+					device pci f.1 on end			# IDE
+					device pci 11.0 on			# LPC
+						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 superio/winbond/w83627ehg	# Super I/O
+							device pnp 2e.0 on		# 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 off		# Com2 (N/A on this board)
+								io 0x60 = 0x2f8
+								irq 0x70 = 3
+							end
+							device pnp 2e.5 off		# PS/2 keyboard & mouse (off)
+							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 on		# Game port
+								io 0x60 = 0x201
+							end
+							device pnp 2e.207 on		# MIDI
+								io 0x62 = 0x330
+								irq 0x70 = 0xa
+							end
+							device pnp 2e.307 off		# GPIO 6
+							end
+							device pnp 2e.8 off		# WDTO#, PLED
+							end
+							device pnp 2e.009 on		# GPIO 2
+							end
+							device pnp 2e.109 off		# GPIO 3
+							end
+							device pnp 2e.209 off		# GPIO 4
+							end
+							device pnp 2e.309 on		# GPIO 5
+							end
+							device pnp 2e.a off		# ACPI
+							end
+							device pnp 2e.b on		# Hardware monitor
+								io 0x60 = 0x290
+								irq 0x70 = 0
+							end
+						end
+					end
+					device pci 12.0 off end		# VIA LAN (off, other chip used)
+				end
+				chip southbridge/via/k8t890		# "Southbridge" K8T890
+				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/asus/dsbf/devicetree.cb b/src/mainboard/asus/dsbf/devicetree.cb
index b4d1b63..cfd2f6f 100644
--- a/src/mainboard/asus/dsbf/devicetree.cb
+++ b/src/mainboard/asus/dsbf/devicetree.cb
@@ -41,10 +41,10 @@ chip northbridge/intel/i5000
 			device pci 00.0 on # PCI Express Upstream Port
 				device pci 00.0 on # PCI Express Downstream Port E1
 					device pci 00.0 on # 6700PXH PCI Express-to-PCI Bridge A
-					       ioapic_irq 8 INTA 0x11
-					       ioapic_irq 8 INTB 0x10
-					       ioapic_irq 8 INTC 0x11
-					       ioapic_irq 8 INTD 0x10
+						ioapic_irq 8 INTA 0x11
+						ioapic_irq 8 INTB 0x10
+						ioapic_irq 8 INTC 0x11
+						ioapic_irq 8 INTD 0x10
 						# PCI slot
 						device pci 00.2 on # 6700PXH PCI Express-to-PCI Bridge B
 							# PCI slot
@@ -57,26 +57,26 @@ chip northbridge/intel/i5000
 					ioapic_irq 9 INTB 0
 					ioapic_irq 9 INTC 1
 					ioapic_irq 9 INTD 2
-					   # PCI-X Slot
+					# PCI-X Slot
 				end
 
 			end
 		end
 
 		device pci 03.0 on
-		       ioapic_irq 8 INTA 0x10
+			ioapic_irq 8 INTA 0x10
 		end
 		device pci 04.0 on
-		       ioapic_irq 8 INTA 0x10
+			ioapic_irq 8 INTA 0x10
 		end
 		device pci 05.0 on
-		       ioapic_irq 8 INTA 0x10
+			ioapic_irq 8 INTA 0x10
 		end
 		device pci 06.0 on
-		       ioapic_irq 8 INTA 0x10
+			ioapic_irq 8 INTA 0x10
 		end
 		device pci 07.0 on
-		       ioapic_irq 8 INTA 0x10
+			ioapic_irq 8 INTA 0x10
 		end
 
 		device pci 10.0 on end # FBD
@@ -88,17 +88,17 @@ chip northbridge/intel/i5000
 		device pci 16.0 on end # FBD
 
 		chip drivers/generic/ioapic
-		     register "have_isa_interrupts" = "1"
-		     register "irq_on_fsb" = "1"
-		     register "enable_virtual_wire" = "1"
-		     register "base" = "0xfec00000"
-		     device ioapic 8 on end
+			register "have_isa_interrupts" = "1"
+			register "irq_on_fsb" = "1"
+			register "enable_virtual_wire" = "1"
+			register "base" = "0xfec00000"
+			device ioapic 8 on end
 		end
 
 		chip drivers/generic/ioapic
-		     register "irq_on_fsb" = "1"
-		     register "base" = "0xfec80000"
-		     device ioapic 9 on end
+			register "irq_on_fsb" = "1"
+			register "base" = "0xfec80000"
+			device ioapic 9 on end
 		end
 
 		chip southbridge/intel/i3100
@@ -132,30 +132,30 @@ chip northbridge/intel/i5000
 			device pci 1f.0 on # PCI-LPC bridge
 				ioapic_irq 8 INTA 0x11
 				chip superio/winbond/w83627hf
-					device pnp 2e.0 off end # FDC
-					device pnp 2e.1 on # Parallel Port
+					device pnp 2e.0 off end	# FDC
+					device pnp 2e.1 on	# Parallel Port
 						io 0x60 = 0x378
 						irq 0x70 = 7
 					end
-					device pnp 2e.2 on # Serial Port 1
+					device pnp 2e.2 on	# Serial Port 1
 						io 0x60 = 0x3f8
 						irq 0x70 = 4
 					end
 
 					device pnp 2e.3 off end
-					device pnp 2e.5 on # KBC
-					       io 0x60 = 0x60
-					       io 0x62 = 0x64
-					       irq 0x70 = 1
-					       irq 0x72 = 12
+					device pnp 2e.5 on	# KBC
+						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 port / MIDI
-					device pnp 2e.8 off end # GPIO2
-					device pnp 2e.9 on end # GPIO3
-					device pnp 2e.a on end # ACPI
-					device pnp 2e.b off end # HWMON
+					device pnp 2e.6 off end	# CIR
+					device pnp 2e.7 off end	# Game port / MIDI
+					device pnp 2e.8 off end	# GPIO2
+					device pnp 2e.9 on end	# GPIO3
+					device pnp 2e.a on end	# ACPI
+					device pnp 2e.b off end	# HWMON
 				end
 			end
 			device pci 1f.1 off end # IDE
diff --git a/src/mainboard/asus/f2a85-m/devicetree.cb b/src/mainboard/asus/f2a85-m/devicetree.cb
index 9ac5574..5e28de9 100644
--- a/src/mainboard/asus/f2a85-m/devicetree.cb
+++ b/src/mainboard/asus/f2a85-m/devicetree.cb
@@ -29,27 +29,27 @@ chip northbridge/amd/agesa/family15tn/root_complex
 		chip northbridge/amd/agesa/family15tn # CPU 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 1.0 on  end # Internal Graphics P2P bridge 0x99XX
-				device pci 1.1 on  end # Internal Multimedia
-				device pci 2.0 on end # PCIE SLOT0 x16 blue
-				device pci 3.0 off end # unused?
-				device pci 4.0 on  end # PCIE 4x black
-				device pci 5.0 off end # unused?
-				device pci 6.0 off end # unused?
-				device pci 7.0 off end # LAN
-				device pci 8.0 off end # NB/SB Link P2P bridge
+				device pci 0.0 on end	# Root Complex
+				device pci 1.0 on end	# Internal Graphics P2P bridge 0x99XX
+				device pci 1.1 on end	# Internal Multimedia
+				device pci 2.0 on end	# PCIE SLOT0 x16 blue
+				device pci 3.0 off end	# unused?
+				device pci 4.0 on end	# PCIE 4x black
+				device pci 5.0 off end	# unused?
+				device pci 6.0 off end	# unused?
+				device pci 7.0 off end	# LAN
+				device pci 8.0 off end	# NB/SB Link P2P bridge
 			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
-				device pci 10.0 on  end # XHCI HC0
-				device pci 10.1 on  end # XHCI HC1
-				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      # SMBUS
+				device pci 10.0 on end	# XHCI HC0
+				device pci 10.1 on end	# XHCI HC1
+				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	# SMBUS
 					chip drivers/generic/generic #dimm 0
 						device i2c 50 on end # 7-bit SPD address
 					end
@@ -57,9 +57,9 @@ chip northbridge/amd/agesa/family15tn/root_complex
 						device i2c 51 on end # 7-bit SPD address
 					end
 				end # SM
-				device pci 14.1 off end # IDE	0x439c
-				device pci 14.2 on  end # HDA	0x4383
-				device pci 14.3 on      # LPC	0x439d
+				device pci 14.1 off end	# IDE	0x439c
+				device pci 14.2 on end	# HDA	0x4383
+				device pci 14.3 on	# LPC	0x439d
 					chip superio/ite/it8728f
 						register hwm_ctl_register = "0xc0"
 						register hwm_main_ctl_register = "0x33"
@@ -68,54 +68,54 @@ chip northbridge/amd/agesa/family15tn/root_complex
 						register hwm_fan2_ctl_pwm = "0x00"
 						register hwm_fan3_ctl_pwm = "0x00"
 
-						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 on #  Com1
+						device pnp 2e.1 on	# Com1
 							io 0x60 = 0x3f8
 							irq 0x70 = 4
 						end
-						device pnp 2e.2 off #  Com2
+						device pnp 2e.2 off	# Com2
 							io 0x60 = 0x2f8
 							irq 0x70 = 3
 						end
-						device pnp 2e.3 off #  Parallel Port
+						device pnp 2e.3 off	# Parallel Port
 							io 0x60 = 0x378
 							irq 0x70 = 7
 						end
-						device pnp 2e.4 on #  Env Controller
+						device pnp 2e.4 on	# Env Controller
 							io 0x60 = 0x290
 							io 0x62 = 0x220
 							irq 0x70 = 0
 						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 #  Mouse
+						device pnp 2e.6 off	# Mouse
 							irq 0x70 = 12
 						end
-						device pnp 2e.7 on #  GPIO
-							io 0x60 = 0x228 #SMI
-							io 0x62 = 0x300 #Simple I/O
-							io 0x64 = 0x238 #Phony resource IT8603E does not have it
+						device pnp 2e.7 on	# GPIO
+							io 0x60 = 0x228	#SMI
+							io 0x62 = 0x300	#Simple I/O
+							io 0x64 = 0x238	#Phony resource IT8603E does not have it
 							irq 0x70 = 0
 						end
-						device pnp 2e.a off end #  CIR
+						device pnp 2e.a off end	# CIR
 					end	#superio/ite/it8728f
 				end	#device pci 14.3 # LPC
-				device pci 14.4 on  end # PCI 0x4384
-				device pci 14.5 on  end # USB 2
-				device pci 14.6 off end # Gec
+				device pci 14.4 on end	# PCI 0x4384
+				device pci 14.5 on end	# USB 2
+				device pci 14.6 off end	# Gec
 				# SD, make it on so the BAR is assigned (if proper hudson on/off handling is implemented this may go away)
 				device pci 14.7 on end
-				device pci 15.0 on end # PCIe 0 - onboard PCIe 1x
-				device pci 15.1 on end # PCIe 1 onboard gigabit
-				device pci 15.2 off end # unused
-				device pci 15.3 off end # unused
+				device pci 15.0 on end	# PCIe 0 - onboard PCIe 1x
+				device pci 15.1 on end	# PCIe 1 onboard gigabit
+				device pci 15.2 off end	# unused
+				device pci 15.3 off end	# unused
 
 				register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				register "gpp_configuration" = "4"
diff --git a/src/mainboard/asus/k8v-x/devicetree.cb b/src/mainboard/asus/k8v-x/devicetree.cb
index 6bb9bc8..b50c8a5 100644
--- a/src/mainboard/asus/k8v-x/devicetree.cb
+++ b/src/mainboard/asus/k8v-x/devicetree.cb
@@ -1,98 +1,98 @@
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device cpu_cluster 0 on			# APIC cluster
-    chip cpu/amd/socket_754			# CPU
-      device lapic 0 on end			# APIC
-    end
-  end
-  device domain 0 on			# PCI domain
-    subsystemid 0x1043 0 inherit
-    chip northbridge/amd/amdk8			# mc0
-      device pci 18.0 on			# Northbridge
-        # Devices on link 0, link 0 == LDT 0
-        chip southbridge/via/vt8237r		# Southbridge
-          register "ide0_enable" = "1"		# Enable IDE channel 0
-          register "ide1_enable" = "1"		# Enable IDE channel 1
-          register "ide0_80pin_cable" = "1"	# 80pin cable on IDE channel 0
-          register "ide1_80pin_cable" = "1"	# 80pin cable on IDE channel 1
-          register "fn_ctrl_lo" = "0"		# Enable SB functions
-          register "fn_ctrl_hi" = "0xad"	# Enable SB functions
-          register "usb2_termination_set" = "1"
-          register "usb2_termination_a" = "8"
-          register "usb2_termination_b" = "8"
-          register "usb2_termination_c" = "6"
-          register "usb2_termination_d" = "6"
-          register "usb2_termination_e" = "6"
-          register "usb2_termination_f" = "6"
-          register "usb2_termination_g" = "6"
-          register "usb2_termination_h" = "6"
-          register "usb2_dpll_set" = "1"
-          register "usb2_dpll_delay" = "3"
-          register "int_efgh_as_gpio" = "1"
-          register "enable_gpo3" = "1"
-          register "disable_gpo26_gpo27" = "1"
-          register "enable_aol_2_smb_slave" = "1"
-          register "enable_gpo5" = "1"
-          register "gpio15_12_dir_output" = "1"
-          device pci 0.0 on end			# HT
-          device pci f.1 on end			# IDE
-          device pci 10.4 on end		# USB2
-          device pci 11.0 on			# LPC
-            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 superio/winbond/w83697hf	# Super I/O
-              register "hwmon_fan1_divisor" = "128"
-              register "hwmon_fan2_divisor" = "4"
-              device pnp 2e.0 on		# 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 off		# Com2 (N/A on this board)
-              end
-              device pnp 2e.6 off		# CIR
-              end
-              device pnp 2e.7 off		# Game port/GPIO 1
-              end
-              device pnp 2e.8 off		# MIDI/GPIO 5
-              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.a off		# ACPI
-              end
-              device pnp 2e.b on		# Hardware monitor
-                io 0x60 = 0x290
-                irq 0x70 = 0
-              end
-            end
-          end
-          device pci 12.0 off end		# VIA LAN (off, other chip used)
-        end
-        chip southbridge/via/k8t890		# "Southbridge" K8T890
-        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			# APIC cluster
+		chip cpu/amd/socket_754			# CPU
+			device lapic 0 on end			# APIC
+		end
+	end
+	device domain 0 on			# PCI domain
+		subsystemid 0x1043 0 inherit
+		chip northbridge/amd/amdk8			# mc0
+			device pci 18.0 on			# Northbridge
+				# Devices on link 0, link 0 == LDT 0
+				chip southbridge/via/vt8237r		# Southbridge
+					register "ide0_enable" = "1"		# Enable IDE channel 0
+					register "ide1_enable" = "1"		# Enable IDE channel 1
+					register "ide0_80pin_cable" = "1"	# 80pin cable on IDE channel 0
+					register "ide1_80pin_cable" = "1"	# 80pin cable on IDE channel 1
+					register "fn_ctrl_lo" = "0"		# Enable SB functions
+					register "fn_ctrl_hi" = "0xad"	# Enable SB functions
+					register "usb2_termination_set" = "1"
+					register "usb2_termination_a" = "8"
+					register "usb2_termination_b" = "8"
+					register "usb2_termination_c" = "6"
+					register "usb2_termination_d" = "6"
+					register "usb2_termination_e" = "6"
+					register "usb2_termination_f" = "6"
+					register "usb2_termination_g" = "6"
+					register "usb2_termination_h" = "6"
+					register "usb2_dpll_set" = "1"
+					register "usb2_dpll_delay" = "3"
+					register "int_efgh_as_gpio" = "1"
+					register "enable_gpo3" = "1"
+					register "disable_gpo26_gpo27" = "1"
+					register "enable_aol_2_smb_slave" = "1"
+					register "enable_gpo5" = "1"
+					register "gpio15_12_dir_output" = "1"
+					device pci 0.0 on end			# HT
+					device pci f.1 on end			# IDE
+					device pci 10.4 on end			# USB2
+					device pci 11.0 on			# LPC
+						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 superio/winbond/w83697hf	# Super I/O
+							register "hwmon_fan1_divisor" = "128"
+							register "hwmon_fan2_divisor" = "4"
+							device pnp 2e.0 on		# 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 off		# Com2 (N/A on this board)
+							end
+							device pnp 2e.6 off		# CIR
+							end
+							device pnp 2e.7 off		# Game port/GPIO 1
+							end
+							device pnp 2e.8 off		# MIDI/GPIO 5
+							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.a off		# ACPI
+							end
+							device pnp 2e.b on		# Hardware monitor
+								io 0x60 = 0x290
+								irq 0x70 = 0
+							end
+						end
+					end
+					device pci 12.0 off end		# VIA LAN (off, other chip used)
+				end
+				chip southbridge/via/k8t890		# "Southbridge" K8T890
+				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/asus/m2n-e/devicetree.cb b/src/mainboard/asus/m2n-e/devicetree.cb
index bbe2124..c810d3f 100644
--- a/src/mainboard/asus/m2n-e/devicetree.cb
+++ b/src/mainboard/asus/m2n-e/devicetree.cb
@@ -19,103 +19,103 @@
 ##
 
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device cpu_cluster 0 on			# (L)APIC cluster
-    chip cpu/amd/socket_AM2			# CPU socket
-      device lapic 0 on end			# Local APIC of the CPU
-    end
-  end
-  device domain 0 on			# PCI domain
-    subsystemid 0x1043 0x8239 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/ite/it8716f		# Super I/O
-              device pnp 2e.0 on		# 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 (N/A)
-              end
-              device pnp 2e.3 on		# Parallel port
-                io 0x60 = 0x378
-                io 0x62 = 0x000
-                irq 0x70 = 7
-                drq 0x74 = 4
-              end
-              device pnp 2e.4 on		# Environment controller
-                io 0x60 = 0x290
-                io 0x62 = 0x000
-                irq 0x70 = 0
-              end
-              device pnp 2e.5 on		# PS/2 keyboard
-                io 0x60 = 0x60
-                io 0x62 = 0x64
-                irq 0x70 = 1			# PS/2 keyboard IRQ
-              end
-              device pnp 2e.6 on		# PS/2 mouse
-                irq 0x70 = 12			# PS/2 mouse IRQ
-              end
-              device pnp 2e.7 off		# GPIO
-                io 0x60 = 0x0000		# SMI# Normal Run Access
-                io 0x62 = 0x800			# Simple I/O
-                io 0x64 = 0x0000		# Serial Flash I/F
-              end
-              device pnp 2e.8 off		# MIDI (N/A)
-              end
-              device pnp 2e.9 off		# Game port (N/A)
-              end
-              device pnp 2e.a off		# Consumer IR (N/A)
-              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
-          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			# Azalia (HD Audio)
-          device pci 8.0 on end			# NIC
-          device pci 9.0 off end		# NIC (N/A)
-          device pci a.0 on end			# PCI E 5 (PCIEX4)
-          device pci b.0 off end		# PCI E 4
-          device pci c.0 on end			# PCI E 3 (PCIEX1_2)
-          device pci d.0 on end			# PCI E 2 (PCIEX1_1)
-          device pci e.0 off end		# PCI E 1
-          device pci f.0 on end			# PCI E 0 (PCIEX16_1)
-          register "ide0_enable" = "1"		# Primary IDE
-          register "ide1_enable" = "0"		# Secondary IDE (N/A)
-          register "sata0_enable" = "1"
-          register "sata1_enable" = "1"
-        end
-      end
-      device pci 18.0 on end			# Link 1
-      device pci 18.0 on 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_AM2			# CPU socket
+			device lapic 0 on end			# Local APIC of the CPU
+		end
+	end
+	device domain 0 on			# PCI domain
+		subsystemid 0x1043 0x8239 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/ite/it8716f		# Super I/O
+							device pnp 2e.0 on		# 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 (N/A)
+							end
+							device pnp 2e.3 on		# Parallel port
+								io 0x60 = 0x378
+								io 0x62 = 0x000
+								irq 0x70 = 7
+								drq 0x74 = 4
+							end
+							device pnp 2e.4 on		# Environment controller
+								io 0x60 = 0x290
+								io 0x62 = 0x000
+								irq 0x70 = 0
+							end
+							device pnp 2e.5 on		# PS/2 keyboard
+								io 0x60 = 0x60
+								io 0x62 = 0x64
+								irq 0x70 = 1			# PS/2 keyboard IRQ
+							end
+							device pnp 2e.6 on		# PS/2 mouse
+								irq 0x70 = 12			# PS/2 mouse IRQ
+							end
+							device pnp 2e.7 off		# GPIO
+								io 0x60 = 0x0000		# SMI# Normal Run Access
+								io 0x62 = 0x800			# Simple I/O
+								io 0x64 = 0x0000		# Serial Flash I/F
+							end
+							device pnp 2e.8 off		# MIDI (N/A)
+							end
+							device pnp 2e.9 off		# Game port (N/A)
+							end
+							device pnp 2e.a off		# Consumer IR (N/A)
+							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
+					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			# Azalia (HD Audio)
+					device pci 8.0 on end			# NIC
+					device pci 9.0 off end		# NIC (N/A)
+					device pci a.0 on end			# PCI E 5 (PCIEX4)
+					device pci b.0 off end		# PCI E 4
+					device pci c.0 on end			# PCI E 3 (PCIEX1_2)
+					device pci d.0 on end			# PCI E 2 (PCIEX1_1)
+					device pci e.0 off end		# PCI E 1
+					device pci f.0 on end			# PCI E 0 (PCIEX16_1)
+					register "ide0_enable" = "1"		# Primary IDE
+					register "ide1_enable" = "0"		# Secondary IDE (N/A)
+					register "sata0_enable" = "1"
+					register "sata1_enable" = "1"
+				end
+			end
+			device pci 18.0 on end			# Link 1
+			device pci 18.0 on 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/asus/m2v-mx_se/devicetree.cb b/src/mainboard/asus/m2v-mx_se/devicetree.cb
index 213e3ea..73631b3 100644
--- a/src/mainboard/asus/m2v-mx_se/devicetree.cb
+++ b/src/mainboard/asus/m2v-mx_se/devicetree.cb
@@ -1,77 +1,77 @@
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device cpu_cluster 0 on			# APIC cluster
-    chip cpu/amd/socket_AM2			# CPU
-      device lapic 0 on end			# APIC
-    end
-  end
-  device domain 0 on			# PCI domain
-    subsystemid 0x1043 0 inherit
-    chip northbridge/amd/amdk8			# mc0
-      device pci 18.0 on			# Northbridge
-        # Devices on link 0, link 0 == LDT 0
-        chip southbridge/via/vt8237r		# Southbridge
-          register "ide0_enable" = "1"		# Enable IDE channel 0
-          register "ide1_enable" = "1"		# Enable IDE channel 1
-          register "ide0_80pin_cable" = "1"	# 80pin cable on IDE channel 0
-          register "ide1_80pin_cable" = "1"	# 80pin cable on IDE channel 1
-          register "fn_ctrl_lo" = "0xc0"	# Enable SB functions
-          register "fn_ctrl_hi" = "0x1d"	# Enable SB functions
-          device pci 0.0 on end			# HT
-          device pci f.1 on end			# IDE
-          device pci 11.0 on			# LPC
-            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 superio/ite/it8712f		# Super I/O
-              device pnp 2e.0 on		# 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
-                irq 0x70 = 7
-              end
-              device pnp 2e.4 on		# Environment controller
-                io 0x60 = 0x290
-                io 0x62 = 0x230
-                irq 0x70 = 0x00
-              end
-              device pnp 2e.5 off end		# PS/2 keyboard
-              device pnp 2e.6 off end		# PS/2 mouse
-              device pnp 2e.7 off end		# GPIO config
-              device pnp 2e.8 off end		# Midi port
-              device pnp 2e.9 off end		# Game port
-              device pnp 2e.a off end		# IR
-	     end
-	   end
-          device pci 12.0 on end		# VIA LAN
-          device pci 13.0 on end		# br
-          device pci 13.1 on end		# br2 need to have it here to discover it
-        end
-        chip southbridge/via/k8t890		# "Southbridge" K8M890
-        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			# APIC cluster
+		chip cpu/amd/socket_AM2			# CPU
+			device lapic 0 on end			# APIC
+		end
+	end
+	device domain 0 on			# PCI domain
+		subsystemid 0x1043 0 inherit
+		chip northbridge/amd/amdk8			# mc0
+			device pci 18.0 on			# Northbridge
+				# Devices on link 0, link 0 == LDT 0
+				chip southbridge/via/vt8237r		# Southbridge
+					register "ide0_enable" = "1"		# Enable IDE channel 0
+					register "ide1_enable" = "1"		# Enable IDE channel 1
+					register "ide0_80pin_cable" = "1"	# 80pin cable on IDE channel 0
+					register "ide1_80pin_cable" = "1"	# 80pin cable on IDE channel 1
+					register "fn_ctrl_lo" = "0xc0"		# Enable SB functions
+					register "fn_ctrl_hi" = "0x1d"		# Enable SB functions
+					device pci 0.0 on end			# HT
+					device pci f.1 on end			# IDE
+					device pci 11.0 on			# LPC
+						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 superio/ite/it8712f		# Super I/O
+							device pnp 2e.0 on		# 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
+								irq 0x70 = 7
+							end
+							device pnp 2e.4 on		# Environment controller
+								io 0x60 = 0x290
+								io 0x62 = 0x230
+								irq 0x70 = 0x00
+							end
+							device pnp 2e.5 off end		# PS/2 keyboard
+							device pnp 2e.6 off end		# PS/2 mouse
+							device pnp 2e.7 off end		# GPIO config
+							device pnp 2e.8 off end		# Midi port
+							device pnp 2e.9 off end		# Game port
+							device pnp 2e.a off end		# IR
+						end
+					end
+					device pci 12.0 on end		# VIA LAN
+					device pci 13.0 on end		# br
+					device pci 13.1 on end		# br2 need to have it here to discover it
+				end
+				chip southbridge/via/k8t890		# "Southbridge" K8M890
+				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/asus/m2v/devicetree.cb b/src/mainboard/asus/m2v/devicetree.cb
index 61d94ba..1222256 100644
--- a/src/mainboard/asus/m2v/devicetree.cb
+++ b/src/mainboard/asus/m2v/devicetree.cb
@@ -1,75 +1,75 @@
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device cpu_cluster 0 on			# APIC cluster
-    chip cpu/amd/socket_AM2			# CPU
-      device lapic 0 on end			# APIC
-    end
-  end
-  device domain 0 on			# PCI domain
-    subsystemid 0x1043 0 inherit
-    chip northbridge/amd/amdk8			# mc0
-      device pci 18.0 on			# Northbridge
-        # Devices on link 0, link 0 == LDT 0
-        chip southbridge/via/vt8237r		# Southbridge
-          register "ide0_enable" = "1"		# Enable IDE channel 0
-          register "ide1_enable" = "1"		# Enable IDE channel 1
-          register "ide0_80pin_cable" = "1"	# 80pin cable on IDE channel 0
-          register "ide1_80pin_cable" = "1"	# 80pin cable on IDE channel 1
-          register "fn_ctrl_lo" = "0xc0"	# Enable SB functions
-          register "fn_ctrl_hi" = "0x0d"	# Enable SB functions
-          device pci 0.0 on end			# HT
-          device pci f.1 on end			# IDE
-          device pci 11.0 on			# LPC
-            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 superio/ite/it8712f		# Super I/O
-              device pnp 2e.0 on		# 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 end		# Com2 (N/A on this board)
-              device pnp 2e.3 on		# Lpt1
-                io 0x60 = 0x378
-                irq 0x70 = 7
-                drq 0x74 = 3
-              end
-              device pnp 2e.4 on		# Environment controller
-                io 0x60 = 0xd00
-                io 0x62 = 0xc00
-                irq 0x70 = 0x00
-              end
-              device pnp 2e.5 off end		# PS/2 keyboard
-              device pnp 2e.6 off end		# PS/2 mouse
-              device pnp 2e.7 off end		# GPIO config
-              device pnp 2e.8 off end		# Midi port
-              device pnp 2e.9 off end		# Game port
-              device pnp 2e.a off end		# IR
-            end
-          end
-          device pci 12.0 off end		# VIA LAN (off, other chip used)
-          device pci 13.0 on end		# br
-          device pci 13.1 on end		# br2, need to have it here to discover it
-        end
-        chip southbridge/via/k8t890		# "Southbridge" K8T890
-        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			# APIC cluster
+		chip cpu/amd/socket_AM2			# CPU
+			device lapic 0 on end			# APIC
+		end
+	end
+	device domain 0 on			# PCI domain
+		subsystemid 0x1043 0 inherit
+		chip northbridge/amd/amdk8			# mc0
+			device pci 18.0 on			# Northbridge
+				# Devices on link 0, link 0 == LDT 0
+				chip southbridge/via/vt8237r		# Southbridge
+					register "ide0_enable" = "1"		# Enable IDE channel 0
+					register "ide1_enable" = "1"		# Enable IDE channel 1
+					register "ide0_80pin_cable" = "1"	# 80pin cable on IDE channel 0
+					register "ide1_80pin_cable" = "1"	# 80pin cable on IDE channel 1
+					register "fn_ctrl_lo" = "0xc0"	# Enable SB functions
+					register "fn_ctrl_hi" = "0x0d"	# Enable SB functions
+					device pci 0.0 on end			# HT
+					device pci f.1 on end			# IDE
+					device pci 11.0 on			# LPC
+						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 superio/ite/it8712f		# Super I/O
+							device pnp 2e.0 on		# 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 end		# Com2 (N/A on this board)
+							device pnp 2e.3 on		# Lpt1
+								io 0x60 = 0x378
+								irq 0x70 = 7
+								drq 0x74 = 3
+							end
+							device pnp 2e.4 on		# Environment controller
+								io 0x60 = 0xd00
+								io 0x62 = 0xc00
+								irq 0x70 = 0x00
+							end
+							device pnp 2e.5 off end		# PS/2 keyboard
+							device pnp 2e.6 off end		# PS/2 mouse
+							device pnp 2e.7 off end		# GPIO config
+							device pnp 2e.8 off end		# Midi port
+							device pnp 2e.9 off end		# Game port
+							device pnp 2e.a off end		# IR
+						end
+					end
+					device pci 12.0 off end		# VIA LAN (off, other chip used)
+					device pci 13.0 on end		# br
+					device pci 13.1 on end		# br2, need to have it here to discover it
+				end
+				chip southbridge/via/k8t890		# "Southbridge" K8T890
+				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/asus/m4a78-em/devicetree.cb b/src/mainboard/asus/m4a78-em/devicetree.cb
index e760c17..c6202f2 100644
--- a/src/mainboard/asus/m4a78-em/devicetree.cb
+++ b/src/mainboard/asus/m4a78-em/devicetree.cb
@@ -1,27 +1,27 @@
 chip northbridge/amd/amdfam10/root_complex
 	device cpu_cluster 0 on
-		chip cpu/amd/socket_AM3  #L1 and DDR2
+		chip cpu/amd/socket_AM3	#L1 and DDR2
 			 device lapic 0 on end
 		end
 	end
 	device domain 0 on
 		subsystemid 0x1043 0x83f1 inherit
 		chip northbridge/amd/amdfam10
-			device pci 18.0 on #  northbridge
+			device pci 18.0 on	# northbridge
 				chip southbridge/amd/rs780
-					device pci 0.0 on end # HT  	0x9600
-					device pci 1.0 on end # Internal Graphics P2P bridge 0x9602
-					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x9603
-					device pci 3.0 on end # PCIE P2P bridge	0x960b
-					device pci 4.0 on end # PCIE P2P bridge 0x9604
-					device pci 5.0 off end # PCIE P2P bridge 0x9605
-					device pci 6.0 off end # PCIE P2P bridge 0x9606
-					device pci 7.0 off end # PCIE P2P bridge 0x9607
-					device pci 8.0 off end # NB/SB Link P2P bridge
-					device pci 9.0 on end #
-					device pci a.0 on end # bridge to RTL8112 PCI Express Gigabit Ethernet
-					register "gppsb_configuration" = "1"   # Configuration B
-					register "gpp_configuration" = "3"   # Configuration D default
+					device pci 0.0 on end	# HT	0x9600
+					device pci 1.0 on end	# Internal Graphics P2P bridge 0x9602
+					device pci 2.0 on end	# PCIE P2P bridge (external graphics) 0x9603
+					device pci 3.0 on end	# PCIE P2P bridge	0x960b
+					device pci 4.0 on end	# PCIE P2P bridge 0x9604
+					device pci 5.0 off end	# PCIE P2P bridge 0x9605
+					device pci 6.0 off end	# PCIE P2P bridge 0x9606
+					device pci 7.0 off end	# PCIE P2P bridge 0x9607
+					device pci 8.0 off end	# NB/SB Link P2P bridge
+					device pci 9.0 on end	#
+					device pci a.0 on end	# bridge to RTL8112 PCI Express Gigabit Ethernet
+					register "gppsb_configuration" = "1"	# Configuration B
+					register "gpp_configuration" = "3"	# Configuration D default
 					register "port_enable" = "0x6fc"
 					register "gfx_dev2_dev3" = "1"
 					register "gfx_dual_slot" = "2"
@@ -33,14 +33,14 @@ chip northbridge/amd/amdfam10/root_complex
 					register "gfx_link_width" = "0"
 				end
 				chip southbridge/amd/sb700 # it is under NB/SB Link, but on the same pri bus
-					device pci 11.0 on end # SATA
-					device pci 12.0 on end # USB
-					device pci 12.1 on end # USB
-					device pci 12.2 on end # USB
-					device pci 13.0 on end # USB
-					device pci 13.1 on end # USB
-					device pci 13.2 on end # USB
-	 				device pci 14.0 on # SM
+					device pci 11.0 on end	# SATA
+					device pci 12.0 on end	# USB
+					device pci 12.1 on end	# USB
+					device pci 12.2 on end	# USB
+					device pci 13.0 on end	# USB
+					device pci 13.1 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
@@ -54,47 +54,46 @@ chip northbridge/amd/amdfam10/root_complex
 							device i2c 53 on end
 						end
 					end # SM
-					device pci 14.1 on end # IDE    0x439c
-					device pci 14.2 on end # HDA    0x4383
-					device pci 14.3 on # LPC	0x439d
+					device pci 14.1 on end	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on	# LPC	0x439d
 						chip superio/ite/it8712f
-							device pnp 2e.0 off end #  Floppy
-							device pnp 2e.1 on #  Com1
+							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 #  Com2
+							device pnp 2e.2 off	# Com2
 								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 2e.3 off #  Parallel Port
+							device pnp 2e.3 off	# Parallel Port
 								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 2e.4 off end #  Environment Controller
-							device pnp 2e.5 on #  Keyboard
+							device pnp 2e.4 off end	# Environment Controller
+							device pnp 2e.5 on	# Keyboard
 								io 0x60 = 0x60
 								io 0x62 = 0x64
 								irq 0x70 = 1
 							end
-							device pnp 2e.6 on #  Mouse
+							device pnp 2e.6 on	# Mouse
 								irq 0x70 = 12
 							end
-							device pnp 2e.7 off #  GPIO, must be closed for unresolved reason.
+							device pnp 2e.7 off	# GPIO, must be closed for unresolved reason.
 							end
-							device pnp 2e.8 off #  MIDI
+							device pnp 2e.8 off	# MIDI
 							end
-							device pnp 2e.9 off #  GAME
+							device pnp 2e.9 off	# GAME
 							end
-							device pnp 2e.a off end #  CIR
+							device pnp 2e.a off end	# CIR
 						end	#superio
 					end		#LPC
-					device pci 14.4 on end # PCI to PCI Bridge [1002:4384]
-					device pci 14.5 on end # USB 2
+					device pci 14.4 on end	# PCI to PCI Bridge [1002:4384]
+					device pci 14.5 on end	# USB 2
 					register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				end	#southbridge/amd/sb700
-			end #  device pci 18.0
-
+			end # device pci 18.0
 			device pci 18.0 on end
 			device pci 18.0 on end
 			device pci 18.1 on end
diff --git a/src/mainboard/asus/m4a785-m/devicetree.cb b/src/mainboard/asus/m4a785-m/devicetree.cb
index 4549ead..dc5a4c9 100644
--- a/src/mainboard/asus/m4a785-m/devicetree.cb
+++ b/src/mainboard/asus/m4a785-m/devicetree.cb
@@ -1,27 +1,27 @@
 chip northbridge/amd/amdfam10/root_complex
 	device cpu_cluster 0 on
-		chip cpu/amd/socket_AM3  #L1 and DDR2
+		chip cpu/amd/socket_AM3	#L1 and DDR2
 			 device lapic 0 on end
 		end
 	end
 	device domain 0 on
 		subsystemid 0x1043 0x83a2 inherit
 		chip northbridge/amd/amdfam10
-			device pci 18.0 on #  northbridge
+			device pci 18.0 on	# northbridge
 				chip southbridge/amd/rs780
-					device pci 0.0 on end # HT  	0x9600
-					device pci 1.0 on end # Internal Graphics P2P bridge 0x9602
-					device pci 2.0 off end # PCIE P2P bridge (external graphics) 0x9603
-					device pci 3.0 off end # PCIE P2P bridge	0x960b
-					device pci 4.0 off end # PCIE P2P bridge 0x9604
-					device pci 5.0 off end # PCIE P2P bridge 0x9605
-					device pci 6.0 off end # PCIE P2P bridge 0x9606
-					device pci 7.0 off end # PCIE P2P bridge 0x9607
-					device pci 8.0 off end # NB/SB Link P2P bridge
-					device pci 9.0 off end #
-					device pci a.0 on end # bridge to RTL8111/8168B PCI Express Gigabit Ethernet
-					register "gppsb_configuration" = "1"   # Configuration B
-					register "gpp_configuration" = "3"   # Configuration D default
+					device pci 0.0 on end	# HT	0x9600
+					device pci 1.0 on end	# Internal Graphics P2P bridge 0x9602
+					device pci 2.0 off end	# PCIE P2P bridge (external graphics) 0x9603
+					device pci 3.0 off end	# PCIE P2P bridge	0x960b
+					device pci 4.0 off end	# PCIE P2P bridge 0x9604
+					device pci 5.0 off end	# PCIE P2P bridge 0x9605
+					device pci 6.0 off end	# PCIE P2P bridge 0x9606
+					device pci 7.0 off end	# PCIE P2P bridge 0x9607
+					device pci 8.0 off end	# NB/SB Link P2P bridge
+					device pci 9.0 off end	#
+					device pci a.0 on end	# bridge to RTL8111/8168B PCI Express Gigabit Ethernet
+					register "gppsb_configuration" = "1"	# Configuration B
+					register "gpp_configuration" = "3"	# Configuration D default
 					register "port_enable" = "0x6fc"
 					register "gfx_dev2_dev3" = "1"
 					register "gfx_dual_slot" = "2"
@@ -32,15 +32,15 @@ chip northbridge/amd/amdfam10/root_complex
 					register "gfx_reconfiguration" = "1"
 					register "gfx_link_width" = "0"
 				end
-				chip southbridge/amd/sb700 # it is under NB/SB Link, but on the same pri bus
-					device pci 11.0 on end # SATA
-					device pci 12.0 on end # USB
-					device pci 12.1 on end # USB
-					device pci 12.2 on end # USB
-					device pci 13.0 on end # USB
-					device pci 13.1 on end # USB
-					device pci 13.2 on end # USB
-	 				device pci 14.0 on # SM
+				chip southbridge/amd/sb700	# it is under NB/SB Link, but on the same pri bus
+					device pci 11.0 on end	# SATA
+					device pci 12.0 on end	# USB
+					device pci 12.1 on end	# USB
+					device pci 12.2 on end	# USB
+					device pci 13.0 on end	# USB
+					device pci 13.1 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
@@ -54,46 +54,46 @@ chip northbridge/amd/amdfam10/root_complex
 							device i2c 53 on end
 						end
 					end # SM
-					device pci 14.1 on end # IDE    0x439c
-					device pci 14.2 on end # HDA    0x4383
-					device pci 14.3 on # LPC	0x439d
+					device pci 14.1 on end	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on	# LPC	0x439d
 						chip superio/ite/it8712f
-							device pnp 2e.0 off end #  Floppy
-							device pnp 2e.1 on #  Com1
+							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 #  Com2
+							device pnp 2e.2 off	# Com2
 								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 2e.3 off #  Parallel Port
+							device pnp 2e.3 off	# Parallel Port
 								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 2e.4 off end #  Environment Controller
-							device pnp 2e.5 on #  Keyboard
+							device pnp 2e.4 off end	# Environment Controller
+							device pnp 2e.5 on	# Keyboard
 								io 0x60 = 0x60
 								io 0x62 = 0x64
 								irq 0x70 = 1
 							end
-							device pnp 2e.6 on #  Mouse
+							device pnp 2e.6 on	# Mouse
 								irq 0x70 = 12
 							end
-							device pnp 2e.7 off #  GPIO, must be closed for unresolved reason.
+							device pnp 2e.7 off	# GPIO, must be closed for unresolved reason.
 							end
-							device pnp 2e.8 off #  MIDI
+							device pnp 2e.8 off	# MIDI
 							end
-							device pnp 2e.9 off #  GAME
+							device pnp 2e.9 off	# GAME
 							end
-							device pnp 2e.a off end #  CIR
+							device pnp 2e.a off end	# CIR
 						end	#superio
 					end		#LPC
-					device pci 14.4 on end # PCI to PCI Bridge [1002:4384]
-					device pci 14.5 on end # USB 2
+					device pci 14.4 on end	# PCI to PCI Bridge [1002:4384]
+					device pci 14.5 on end	# USB 2
 					register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				end	#southbridge/amd/sb700
-			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/asus/m4a785t-m/devicetree.cb b/src/mainboard/asus/m4a785t-m/devicetree.cb
index 9783989..e83dec3 100644
--- a/src/mainboard/asus/m4a785t-m/devicetree.cb
+++ b/src/mainboard/asus/m4a785t-m/devicetree.cb
@@ -1,29 +1,29 @@
 chip northbridge/amd/amdfam10/root_complex
 	device cpu_cluster 0 on
-		chip cpu/amd/socket_AM3  #L1 and DDR2
+		chip cpu/amd/socket_AM3	#L1 and DDR2
 			 device lapic 0 on end
 		end
 	end
 	device domain 0 on
 		subsystemid 0x1043 0x83a2 inherit
 		chip northbridge/amd/amdfam10
-			device pci 18.0 on #  northbridge
+			device pci 18.0 on	# northbridge
 				chip southbridge/amd/rs780
-					device pci 0.0 on end # HT  	0x9600
-					device pci 1.0 on # Internal Graphics P2P bridge 0x9602
+					device pci 0.0 on end	# HT	0x9600
+					device pci 1.0 on	# Internal Graphics P2P bridge 0x9602
 						device pci 5.0 on end # onboard VGA
 					end
-					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x9603
-					device pci 3.0 off end # PCIE P2P bridge	0x960b
-					device pci 4.0 off end # PCIE P2P bridge 0x9604
-					device pci 5.0 off end # PCIE P2P bridge 0x9605
-					device pci 6.0 off end # PCIE P2P bridge 0x9606
-					device pci 7.0 off end # PCIE P2P bridge 0x9607
-					device pci 8.0 off end # NB/SB Link P2P bridge
-					device pci 9.0 off end #
-					device pci a.0 on end # bridge to RTL8111/8168B PCI Express Gigabit Ethernet
-					register "gppsb_configuration" = "1"   # Configuration B
-					register "gpp_configuration" = "3"   # Configuration D default
+					device pci 2.0 on end	# PCIE P2P bridge (external graphics) 0x9603
+					device pci 3.0 off end	# PCIE P2P bridge	0x960b
+					device pci 4.0 off end	# PCIE P2P bridge 0x9604
+					device pci 5.0 off end	# PCIE P2P bridge 0x9605
+					device pci 6.0 off end	# PCIE P2P bridge 0x9606
+					device pci 7.0 off end	# PCIE P2P bridge 0x9607
+					device pci 8.0 off end	# NB/SB Link P2P bridge
+					device pci 9.0 off end	#
+					device pci a.0 on end	# bridge to RTL8111/8168B PCI Express Gigabit Ethernet
+					register "gppsb_configuration" = "1"	# Configuration B
+					register "gpp_configuration" = "3"	# Configuration D default
 					register "port_enable" = "0x6fc"
 					register "gfx_dev2_dev3" = "1"
 					register "gfx_dual_slot" = "0"
@@ -34,15 +34,15 @@ chip northbridge/amd/amdfam10/root_complex
 					register "gfx_reconfiguration" = "1"
 					register "gfx_link_width" = "0"
 				end
-				chip southbridge/amd/sb700 # it is under NB/SB Link, but on the same pri bus
-					device pci 11.0 on end # SATA
-					device pci 12.0 on end # USB
-					device pci 12.1 on end # USB
-					device pci 12.2 on end # USB
-					device pci 13.0 on end # USB
-					device pci 13.1 on end # USB
-					device pci 13.2 on end # USB
-	 				device pci 14.0 on # SM
+				chip southbridge/amd/sb700	# it is under NB/SB Link, but on the same pri bus
+					device pci 11.0 on end	# SATA
+					device pci 12.0 on end	# USB
+					device pci 12.1 on end	# USB
+					device pci 12.2 on end	# USB
+					device pci 13.0 on end	# USB
+					device pci 13.1 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
@@ -56,47 +56,46 @@ chip northbridge/amd/amdfam10/root_complex
 							device i2c 53 on end
 						end
 					end # SM
-					device pci 14.1 on end # IDE    0x439c
-					device pci 14.2 on end # HDA    0x4383
-					device pci 14.3 on # LPC	0x439d
+					device pci 14.1 on end	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on	# LPC	0x439d
 						chip superio/ite/it8712f
-							device pnp 2e.0 off end #  Floppy
-							device pnp 2e.1 on #  Com1
+							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 #  Com2
+							device pnp 2e.2 off	# Com2
 								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 2e.3 off #  Parallel Port
+							device pnp 2e.3 off	# Parallel Port
 								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 2e.4 off end #  Environment Controller
-							device pnp 2e.5 on #  Keyboard
+							device pnp 2e.4 off end	# Environment Controller
+							device pnp 2e.5 on	# Keyboard
 								io 0x60 = 0x60
 								io 0x62 = 0x64
 								irq 0x70 = 1
 							end
-							device pnp 2e.6 on #  Mouse
+							device pnp 2e.6 on	# Mouse
 								irq 0x70 = 12
 							end
-							device pnp 2e.7 off #  GPIO, must be closed for unresolved reason.
+							device pnp 2e.7 off	# GPIO, must be closed for unresolved reason.
 							end
-							device pnp 2e.8 off #  MIDI
+							device pnp 2e.8 off	# MIDI
 							end
-							device pnp 2e.9 off #  GAME
+							device pnp 2e.9 off	# GAME
 							end
-							device pnp 2e.a off end #  CIR
+							device pnp 2e.a off end	# CIR
 						end	#superio
 					end		#LPC
-					device pci 14.4 on end # PCI to PCI Bridge [1002:4384]
-					device pci 14.5 on end # USB 2
+					device pci 14.4 on end	# PCI to PCI Bridge [1002:4384]
+					device pci 14.5 on end	# USB 2
 					register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				end	#southbridge/amd/sb700
-			end #  device pci 18.0
-
+			end # device pci 18.0
 			device pci 18.0 on end
 			device pci 18.0 on end
 			device pci 18.1 on end
diff --git a/src/mainboard/asus/m5a88-v/devicetree.cb b/src/mainboard/asus/m5a88-v/devicetree.cb
index 65ddf30..5f16e90 100644
--- a/src/mainboard/asus/m5a88-v/devicetree.cb
+++ b/src/mainboard/asus/m5a88-v/devicetree.cb
@@ -1,26 +1,26 @@
 # sample config for advansus/A785E-I
 chip northbridge/amd/amdfam10/root_complex
 	device cpu_cluster 0 on
-		chip cpu/amd/socket_AM3  #L1 and DDR3
+		chip cpu/amd/socket_AM3	#L1 and DDR3
 			 device lapic 0 on end
 		end
 	end
 	device domain 0 on
 		subsystemid 0x1043 0x843e inherit #TODO: Set the correctly subsystem id.
 		chip northbridge/amd/amdfam10
-			device pci 18.0 on #  northbridge
+			device pci 18.0 on	# northbridge
 				chip southbridge/amd/rs780
-					device pci 0.0 on end # HT  	0x9600
-					device pci 1.0 on end # Internal Graphics P2P bridge 0x9712
-					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x9603
-					device pci 3.0 off end # PCIE P2P bridge 0x960b
-					device pci 4.0 on end # PCIE P2P bridge 0x9604 wireless
-					device pci 5.0 off end # PCIE P2P bridge 0x9605
-					device pci 6.0 off end # PCIE P2P bridge 0x9606
-					device pci 7.0 off end # PCIE P2P bridge 0x9607
-					device pci 8.0 off end # NB/SB Link P2P bridge
-					device pci 9.0 on end # Ethernet
-					device pci a.0 on end # Ethernet
+					device pci 0.0 on end	# HT	0x9600
+					device pci 1.0 on end	# Internal Graphics P2P bridge 0x9712
+					device pci 2.0 on end	# PCIE P2P bridge (external graphics) 0x9603
+					device pci 3.0 off end	# PCIE P2P bridge 0x960b
+					device pci 4.0 on end	# PCIE P2P bridge 0x9604 wireless
+					device pci 5.0 off end	# PCIE P2P bridge 0x9605
+					device pci 6.0 off end	# PCIE P2P bridge 0x9606
+					device pci 7.0 off end	# PCIE P2P bridge 0x9607
+					device pci 8.0 off end	# NB/SB Link P2P bridge
+					device pci 9.0 on end	# Ethernet
+					device pci a.0 on end	# Ethernet
 					register "gppsb_configuration" = "4"	# Configuration E
 					register "gpp_configuration" = "3"	# Configuration D
 					register "port_enable" = "0x6f6"
@@ -31,16 +31,16 @@ chip northbridge/amd/amdfam10/root_complex
 					register "gfx_reconfiguration" = "1"
 					register "gfx_link_width" = "0"
 					register "gfx_tmds" = "1"
-					register "gfx_pcie_config" = "3" # 1x8 GFX on Lanes 8-15
-					register "gfx_ddi_config" = "1"  # Lanes 0-3 DDI_SL
+					register "gfx_pcie_config" = "3"	# 1x8 GFX on Lanes 8-15
+					register "gfx_ddi_config" = "1"		# Lanes 0-3 DDI_SL
 				end
-				chip southbridge/amd/cimx/sb800 # 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 southbridge/amd/cimx/sb800	# 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
@@ -54,67 +54,66 @@ chip northbridge/amd/amdfam10/root_complex
 							device i2c 53 on end
 						end
 					end # SM
-					device pci 14.1 on end # IDE    0x439c
-					device pci 14.2 on end # HDA    0x4383
-					device pci 14.3 on # LPC host controller [1002:439d]
+					device pci 14.1 on end	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on	# LPC host controller [1002:439d]
 						chip superio/ite/it8721f
-						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  # SFI
+						device pnp 2e.6 off	# SFI
 							io 0x62 = 0x100
 						end
-						device pnp 2e.7 off #  GPIO_GAME_MIDI
+						device pnp 2e.7 off	# GPIO_GAME_MIDI
 							io 0x60 = 0x220
 							io 0x62 = 0x300
 							irq 0x70 = 9
 						end
-						device pnp 2e.8 off end #  WDTO_PLED
-						device pnp 2e.9 off end #  GPIO_SUSLED
-						device pnp 2e.a off end #  ACPI
-						device pnp 2e.b on #  HW Monitor
+						device pnp 2e.8 off end	# WDTO_PLED
+						device pnp 2e.9 off end	# GPIO_SUSLED
+						device pnp 2e.a off end	# ACPI
+						device pnp 2e.b on	# HW Monitor
 							io 0x60 = 0x290
 							irq 0x70 = 5
 						end
 						end #superio/ite/it8721f
 					end # LPC host controller [1002:439d]
-					device pci 14.4 off end # PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0}
-					device pci 14.5 on end # USB 2
-					device pci 14.6 off end # Gec
-					device pci 15.0 on end # PCIe 0
-					device pci 15.1 on end # PCIe 1
-					device pci 15.2 on end # PCIe 2
-					device pci 15.3 on end # PCIe 3
-					device pci 16.0 on end # USB
-					device pci 16.2 on end # USB
+					device pci 14.4 off end	# PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0}
+					device pci 14.5 on end	# USB 2
+					device pci 14.6 off end	# Gec
+					device pci 15.0 on end	# PCIe 0
+					device pci 15.1 on end	# PCIe 1
+					device pci 15.2 on end	# PCIe 2
+					device pci 15.3 on end	# PCIe 3
+					device pci 16.0 on end	# USB
+					device pci 16.2 on end	# USB
 					#register "gpp_configuration" = "0" #4:0:0:0
 					#register "gpp_configuration" = "2" #2:2:0:0
 					#register "gpp_configuration" = "3" #2:1:1:0
 					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
 			device pci 18.1 on end
 			device pci 18.2 on end
 			device pci 18.3 on end
diff --git a/src/mainboard/asus/mew-am/devicetree.cb b/src/mainboard/asus/mew-am/devicetree.cb
index 8a20cab..473031e 100644
--- a/src/mainboard/asus/mew-am/devicetree.cb
+++ b/src/mainboard/asus/mew-am/devicetree.cb
@@ -1,60 +1,60 @@
 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		# Chipset Graphics Controller (CGC)
-    chip southbridge/intel/i82801ax	# Southbridge
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
+	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		# Chipset Graphics Controller (CGC)
+		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 bridge
-        chip superio/smsc/smscsuperio	# Super I/O
-          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 = 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		# PS/2 keyboard interrupt
-            irq 0x72 = 12		# PS/2 mouse interrupt
-          end
-          device pnp 2e.9 on		# Game port
-            io 0x60 = 0x201
-          end
-          device pnp 2e.a on		# Power-management events (PME)
-            io 0x60 = 0x600
-          end
-          device pnp 2e.b on		# MIDI port (MPU-401)
-            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 off end		# AC'97 audio (N/A, uses CS4280 chip)
-      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 bridge
+				chip superio/smsc/smscsuperio	# Super I/O
+					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 = 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		# PS/2 keyboard interrupt
+						irq 0x72 = 12		# PS/2 mouse interrupt
+					end
+					device pnp 2e.9 on		# Game port
+						io 0x60 = 0x201
+					end
+					device pnp 2e.a on		# Power-management events (PME)
+						io 0x60 = 0x600
+					end
+					device pnp 2e.b on		# MIDI port (MPU-401)
+						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 off end		# AC'97 audio (N/A, uses CS4280 chip)
+			device pci 1f.6 off end		# AC'97 modem (N/A)
+		end
+	end
 end
diff --git a/src/mainboard/asus/mew-vm/devicetree.cb b/src/mainboard/asus/mew-vm/devicetree.cb
index e0cc9e3..a9453ce 100644
--- a/src/mainboard/asus/mew-vm/devicetree.cb
+++ b/src/mainboard/asus/mew-vm/devicetree.cb
@@ -5,45 +5,45 @@ chip northbridge/intel/i82810
 			#	device pci 1.0 on end
 		end
 		chip southbridge/intel/i82801ax # Southbridge
-      			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 1e.0 on	# PCI Bridge
 				#	device pci 1.0 on end
 			end
-			device pci 1f.0 on  # ISA/LPC? Bridge
+			device pci 1f.0 on	# ISA/LPC? Bridge
 				chip superio/smsc/lpc47b272
-					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.3 off # Parallel Port
+					device pnp 2e.3 off	# Parallel Port
 						io 0x60 = 0x378
 						irq 0x70 = 7
 					end
-					device pnp 2e.4 on # Com1
+					device pnp 2e.4 on	# Com1
 						io 0x60 = 0x3f8
 						irq 0x70 = 4
 					end
-					device pnp 2e.5 off # Com2
+					device pnp 2e.5 off	# Com2
 						io 0x60 = 0x2f8
 						irq 0x70 = 3
 					end
-					device pnp 2e.7 on # Keyboard
+					device pnp 2e.7 on	# Keyboard
 						io 0x60 = 0x60
 						io 0x62 = 0x64
-						irq 0x70 = 1 # Keyboard interrupt
-						irq 0x72 = 12 # Mouse interrupt
+						irq 0x70 = 1	# Keyboard interrupt
+						irq 0x72 = 12	# Mouse interrupt
 					end
-					device pnp 2e.a off end # ACPI
+					device pnp 2e.a off end	# ACPI
 				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 # AC'97, no header on MEW-VM
-			device pci 1f.6 off end # AC'97 Modem (MC'97)
+			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	# AC'97, no header on MEW-VM
+			device pci 1f.6 off end	# AC'97 Modem (MC'97)
 		end
 	end
 	chip cpu/intel/socket_PGA370
diff --git a/src/mainboard/asus/p2b-d/devicetree.cb b/src/mainboard/asus/p2b-d/devicetree.cb
index fe82a0d..d3fd869 100644
--- a/src/mainboard/asus/p2b-d/devicetree.cb
+++ b/src/mainboard/asus/p2b-d/devicetree.cb
@@ -1,62 +1,62 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device cpu_cluster 0 on		# (L)APIC cluster
-    chip cpu/intel/slot_1		# CPU socket 0
-      device lapic 0 on end		# Local APIC of CPU 0
-    end
-    chip cpu/intel/slot_1		# CPU socket 1
-      device lapic 1 on end		# Local APIC of CPU 1
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 1.0 on end		# PCI/AGP bridge
-    chip southbridge/intel/i82371eb	# Southbridge
-      device pci 4.0 on			# ISA bridge
-        chip superio/winbond/w83977tf	# Super I/O
-          device pnp 3f0.0 on		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 3f0.1 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 3f0.2 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 3f0.3 on		# COM2 / IR
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 3f0.5 on		# PS/2 keyboard / mouse
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1		# PS/2 keyboard interrupt
-            irq 0x72 = 12		# PS/2 mouse interrupt
-          end
-          device pnp 3f0.7 on		# GPIO 1
-          end
-          device pnp 3f0.8 on		# GPIO 2
-          end
-          device pnp 3f0.9 on		# GPIO 3
-          end
-          device pnp 3f0.a on		# ACPI
-          end
-        end
-      end
-      device pci 4.1 on	end		# IDE
-      device pci 4.2 on	end		# USB
-      device pci 4.3 on end		# ACPI
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      register "ide_legacy_enable" = "1"
-      # Enable UDMA/33 for higher speed if your IDE device(s) support it.
-      register "ide0_drive0_udma33_enable" = "1"
-      register "ide0_drive1_udma33_enable" = "1"
-      register "ide1_drive0_udma33_enable" = "1"
-      register "ide1_drive1_udma33_enable" = "1"
-    end
-  end
+	device cpu_cluster 0 on		# (L)APIC cluster
+		chip cpu/intel/slot_1		# CPU socket 0
+			device lapic 0 on end		# Local APIC of CPU 0
+		end
+		chip cpu/intel/slot_1		# CPU socket 1
+			device lapic 1 on end		# Local APIC of CPU 1
+		end
+	end
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 1.0 on end		# PCI/AGP bridge
+		chip southbridge/intel/i82371eb	# Southbridge
+			device pci 4.0 on			# ISA bridge
+				chip superio/winbond/w83977tf	# Super I/O
+					device pnp 3f0.0 on		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 3f0.1 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 3f0.2 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 3f0.3 on		# COM2 / IR
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 3f0.5 on		# PS/2 keyboard / mouse
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1		# PS/2 keyboard interrupt
+						irq 0x72 = 12		# PS/2 mouse interrupt
+					end
+					device pnp 3f0.7 on		# GPIO 1
+					end
+					device pnp 3f0.8 on		# GPIO 2
+					end
+					device pnp 3f0.9 on		# GPIO 3
+					end
+					device pnp 3f0.a on		# ACPI
+					end
+				end
+			end
+			device pci 4.1 on end		# IDE
+			device pci 4.2 on end		# USB
+			device pci 4.3 on end		# ACPI
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			register "ide_legacy_enable" = "1"
+			# Enable UDMA/33 for higher speed if your IDE device(s) support it.
+			register "ide0_drive0_udma33_enable" = "1"
+			register "ide0_drive1_udma33_enable" = "1"
+			register "ide1_drive0_udma33_enable" = "1"
+			register "ide1_drive1_udma33_enable" = "1"
+		end
+	end
 end
diff --git a/src/mainboard/asus/p2b-ds/devicetree.cb b/src/mainboard/asus/p2b-ds/devicetree.cb
index b8e9e85..ddae6f6 100644
--- a/src/mainboard/asus/p2b-ds/devicetree.cb
+++ b/src/mainboard/asus/p2b-ds/devicetree.cb
@@ -1,63 +1,63 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device cpu_cluster 0 on		# (L)APIC cluster
-    chip cpu/intel/slot_1		# CPU socket 0
-      device lapic 0 on end		# Local APIC of CPU 0
-    end
-    chip cpu/intel/slot_1		# CPU socket 1
-      device lapic 1 on end		# Local APIC of CPU 1
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 1.0 on end		# PCI/AGP bridge
-    chip southbridge/intel/i82371eb	# Southbridge
-      device pci 4.0 on			# ISA bridge
-        chip superio/winbond/w83977tf	# Super I/O
-          device pnp 3f0.0 on		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 3f0.1 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 3f0.2 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 3f0.3 on		# COM2 / IR
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 3f0.5 on		# PS/2 keyboard / mouse
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1		# PS/2 keyboard interrupt
-            irq 0x72 = 12		# PS/2 mouse interrupt
-          end
-          device pnp 3f0.7 on		# GPIO 1
-          end
-          device pnp 3f0.8 on		# GPIO 2
-          end
-          device pnp 3f0.9 on		# GPIO 3
-          end
-          device pnp 3f0.a on		# ACPI
-          end
-        end
-      end
-      device pci 4.1 on	end		# IDE
-      device pci 4.2 on	end		# USB
-      device pci 4.3 on end		# ACPI
-      device pci 6.0 on end		# Onboard SCSI
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      register "ide_legacy_enable" = "1"
-      # Enable UDMA/33 for higher speed if your IDE device(s) support it.
-      register "ide0_drive0_udma33_enable" = "1"
-      register "ide0_drive1_udma33_enable" = "1"
-      register "ide1_drive0_udma33_enable" = "1"
-      register "ide1_drive1_udma33_enable" = "1"
-    end
-  end
+	device cpu_cluster 0 on		# (L)APIC cluster
+		chip cpu/intel/slot_1		# CPU socket 0
+			device lapic 0 on end		# Local APIC of CPU 0
+		end
+		chip cpu/intel/slot_1		# CPU socket 1
+			device lapic 1 on end		# Local APIC of CPU 1
+		end
+	end
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 1.0 on end		# PCI/AGP bridge
+		chip southbridge/intel/i82371eb	# Southbridge
+			device pci 4.0 on			# ISA bridge
+				chip superio/winbond/w83977tf	# Super I/O
+					device pnp 3f0.0 on		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 3f0.1 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 3f0.2 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 3f0.3 on		# COM2 / IR
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 3f0.5 on		# PS/2 keyboard / mouse
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1		# PS/2 keyboard interrupt
+						irq 0x72 = 12		# PS/2 mouse interrupt
+					end
+					device pnp 3f0.7 on		# GPIO 1
+					end
+					device pnp 3f0.8 on		# GPIO 2
+					end
+					device pnp 3f0.9 on		# GPIO 3
+					end
+					device pnp 3f0.a on		# ACPI
+					end
+				end
+			end
+			device pci 4.1 on end		# IDE
+			device pci 4.2 on end		# USB
+			device pci 4.3 on end		# ACPI
+			device pci 6.0 on end		# Onboard SCSI
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			register "ide_legacy_enable" = "1"
+			# Enable UDMA/33 for higher speed if your IDE device(s) support it.
+			register "ide0_drive0_udma33_enable" = "1"
+			register "ide0_drive1_udma33_enable" = "1"
+			register "ide1_drive0_udma33_enable" = "1"
+			register "ide1_drive1_udma33_enable" = "1"
+		end
+	end
 end
diff --git a/src/mainboard/asus/p2b-f/devicetree.cb b/src/mainboard/asus/p2b-f/devicetree.cb
index 5bee5ae..c9ec31d 100644
--- a/src/mainboard/asus/p2b-f/devicetree.cb
+++ b/src/mainboard/asus/p2b-f/devicetree.cb
@@ -1,59 +1,59 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device cpu_cluster 0 on		# APIC cluster
-    chip cpu/intel/slot_1		# CPU
-      device lapic 0 on end		# APIC
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 1.0 on end		# PCI/AGP bridge
-    chip southbridge/intel/i82371eb	# Southbridge
-      device pci 4.0 on			# ISA bridge
-        chip superio/winbond/w83977tf	# Super I/O (FIXME: It's W83977EF!)
-          device pnp 3f0.0 on		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 3f0.1 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 3f0.2 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 3f0.3 on		# COM2 / IR
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 3f0.5 on		# PS/2 keyboard
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1		# PS/2 keyboard interrupt
-            irq 0x72 = 12		# PS/2 mouse interrupt
-          end
-          device pnp 3f0.6 on		# Consumer IR
-          end
-          device pnp 3f0.7 on		# GPIO 1
-          end
-          device pnp 3f0.8 on		# GPIO 2
-          end
-          device pnp 3f0.a on		# ACPI
-          end
-        end
-      end
-      device pci 4.1 on	end		# IDE
-      device pci 4.2 on	end		# USB
-      device pci 4.3 on end		# ACPI
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      register "ide_legacy_enable" = "1"
-      # Enable UDMA/33 for higher speed if your IDE device(s) support it.
-      register "ide0_drive0_udma33_enable" = "0"
-      register "ide0_drive1_udma33_enable" = "0"
-      register "ide1_drive0_udma33_enable" = "0"
-      register "ide1_drive1_udma33_enable" = "0"
-    end
-  end
+	device cpu_cluster 0 on		# APIC cluster
+		chip cpu/intel/slot_1		# CPU
+			device lapic 0 on end		# APIC
+		end
+	end
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 1.0 on end		# PCI/AGP bridge
+		chip southbridge/intel/i82371eb	# Southbridge
+			device pci 4.0 on			# ISA bridge
+				chip superio/winbond/w83977tf	# Super I/O (FIXME: It's W83977EF!)
+					device pnp 3f0.0 on		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 3f0.1 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 3f0.2 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 3f0.3 on		# COM2 / IR
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 3f0.5 on		# PS/2 keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1		# PS/2 keyboard interrupt
+						irq 0x72 = 12		# PS/2 mouse interrupt
+					end
+					device pnp 3f0.6 on		# Consumer IR
+					end
+					device pnp 3f0.7 on		# GPIO 1
+					end
+					device pnp 3f0.8 on		# GPIO 2
+					end
+					device pnp 3f0.a on		# ACPI
+					end
+				end
+			end
+			device pci 4.1 on end		# IDE
+			device pci 4.2 on end		# USB
+			device pci 4.3 on end		# ACPI
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			register "ide_legacy_enable" = "1"
+			# Enable UDMA/33 for higher speed if your IDE device(s) support it.
+			register "ide0_drive0_udma33_enable" = "0"
+			register "ide0_drive1_udma33_enable" = "0"
+			register "ide1_drive0_udma33_enable" = "0"
+			register "ide1_drive1_udma33_enable" = "0"
+		end
+	end
 end
diff --git a/src/mainboard/asus/p2b-ls/devicetree.cb b/src/mainboard/asus/p2b-ls/devicetree.cb
index 9a785da..9fd4598 100644
--- a/src/mainboard/asus/p2b-ls/devicetree.cb
+++ b/src/mainboard/asus/p2b-ls/devicetree.cb
@@ -1,59 +1,59 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device cpu_cluster 0 on		# APIC cluster
-    chip cpu/intel/slot_1		# CPU
-      device lapic 0 on end		# APIC
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 1.0 on end		# PCI/AGP bridge
-    chip southbridge/intel/i82371eb	# Southbridge
-      device pci 4.0 on			# ISA bridge
-        chip superio/winbond/w83977tf	# Super I/O (FIXME: It's W83977EF!)
-          device pnp 3f0.0 on		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 3f0.1 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 3f0.2 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 3f0.3 on		# COM2 / IR
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 3f0.5 on		# PS/2 keyboard
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1		# PS/2 keyboard interrupt
-            irq 0x72 = 12		# PS/2 mouse interrupt
-          end
-          device pnp 3f0.7 on		# GPIO 1
-          end
-          device pnp 3f0.8 on		# GPIO 2
-          end
-          device pnp 3f0.a on		# ACPI
-          end
-        end
-      end
-      device pci 4.1 on	end		# IDE
-      device pci 4.2 on	end		# USB
-      device pci 4.3 on end		# ACPI
-      device pci 6.0 on end             # Onboard SCSI
-      device pci 7.0 on end             # Onboard LAN
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      register "ide_legacy_enable" = "1"
-      # Enable UDMA/33 for higher speed if your IDE device(s) support it.
-      register "ide0_drive0_udma33_enable" = "0"
-      register "ide0_drive1_udma33_enable" = "0"
-      register "ide1_drive0_udma33_enable" = "0"
-      register "ide1_drive1_udma33_enable" = "0"
-    end
-  end
+	device cpu_cluster 0 on		# APIC cluster
+		chip cpu/intel/slot_1		# CPU
+			device lapic 0 on end		# APIC
+		end
+	end
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 1.0 on end		# PCI/AGP bridge
+		chip southbridge/intel/i82371eb	# Southbridge
+			device pci 4.0 on			# ISA bridge
+				chip superio/winbond/w83977tf	# Super I/O (FIXME: It's W83977EF!)
+					device pnp 3f0.0 on		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 3f0.1 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 3f0.2 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 3f0.3 on		# COM2 / IR
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 3f0.5 on		# PS/2 keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1		# PS/2 keyboard interrupt
+						irq 0x72 = 12		# PS/2 mouse interrupt
+					end
+					device pnp 3f0.7 on		# GPIO 1
+					end
+					device pnp 3f0.8 on		# GPIO 2
+					end
+					device pnp 3f0.a on		# ACPI
+					end
+				end
+			end
+			device pci 4.1 on end		# IDE
+			device pci 4.2 on end		# USB
+			device pci 4.3 on end		# ACPI
+			device pci 6.0 on end				 # Onboard SCSI
+			device pci 7.0 on end				 # Onboard LAN
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			register "ide_legacy_enable" = "1"
+			# Enable UDMA/33 for higher speed if your IDE device(s) support it.
+			register "ide0_drive0_udma33_enable" = "0"
+			register "ide0_drive1_udma33_enable" = "0"
+			register "ide1_drive0_udma33_enable" = "0"
+			register "ide1_drive1_udma33_enable" = "0"
+		end
+	end
 end
diff --git a/src/mainboard/asus/p2b/devicetree.cb b/src/mainboard/asus/p2b/devicetree.cb
index 84f0c29..92307d7 100644
--- a/src/mainboard/asus/p2b/devicetree.cb
+++ b/src/mainboard/asus/p2b/devicetree.cb
@@ -1,62 +1,62 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device cpu_cluster 0 on		# APIC cluster
-    chip cpu/intel/slot_1		# CPU
-      device lapic 0 on end		# APIC
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 1.0 on end		# PCI/AGP bridge
-    chip southbridge/intel/i82371eb	# Southbridge
-      device pci 4.0 on			# ISA bridge
-        chip superio/winbond/w83977tf	# Super I/O
-          device pnp 3f0.0 on		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 3f0.1 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 3f0.2 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 3f0.3 on		# COM2 / IR
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 3f0.5 on		# PS/2 keyboard / mouse
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1		# PS/2 keyboard interrupt
-            irq 0x72 = 12		# PS/2 mouse interrupt
-          end
-          device pnp 3f0.7 on		# GPIO 1
-          end
-          device pnp 3f0.8 on		# GPIO 2
-          end
-          device pnp 3f0.9 on		# GPIO 3
-          end
-          device pnp 3f0.a on		# ACPI
-          end
-        end
-      end
-      device pci 4.1 on	end		# IDE
-      device pci 4.2 on	end		# USB
-      device pci 4.3 on end		# ACPI
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      register "ide_legacy_enable" = "1"
-      # Enable UDMA/33 for higher speed if your IDE device(s) support it.
-      register "ide0_drive0_udma33_enable" = "0"
-      register "ide0_drive1_udma33_enable" = "0"
-      register "ide1_drive0_udma33_enable" = "0"
-      register "ide1_drive1_udma33_enable" = "0"
-      register "thrm_polarity" = "1"
-      register "lid_polarity" = "1"
-      register "gpo" = "0x7fffbbff"
-    end
-  end
+	device cpu_cluster 0 on		# APIC cluster
+		chip cpu/intel/slot_1		# CPU
+			device lapic 0 on end		# APIC
+		end
+	end
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 1.0 on end		# PCI/AGP bridge
+		chip southbridge/intel/i82371eb	# Southbridge
+			device pci 4.0 on			# ISA bridge
+				chip superio/winbond/w83977tf	# Super I/O
+					device pnp 3f0.0 on		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 3f0.1 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 3f0.2 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 3f0.3 on		# COM2 / IR
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 3f0.5 on		# PS/2 keyboard / mouse
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1		# PS/2 keyboard interrupt
+						irq 0x72 = 12		# PS/2 mouse interrupt
+					end
+					device pnp 3f0.7 on		# GPIO 1
+					end
+					device pnp 3f0.8 on		# GPIO 2
+					end
+					device pnp 3f0.9 on		# GPIO 3
+					end
+					device pnp 3f0.a on		# ACPI
+					end
+				end
+			end
+			device pci 4.1 on end		# IDE
+			device pci 4.2 on end		# USB
+			device pci 4.3 on end		# ACPI
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			register "ide_legacy_enable" = "1"
+			# Enable UDMA/33 for higher speed if your IDE device(s) support it.
+			register "ide0_drive0_udma33_enable" = "0"
+			register "ide0_drive1_udma33_enable" = "0"
+			register "ide1_drive0_udma33_enable" = "0"
+			register "ide1_drive1_udma33_enable" = "0"
+			register "thrm_polarity" = "1"
+			register "lid_polarity" = "1"
+			register "gpo" = "0x7fffbbff"
+		end
+	end
 end
diff --git a/src/mainboard/asus/p3b-f/devicetree.cb b/src/mainboard/asus/p3b-f/devicetree.cb
index 5bee5ae..c9ec31d 100644
--- a/src/mainboard/asus/p3b-f/devicetree.cb
+++ b/src/mainboard/asus/p3b-f/devicetree.cb
@@ -1,59 +1,59 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device cpu_cluster 0 on		# APIC cluster
-    chip cpu/intel/slot_1		# CPU
-      device lapic 0 on end		# APIC
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 1.0 on end		# PCI/AGP bridge
-    chip southbridge/intel/i82371eb	# Southbridge
-      device pci 4.0 on			# ISA bridge
-        chip superio/winbond/w83977tf	# Super I/O (FIXME: It's W83977EF!)
-          device pnp 3f0.0 on		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 3f0.1 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 3f0.2 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 3f0.3 on		# COM2 / IR
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 3f0.5 on		# PS/2 keyboard
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1		# PS/2 keyboard interrupt
-            irq 0x72 = 12		# PS/2 mouse interrupt
-          end
-          device pnp 3f0.6 on		# Consumer IR
-          end
-          device pnp 3f0.7 on		# GPIO 1
-          end
-          device pnp 3f0.8 on		# GPIO 2
-          end
-          device pnp 3f0.a on		# ACPI
-          end
-        end
-      end
-      device pci 4.1 on	end		# IDE
-      device pci 4.2 on	end		# USB
-      device pci 4.3 on end		# ACPI
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      register "ide_legacy_enable" = "1"
-      # Enable UDMA/33 for higher speed if your IDE device(s) support it.
-      register "ide0_drive0_udma33_enable" = "0"
-      register "ide0_drive1_udma33_enable" = "0"
-      register "ide1_drive0_udma33_enable" = "0"
-      register "ide1_drive1_udma33_enable" = "0"
-    end
-  end
+	device cpu_cluster 0 on		# APIC cluster
+		chip cpu/intel/slot_1		# CPU
+			device lapic 0 on end		# APIC
+		end
+	end
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 1.0 on end		# PCI/AGP bridge
+		chip southbridge/intel/i82371eb	# Southbridge
+			device pci 4.0 on			# ISA bridge
+				chip superio/winbond/w83977tf	# Super I/O (FIXME: It's W83977EF!)
+					device pnp 3f0.0 on		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 3f0.1 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 3f0.2 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 3f0.3 on		# COM2 / IR
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 3f0.5 on		# PS/2 keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1		# PS/2 keyboard interrupt
+						irq 0x72 = 12		# PS/2 mouse interrupt
+					end
+					device pnp 3f0.6 on		# Consumer IR
+					end
+					device pnp 3f0.7 on		# GPIO 1
+					end
+					device pnp 3f0.8 on		# GPIO 2
+					end
+					device pnp 3f0.a on		# ACPI
+					end
+				end
+			end
+			device pci 4.1 on end		# IDE
+			device pci 4.2 on end		# USB
+			device pci 4.3 on end		# ACPI
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			register "ide_legacy_enable" = "1"
+			# Enable UDMA/33 for higher speed if your IDE device(s) support it.
+			register "ide0_drive0_udma33_enable" = "0"
+			register "ide0_drive1_udma33_enable" = "0"
+			register "ide1_drive0_udma33_enable" = "0"
+			register "ide1_drive1_udma33_enable" = "0"
+		end
+	end
 end
diff --git a/src/mainboard/avalue/eax-785e/devicetree.cb b/src/mainboard/avalue/eax-785e/devicetree.cb
index 42ddf01..20a0bca 100644
--- a/src/mainboard/avalue/eax-785e/devicetree.cb
+++ b/src/mainboard/avalue/eax-785e/devicetree.cb
@@ -1,26 +1,26 @@
 # sample config for avalue/EAX-785E
 chip northbridge/amd/amdfam10/root_complex
 	device cpu_cluster 0 on
-		chip cpu/amd/socket_AM3  #L1 and DDR3
+		chip cpu/amd/socket_AM3	#L1 and DDR3
 			 device lapic 0 on end
 		end
 	end
 	device domain 0 on
 		subsystemid 0x1612 0x3060 inherit #TODO: Set the correctly subsystem id.
 		chip northbridge/amd/amdfam10
-			device pci 18.0 on #  northbridge
+			device pci 18.0 on	# northbridge
 				chip southbridge/amd/rs780
-					device pci 0.0 on end # HT 0x9600
-					device pci 1.0 on end # Internal Graphics P2P bridge 0x9712
-					device pci 2.0 on end # GFX_RX0-7/TX0-7   PCIEx16_1 slot
-					device pci 3.0 on end # GFX_RX8-15/TX8-15 PCIEx16_2 slot
-					device pci 4.0 on end # PortB GPP_RX/TX0 PCIEx1_1 slot
-					device pci 5.0 on end # PortC GPP_RX/TX1 PCIEx1_2 slot
-					device pci 6.0 on end # PortD GPP_RX/TX2 PCIEx1_3 slot
-					device pci 7.0 on end # PortE GPP_RX/TX3 PCIEx1_4 slot
-					device pci 8.0 off end # NB/SB Link P2P bridge
-					device pci 9.0 on end # Ethernet
-					device pci a.0 on end # Ethernet
+					device pci 0.0 on end	# HT 0x9600
+					device pci 1.0 on end	# Internal Graphics P2P bridge 0x9712
+					device pci 2.0 on end	# GFX_RX0-7/TX0-7 PCIEx16_1 slot
+					device pci 3.0 on end	# GFX_RX8-15/TX8-15 PCIEx16_2 slot
+					device pci 4.0 on end	# PortB GPP_RX/TX0 PCIEx1_1 slot
+					device pci 5.0 on end	# PortC GPP_RX/TX1 PCIEx1_2 slot
+					device pci 6.0 on end	# PortD GPP_RX/TX2 PCIEx1_3 slot
+					device pci 7.0 on end	# PortE GPP_RX/TX3 PCIEx1_4 slot
+					device pci 8.0 off end	# NB/SB Link P2P bridge
+					device pci 9.0 on end	# Ethernet
+					device pci a.0 on end	# Ethernet
 					register "gppsb_configuration" = "4"	# Configuration E
 					register "gpp_configuration" = "3"	# Configuration D
 					register "port_enable" = "0x6FE"
@@ -32,75 +32,75 @@ chip northbridge/amd/amdfam10/root_complex
 					register "gfx_link_width" = "0"
 					register "gfx_tmds" = "1"
 					register "gfx_pcie_config" = "4" # 2x8 GFX, one on Lanes 0-7, one on Lanes 8-15
-					register "gfx_ddi_config" = "0"  # no DDI_SL
+					register "gfx_ddi_config" = "0"	# no DDI_SL
 				end
 				chip southbridge/amd/cimx/sb800 # 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 end # SM
-					device pci 14.1 on end # IDE    0x439c
-					device pci 14.2 on end # HDA    0x4383
+					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.1 on end	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
 					device pci 14.3 on
-                                                chip superio/winbond/w83627hf
-                                                        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  # SFI
-                                                                io 0x62 = 0x100
-                                                        end
-                                                        device pnp 2e.7 off #  GPIO_GAME_MIDI
-                                                                io 0x60 = 0x220
-                                                                io 0x62 = 0x300
-                                                                irq 0x70 = 9
-                                                        end
-                                                        device pnp 2e.8 off end #  WDTO_PLED
-                                                        device pnp 2e.9 off end #  GPIO_SUSLED
-                                                        device pnp 2e.a off end #  ACPI
-                                                        device pnp 2e.b on #  HW Monitor
-                                                                io 0x60 = 0x290
-                                                                irq 0x70 = 5
-                                                        end
-                                                end     #superio/winbond/w83627hf
+						chip superio/winbond/w83627hf
+							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	# SFI
+								io 0x62 = 0x100
+							end
+							device pnp 2e.7 off	# GPIO_GAME_MIDI
+								io 0x60 = 0x220
+								io 0x62 = 0x300
+								irq 0x70 = 9
+							end
+							device pnp 2e.8 off end	# WDTO_PLED
+							device pnp 2e.9 off end	# GPIO_SUSLED
+							device pnp 2e.a off end	# ACPI
+							device pnp 2e.b on	# HW Monitor
+								io 0x60 = 0x290
+								irq 0x70 = 5
+							end
+						end	#superio/winbond/w83627hf
 					end # LPC	0x439d
-					device pci 14.4 on end # PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0}
-					device pci 14.5 on end # USB 2
-					device pci 14.6 off end # Gec
-					device pci 15.0 off end # PCIe 0
-					device pci 15.1 off end # PCIe 1
-					device pci 15.2 off end # PCIe 2
-					device pci 15.3 on end # PCIe 3
-					device pci 16.0 on end # USB
-					device pci 16.2 on end # USB
+					device pci 14.4 on end	# PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0}
+					device pci 14.5 on end	# USB 2
+					device pci 14.6 off end	# Gec
+					device pci 15.0 off end	# PCIe 0
+					device pci 15.1 off end	# PCIe 1
+					device pci 15.2 off end	# PCIe 2
+					device pci 15.3 on end	# PCIe 3
+					device pci 16.0 on end	# USB
+					device pci 16.2 on end	# USB
 					#register "gpp_configuration" = "0" #4:0:0:0
 					#register "gpp_configuration" = "2" #2:2:0:0
 					#register "gpp_configuration" = "3" #2:1:1:0
 					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
 
 			device pci 18.1 on end
 			device pci 18.2 on end
diff --git a/src/mainboard/axus/tc320/devicetree.cb b/src/mainboard/axus/tc320/devicetree.cb
index 970f71f..1b6fa69 100644
--- a/src/mainboard/axus/tc320/devicetree.cb
+++ b/src/mainboard/axus/tc320/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 12.0 on		# ISA bridge
-        chip superio/nsc/pc97317	# Super I/O
-          device pnp 2e.0 on		# PS/2 keyboard
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1
-          end
-          device pnp 2e.1 on		# PS/2 mouse
-            irq 0x70 = 12
-          end
-          device pnp 2e.2 on		# RTC, advanced power control (APC)
-            io 0x60 = 0x70
-            irq 0x70 = 8
-          end
-          device pnp 2e.3 off		# Floppy (N/A on this board)
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 2e.4 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 2e.5 off		# 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
-      end
-      device pci 12.1 off end		# SMI
-      device pci 12.2 off 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		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		chip southbridge/amd/cs5530		# Southbridge
+			device pci 12.0 on		# ISA bridge
+				chip superio/nsc/pc97317	# Super I/O
+					device pnp 2e.0 on		# PS/2 keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1
+					end
+					device pnp 2e.1 on		# PS/2 mouse
+						irq 0x70 = 12
+					end
+					device pnp 2e.2 on		# RTC, advanced power control (APC)
+						io 0x60 = 0x70
+						irq 0x70 = 8
+					end
+					device pnp 2e.3 off		# Floppy (N/A on this board)
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 2e.4 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 2e.5 off		# 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
+			end
+			device pci 12.1 off end		# SMI
+			device pci 12.2 off 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/azza/pt-6ibd/devicetree.cb b/src/mainboard/azza/pt-6ibd/devicetree.cb
index a2f5513..b28f7b3 100644
--- a/src/mainboard/azza/pt-6ibd/devicetree.cb
+++ b/src/mainboard/azza/pt-6ibd/devicetree.cb
@@ -1,59 +1,59 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device cpu_cluster 0 on		# APIC cluster
-    chip cpu/intel/slot_1		# CPU
-      device lapic 0 on end		# APIC
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 1.0 on end		# PCI/AGP bridge
-    chip southbridge/intel/i82371eb	# Southbridge
-      device pci 7.0 on			# ISA bridge
-        chip superio/winbond/w83977tf	# Super I/O (FIXME: It's W83977EF!)
-          device pnp 3f0.0 on		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 3f0.1 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 3f0.2 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 3f0.3 on		# COM2 / IR
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 3f0.5 on		# PS/2 keyboard / mouse
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1		# PS/2 keyboard interrupt
-            irq 0x72 = 12		# PS/2 mouse interrupt
-          end
-          device pnp 3f0.6 on		# Consumer IR
-          end
-          device pnp 3f0.7 on		# GPIO 1
-          end
-          device pnp 3f0.8 on		# GPIO 2
-          end
-          device pnp 3f0.a on		# ACPI
-          end
-        end
-      end
-      device pci 7.1 on	end		# IDE
-      device pci 7.2 on	end		# USB
-      device pci 7.3 on end		# ACPI
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      register "ide_legacy_enable" = "1"
-      # Enable UDMA/33 for higher speed if your IDE device(s) support it.
-      register "ide0_drive0_udma33_enable" = "0"
-      register "ide0_drive1_udma33_enable" = "0"
-      register "ide1_drive0_udma33_enable" = "0"
-      register "ide1_drive1_udma33_enable" = "0"
-    end
-  end
+	device cpu_cluster 0 on		# APIC cluster
+		chip cpu/intel/slot_1		# CPU
+			device lapic 0 on end		# APIC
+		end
+	end
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 1.0 on end		# PCI/AGP bridge
+		chip southbridge/intel/i82371eb	# Southbridge
+			device pci 7.0 on			# ISA bridge
+				chip superio/winbond/w83977tf	# Super I/O (FIXME: It's W83977EF!)
+					device pnp 3f0.0 on		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 3f0.1 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 3f0.2 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 3f0.3 on		# COM2 / IR
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 3f0.5 on		# PS/2 keyboard / mouse
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1		# PS/2 keyboard interrupt
+						irq 0x72 = 12		# PS/2 mouse interrupt
+					end
+					device pnp 3f0.6 on		# Consumer IR
+					end
+					device pnp 3f0.7 on		# GPIO 1
+					end
+					device pnp 3f0.8 on		# GPIO 2
+					end
+					device pnp 3f0.a on		# ACPI
+					end
+				end
+			end
+			device pci 7.1 on end		# IDE
+			device pci 7.2 on end		# USB
+			device pci 7.3 on end		# ACPI
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			register "ide_legacy_enable" = "1"
+			# Enable UDMA/33 for higher speed if your IDE device(s) support it.
+			register "ide0_drive0_udma33_enable" = "0"
+			register "ide0_drive1_udma33_enable" = "0"
+			register "ide1_drive0_udma33_enable" = "0"
+			register "ide1_drive1_udma33_enable" = "0"
+		end
+	end
 end
diff --git a/src/mainboard/bachmann/ot200/devicetree.cb b/src/mainboard/bachmann/ot200/devicetree.cb
index 1e61b3d..5d88c07 100644
--- a/src/mainboard/bachmann/ot200/devicetree.cb
+++ b/src/mainboard/bachmann/ot200/devicetree.cb
@@ -2,7 +2,7 @@ chip northbridge/amd/lx
 	device domain 0 on
 		device pci 1.0 on end	# Northbridge
 		device pci 1.1 on end	# Graphics
-		device pci 1.2 on end   # AES
+		device pci 1.2 on end	# AES
 		chip southbridge/amd/cs5536
 			register "lpc_serirq_enable" = "0x00000000"
 			register "lpc_serirq_polarity" = "0x00000000"
@@ -20,7 +20,7 @@ chip northbridge/amd/lx
 			register "unwanted_vpci[0]" = "0"	# End of list has a zero
 			device pci 4.0 on end	# Ethernet 0
 			device pci f.0 on	# ISA Bridge
-				chip drivers/generic/generic        # eeprom
+				chip drivers/generic/generic	# eeprom
 					device i2c 52 on end
 				end
 			end
diff --git a/src/mainboard/bcom/winnet100/devicetree.cb b/src/mainboard/bcom/winnet100/devicetree.cb
index 61a71e6..d4dd046 100644
--- a/src/mainboard/bcom/winnet100/devicetree.cb
+++ b/src/mainboard/bcom/winnet100/devicetree.cb
@@ -1,56 +1,56 @@
 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 (onboard)
-      device pci 12.0 on		# ISA bridge
-        chip superio/nsc/pc97317	# Super I/O
-          device pnp 2e.0 on		# PS/2 keyboard
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1
-          end
-          device pnp 2e.1 on		# PS/2 mouse
-            irq 0x70 = 12
-          end
-          device pnp 2e.2 on		# RTC, Advanced power control (APC)
-            io 0x60 = 0x70
-            irq 0x70 = 8
-          end
-          device pnp 2e.3 off		# Floppy (N/A on this board)
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 2e.4 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 2e.5 on		# COM2 (used for smartcard reader)
-            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 = 0xe8
-          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" = "0"	# Not available/needed 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 (onboard)
+			device pci 12.0 on		# ISA bridge
+				chip superio/nsc/pc97317	# Super I/O
+					device pnp 2e.0 on		# PS/2 keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1
+					end
+					device pnp 2e.1 on		# PS/2 mouse
+						irq 0x70 = 12
+					end
+					device pnp 2e.2 on		# RTC, Advanced power control (APC)
+						io 0x60 = 0x70
+						irq 0x70 = 8
+					end
+					device pnp 2e.3 off		# Floppy (N/A on this board)
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 2e.4 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 2e.5 on		# COM2 (used for smartcard reader)
+						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 = 0xe8
+					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" = "0"	# Not available/needed on this board
+		end
+	end
+	chip cpu/amd/geode_gx1		# CPU
+	end
 end
diff --git a/src/mainboard/bcom/winnetp680/devicetree.cb b/src/mainboard/bcom/winnetp680/devicetree.cb
index f0a086b..1e81da6 100644
--- a/src/mainboard/bcom/winnetp680/devicetree.cb
+++ b/src/mainboard/bcom/winnetp680/devicetree.cb
@@ -1,64 +1,64 @@
 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"
-      register "fn_ctrl_lo" = "0x80"
-      register "fn_ctrl_hi" = "0x1d"
-      device pci f.0 on end			# IDE
-      device pci 10.0 on end			# UHCI
-      device pci 10.1 on end			# UHCI
-      device pci 10.2 on end			# UHCI
-      device pci 10.3 on end			# UHCI
-      device pci 10.4 on end			# EHCI
-      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 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.6 off end		# Consumer IR
-          device pnp 2e.7 off end		# Game port, GPIO 1
-          device pnp 2e.8 off end		# MIDI port, GPIO 5
-          device pnp 2e.9 off end		# GPIO 2-4
-          device pnp 2e.a off end		# ACPI
-          device pnp 2e.b on			# HWM
-            io 0x60 = 0x290
-          end
-        end
-      end
-      device pci 11.5 on end			# AC'97 audio
-      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"
+			register "fn_ctrl_lo" = "0x80"
+			register "fn_ctrl_hi" = "0x1d"
+			device pci f.0 on end			# IDE
+			device pci 10.0 on end			# UHCI
+			device pci 10.1 on end			# UHCI
+			device pci 10.2 on end			# UHCI
+			device pci 10.3 on end			# UHCI
+			device pci 10.4 on end			# EHCI
+			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 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.6 off end		# Consumer IR
+					device pnp 2e.7 off end		# Game port, GPIO 1
+					device pnp 2e.8 off end		# MIDI port, GPIO 5
+					device pnp 2e.9 off end		# GPIO 2-4
+					device pnp 2e.a off end		# ACPI
+					device pnp 2e.b on		# HWM
+						io 0x60 = 0x290
+					end
+				end
+			end
+			device pci 11.5 on end			# AC'97 audio
+			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/biostar/m6tba/devicetree.cb b/src/mainboard/biostar/m6tba/devicetree.cb
index 0d35e9c..91ade3f 100644
--- a/src/mainboard/biostar/m6tba/devicetree.cb
+++ b/src/mainboard/biostar/m6tba/devicetree.cb
@@ -1,53 +1,53 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device cpu_cluster 0 on		# APIC cluster
-    chip cpu/intel/slot_1		# CPU
-      device lapic 0 on end		# APIC
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 1.0 on end		# PCI/AGP bridge
-    chip southbridge/intel/i82371eb	# Southbridge
-      device pci 7.0 on			# ISA bridge
-        chip superio/smsc/smscsuperio	# Super I/O
-          device pnp 3f0.0 on		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 3f0.3 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 3f0.4 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 3f0.5 on		# COM2 / IR
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 3f0.7 on		# PS/2 keyboard / mouse
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1		# PS/2 keyboard interrupt
-            irq 0x72 = 12		# PS/2 mouse interrupt
-          end
-          device pnp 3f0.8 on		# Aux I/O
-          end
-        end
-      end
-      device pci 7.1 on	end		# IDE
-      device pci 7.2 on	end		# USB
-      device pci 7.3 on end		# ACPI
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      register "ide_legacy_enable" = "1"
-      # Enable UDMA/33 for higher speed if your IDE device(s) support it.
-      register "ide0_drive0_udma33_enable" = "0"
-      register "ide0_drive1_udma33_enable" = "0"
-      register "ide1_drive0_udma33_enable" = "0"
-      register "ide1_drive1_udma33_enable" = "0"
-    end
-  end
+	device cpu_cluster 0 on		# APIC cluster
+		chip cpu/intel/slot_1		# CPU
+			device lapic 0 on end		# APIC
+		end
+	end
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 1.0 on end		# PCI/AGP bridge
+		chip southbridge/intel/i82371eb	# Southbridge
+			device pci 7.0 on			# ISA bridge
+				chip superio/smsc/smscsuperio	# Super I/O
+					device pnp 3f0.0 on		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 3f0.3 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 3f0.4 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 3f0.5 on		# COM2 / IR
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 3f0.7 on		# PS/2 keyboard / mouse
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1		# PS/2 keyboard interrupt
+						irq 0x72 = 12		# PS/2 mouse interrupt
+					end
+					device pnp 3f0.8 on		# Aux I/O
+					end
+				end
+			end
+			device pci 7.1 on end		# IDE
+			device pci 7.2 on end		# USB
+			device pci 7.3 on end		# ACPI
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			register "ide_legacy_enable" = "1"
+			# Enable UDMA/33 for higher speed if your IDE device(s) support it.
+			register "ide0_drive0_udma33_enable" = "0"
+			register "ide0_drive1_udma33_enable" = "0"
+			register "ide1_drive0_udma33_enable" = "0"
+			register "ide1_drive1_udma33_enable" = "0"
+		end
+	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/compaq/deskpro_en_sff_p600/devicetree.cb b/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb
index def9e2f..3947a1a 100644
--- a/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb
@@ -1,63 +1,63 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device cpu_cluster 0 on		# APIC cluster
-    chip cpu/intel/slot_1		# CPU
-      device lapic 0 on end		# APIC
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 1.0 on end		# PCI/AGP bridge
-    device pci a.0 on end		# NIC (onboard)
-    chip southbridge/intel/i82371eb	# Southbridge
-      device pci 14.0 on		# ISA bridge
-        # chip superio/nsc/pc97307	# Super I/O
-        chip superio/nsc/pc97317	# Super I/O (FIXME: Should be PC97307!)
-          device pnp 15c.0 on		# PS/2 keyboard
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1
-          end
-          device pnp 15c.1 on		# PS/2 mouse
-            irq 0x70 = 12
-          end
-          device pnp 15c.2 on		# RTC, APC
-            io 0x60 = 0x70
-            irq 0x70 = 8
-          end
-          device pnp 15c.3 on		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 15c.4 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 15c.5 on		# COM2 / IR
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 15c.6 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 15c.7 on		# GPIO 1
-          end
-          device pnp 15c.8 on		# Power management
-          end
-        end
-      end
-      device pci 14.1 on end		# IDE
-      device pci 14.2 on end		# USB
-      device pci 14.3 on end		# ACPI
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      register "ide_legacy_enable" = "1"
-      # Enable UDMA/33 for higher speed if your IDE device(s) support it.
-      register "ide0_drive0_udma33_enable" = "0"
-      register "ide0_drive1_udma33_enable" = "0"
-      register "ide1_drive0_udma33_enable" = "0"
-      register "ide1_drive1_udma33_enable" = "0"
-    end
-  end
+	device cpu_cluster 0 on		# APIC cluster
+		chip cpu/intel/slot_1		# CPU
+			device lapic 0 on end		# APIC
+		end
+	end
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 1.0 on end		# PCI/AGP bridge
+		device pci a.0 on end		# NIC (onboard)
+		chip southbridge/intel/i82371eb	# Southbridge
+			device pci 14.0 on		# ISA bridge
+				# chip superio/nsc/pc97307	# Super I/O
+				chip superio/nsc/pc97317	# Super I/O (FIXME: Should be PC97307!)
+					device pnp 15c.0 on		# PS/2 keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1
+					end
+					device pnp 15c.1 on		# PS/2 mouse
+						irq 0x70 = 12
+					end
+					device pnp 15c.2 on		# RTC, APC
+						io 0x60 = 0x70
+						irq 0x70 = 8
+					end
+					device pnp 15c.3 on		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 15c.4 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 15c.5 on		# COM2 / IR
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 15c.6 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 15c.7 on		# GPIO 1
+					end
+					device pnp 15c.8 on		# Power management
+					end
+				end
+			end
+			device pci 14.1 on end		# IDE
+			device pci 14.2 on end		# USB
+			device pci 14.3 on end		# ACPI
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			register "ide_legacy_enable" = "1"
+			# Enable UDMA/33 for higher speed if your IDE device(s) support it.
+			register "ide0_drive0_udma33_enable" = "0"
+			register "ide0_drive1_udma33_enable" = "0"
+			register "ide1_drive0_udma33_enable" = "0"
+			register "ide1_drive1_udma33_enable" = "0"
+		end
+	end
 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/ecs/p6iwp-fe/devicetree.cb b/src/mainboard/ecs/p6iwp-fe/devicetree.cb
index 405b547..617fbe1 100644
--- a/src/mainboard/ecs/p6iwp-fe/devicetree.cb
+++ b/src/mainboard/ecs/p6iwp-fe/devicetree.cb
@@ -19,68 +19,68 @@
 ##
 
 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		# Chipset Graphics Controller (CGC)
-    chip southbridge/intel/i82801ax	# Southbridge
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
+	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		# Chipset Graphics Controller (CGC)
+		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 bridge
-        chip superio/ite/it8712f	# Super I/O
-          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 on		# Com2
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 2e.3 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 2e.4 on		# EC
-            io 0x60 = 0x290
-            io 0x62 = 0x230
-            irq 0x70 = 9
-          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 0x62 = 0x1220
-            io 0x64 = 0x1200
-          end
-          device pnp 2e.8 off		# MIDI
-            io 0x60 = 0x300
-            irq 0x70 = 9
-          end
-          device pnp 2e.9 off		# Game port
-            io 0x60 = 0x220
-          end
-          device pnp 2e.a off end	# CIR
-        end
-      end
-      device pci 1f.1 on end		# IDE
-      device pci 1f.2 on end		# USB
-      device pci 1f.3 on end		# SMBus
-    end
-  end
+			device pci 1e.0 on end		# PCI bridge
+			device pci 1f.0 on		# ISA bridge
+				chip superio/ite/it8712f	# Super I/O
+					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 on		# Com2
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 2e.3 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 2e.4 on		# EC
+						io 0x60 = 0x290
+						io 0x62 = 0x230
+						irq 0x70 = 9
+					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 0x62 = 0x1220
+						io 0x64 = 0x1200
+					end
+					device pnp 2e.8 off		# MIDI
+						io 0x60 = 0x300
+						irq 0x70 = 9
+					end
+					device pnp 2e.9 off		# Game port
+						io 0x60 = 0x220
+					end
+					device pnp 2e.a off end	# CIR
+				end
+			end
+			device pci 1f.1 on end		# IDE
+			device pci 1f.2 on end		# USB
+			device pci 1f.3 on end		# SMBus
+		end
+	end
 end
diff --git a/src/mainboard/getac/p470/devicetree.cb b/src/mainboard/getac/p470/devicetree.cb
index 6256ca1..e32cc8a 100644
--- a/src/mainboard/getac/p470/devicetree.cb
+++ b/src/mainboard/getac/p470/devicetree.cb
@@ -21,20 +21,20 @@
 
 chip northbridge/intel/i945
 
-        device cpu_cluster 0 on
-                chip cpu/intel/socket_mFCPGA478
-                        device lapic 0 on end
-                end
-        end
+	device cpu_cluster 0 on
+		chip cpu/intel/socket_mFCPGA478
+			device lapic 0 on end
+		end
+	end
 
-        device domain 0 on
-                device pci 00.0 on end # host bridge
+	device domain 0 on
+		device pci 00.0 on end # host bridge
 		# autodetect:
 		#device pci 01.0 off end # i945 PCIe root port
 		#device pci 02.0 on end # vga controller
 		#device pci 02.1 on end # display controller
 
-                chip southbridge/intel/i82801gx
+		chip southbridge/intel/i82801gx
 			register "pirqa_routing" = "0x0a"
 			register "pirqb_routing" = "0x0a"
 			register "pirqc_routing" = "0x0a"
@@ -45,57 +45,57 @@ chip northbridge/intel/i945
 			register "pirqh_routing" = "0x0a"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
 			register "gpi8_routing" = "1" # EXTSMI low active
-			register "gpi7_routing" = "2" # ECSCI  low active
+			register "gpi7_routing" = "2" # ECSCI low active
 
 			# GPE0 Enables
 			register "gpe0_en" = "0x00800106"
 			register "alt_gp_smi_en" = "0x0100"
 
-                        register "ide_legacy_combined" = "0x1"
-                        register "ide_enable_primary" = "0x1"
-                        register "ide_enable_secondary" = "0x0"
-                        register "sata_ahci" = "0x0"
+			register "ide_legacy_combined" = "0x1"
+			register "ide_enable_primary" = "0x1"
+			register "ide_enable_secondary" = "0x0"
+			register "sata_ahci" = "0x0"
 
-                	device pci 1b.0 on end # High Definition Audio
-                	device pci 1c.0 on end # PCIe port 1
-                	device pci 1c.1 on end # PCIe port 2
-                	device pci 1c.2 on end # PCIe port 3
+			device pci 1b.0 on end # High Definition Audio
+			device pci 1c.0 on end # PCIe port 1
+			device pci 1c.1 on end # PCIe port 2
+			device pci 1c.2 on end # PCIe port 3
 			device pci 1c.3 on end # PCIe port 4
 			#device pci 1c.4 off end # PCIe port 5
 			#device pci 1c.5 off end # PCIe port 6
-                	device pci 1d.0 on end # USB UHCI
-                	device pci 1d.1 on end # USB UHCI
-                	device pci 1d.2 on end # USB UHCI
-                	device pci 1d.3 on end # USB UHCI
-                	device pci 1d.7 on end # USB2 EHCI
-                	device pci 1e.0 on
+			device pci 1d.0 on end # USB UHCI
+			device pci 1d.1 on end # USB UHCI
+			device pci 1d.2 on end # USB UHCI
+			device pci 1d.3 on end # USB UHCI
+			device pci 1d.7 on end # USB2 EHCI
+			device pci 1e.0 on
 				chip southbridge/ti/pcixx12
 
 				end
 			end # PCI bridge
 			#device pci 1e.2 off end # AC'97 Audio
 			#device pci 1e.3 off end # AC'97 Modem
-                        device pci 1f.0 on # LPC bridge
-                                chip superio/smsc/fdc37n972
+			device pci 1f.0 on # LPC bridge
+				chip superio/smsc/fdc37n972
 					device pnp 2e.0 off		# Floppy
 					end
 					device pnp 2e.1 off		# ACPI PM
 					end
 					# 2e.2 does not exist
 					device pnp 2e.3 on		# Parallel port
-						 io 0x60 = 0x378
+						io 0x60 = 0x378
 						irq 0x70 = 5
 					end
 					device pnp 2e.4 on		# COM1
-                                                 io 0x60 = 0x3f8
-                                                irq 0x70 = 4
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 2e.5 off
 					end
-                                        device pnp 2e.5 off
-                                        end
 					#device pnp 2e.6 on		# RTC
 					#	 io 0x60 = 0x70
 					#	 io 0x62 = 0x74
@@ -107,19 +107,19 @@ chip northbridge/intel/i945
 					end
 					#device pnp 2e.9 on		# Mailbox
 					#end
-                                end
-                                chip superio/smsc/sio10n268
-                                        device pnp 4e.0 off		# Floppy
+				end
+				chip superio/smsc/sio10n268
+					device pnp 4e.0 off		# Floppy
 					end
 					device pnp 4e.1 off		# Parport
 					end
 					#device pnp 4e.2 on		# COM3
-					#         io 0x60 = 0x3e8
-					#        irq 0x70 = 11
+					#	io 0x60 = 0x3e8
+					#	irq 0x70 = 11
 					#end
 					#device pnp 4e.3 on		# COM4
-					#         io 0x60 = 0x2e8
-					#        irq 0x70 = 10
+					#	io 0x60 = 0x2e8
+					#	irq 0x70 = 10
 					#end
 					device pnp 4e.5 on		# Keyboard
 						io 0x60 = 0x60
@@ -137,12 +137,12 @@ chip northbridge/intel/i945
 					end
 					chip ec/acpi
 					end
-                                end
+				end
 
-                        end
-			device pci 1f.1 on end  # IDE
-                        device pci 1f.2 on end  # SATA
-                        device pci 1f.3 on end  # SMBus
-                end
-        end
+			end
+			device pci 1f.1 on end # IDE
+			device pci 1f.2 on end # SATA
+			device pci 1f.3 on end # SMBus
+		end
+	end
 end
diff --git a/src/mainboard/gigabyte/ga-6bxc/devicetree.cb b/src/mainboard/gigabyte/ga-6bxc/devicetree.cb
index 5b5c1ae..de00bf2 100644
--- a/src/mainboard/gigabyte/ga-6bxc/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-6bxc/devicetree.cb
@@ -1,57 +1,57 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device cpu_cluster 0 on		# APIC cluster
-    chip cpu/intel/slot_1		# CPU
-      device lapic 0 on end		# APIC
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 1.0 on end		# PCI/AGP bridge
-    chip southbridge/intel/i82371eb	# Southbridge
-      device pci 7.0 on			# ISA bridge
-        chip superio/ite/it8671f	# Super I/O
-          device pnp 3f0.0 on		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 3f0.1 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 3f0.2 on		# COM2 / IR
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 3f0.3 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 3f0.4 on		# APC
-          end
-          device pnp 3f0.5 on		# PS/2 keyboard
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1
-          end
-          device pnp 3f0.6 on		# PS/2 mouse
-            irq 0x70 = 12
-          end
-          device pnp 3f0.7 on		# GPIO
-          end
-        end
-      end
-      device pci 7.1 on	end		# IDE
-      device pci 7.2 on	end		# USB
-      device pci 7.3 on end		# ACPI
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      register "ide_legacy_enable" = "1"
-      # Enable UDMA/33 for higher speed if your IDE device(s) support it.
-      register "ide0_drive0_udma33_enable" = "0"
-      register "ide0_drive1_udma33_enable" = "0"
-      register "ide1_drive0_udma33_enable" = "0"
-      register "ide1_drive1_udma33_enable" = "0"
-    end
-  end
+	device cpu_cluster 0 on		# APIC cluster
+		chip cpu/intel/slot_1		# CPU
+			device lapic 0 on end		# APIC
+		end
+	end
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 1.0 on end		# PCI/AGP bridge
+		chip southbridge/intel/i82371eb	# Southbridge
+			device pci 7.0 on			# ISA bridge
+				chip superio/ite/it8671f	# Super I/O
+					device pnp 3f0.0 on		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 3f0.1 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 3f0.2 on		# COM2 / IR
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 3f0.3 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 3f0.4 on		# APC
+					end
+					device pnp 3f0.5 on		# PS/2 keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1
+					end
+					device pnp 3f0.6 on		# PS/2 mouse
+						irq 0x70 = 12
+					end
+					device pnp 3f0.7 on		# GPIO
+					end
+				end
+			end
+			device pci 7.1 on end		# IDE
+			device pci 7.2 on end		# USB
+			device pci 7.3 on end		# ACPI
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			register "ide_legacy_enable" = "1"
+			# Enable UDMA/33 for higher speed if your IDE device(s) support it.
+			register "ide0_drive0_udma33_enable" = "0"
+			register "ide0_drive1_udma33_enable" = "0"
+			register "ide1_drive0_udma33_enable" = "0"
+			register "ide1_drive1_udma33_enable" = "0"
+		end
+	end
 end
diff --git a/src/mainboard/gigabyte/ga-6bxe/devicetree.cb b/src/mainboard/gigabyte/ga-6bxe/devicetree.cb
index 85f4785..72d5e95 100644
--- a/src/mainboard/gigabyte/ga-6bxe/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-6bxe/devicetree.cb
@@ -1,57 +1,57 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device cpu_cluster 0 on		# APIC cluster
-    chip cpu/intel/slot_1		# CPU
-      device lapic 0 on end		# APIC
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 1.0 on end		# PCI/AGP bridge
-    chip southbridge/intel/i82371eb	# Southbridge
-      device pci 7.0 on			# ISA bridge
-        chip superio/ite/it8671f	# Super I/O
-          device pnp 3f0.0 on		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 3f0.1 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 3f0.2 on		# COM2 / IR
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 3f0.3 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 3f0.4 on		# APC
-          end
-          device pnp 3f0.5 on		# PS/2 keyboard
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1
-          end
-          device pnp 3f0.6 on		# PS/2 mouse
-            irq 0x70 = 12
-          end
-          device pnp 3f0.7 on		# GPIO
-          end
-        end
-      end
-      device pci 7.1 on end		# IDE
-      device pci 7.2 on end		# USB
-      device pci 7.3 on end		# ACPI
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      register "ide_legacy_enable" = "1"
-      # Enable UDMA/33 for higher speed if your IDE device(s) support it.
-      register "ide0_drive0_udma33_enable" = "1"
-      register "ide0_drive1_udma33_enable" = "1"
-      register "ide1_drive0_udma33_enable" = "1"
-      register "ide1_drive1_udma33_enable" = "1"
-    end
-  end
+	device cpu_cluster 0 on		# APIC cluster
+		chip cpu/intel/slot_1		# CPU
+			device lapic 0 on end		# APIC
+		end
+	end
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 1.0 on end		# PCI/AGP bridge
+		chip southbridge/intel/i82371eb	# Southbridge
+			device pci 7.0 on			# ISA bridge
+				chip superio/ite/it8671f	# Super I/O
+					device pnp 3f0.0 on		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 3f0.1 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 3f0.2 on		# COM2 / IR
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 3f0.3 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 3f0.4 on		# APC
+					end
+					device pnp 3f0.5 on		# PS/2 keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1
+					end
+					device pnp 3f0.6 on		# PS/2 mouse
+						irq 0x70 = 12
+					end
+					device pnp 3f0.7 on		# GPIO
+					end
+				end
+			end
+			device pci 7.1 on end		# IDE
+			device pci 7.2 on end		# USB
+			device pci 7.3 on end		# ACPI
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			register "ide_legacy_enable" = "1"
+			# Enable UDMA/33 for higher speed if your IDE device(s) support it.
+			register "ide0_drive0_udma33_enable" = "1"
+			register "ide0_drive1_udma33_enable" = "1"
+			register "ide1_drive0_udma33_enable" = "1"
+			register "ide1_drive1_udma33_enable" = "1"
+		end
+	end
 end
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb b/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb
index 33b8505..0d77b5e 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb
+++ b/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb
@@ -1,92 +1,90 @@
 chip northbridge/amd/amdk8/root_complex
-        device cpu_cluster 0 on
-                chip cpu/amd/socket_AM2
-                        device lapic 0 on end
-                end
-        end
+	device cpu_cluster 0 on
+		chip cpu/amd/socket_AM2
+			device lapic 0 on end
+		end
+	end
 	device domain 0 on
 		subsystemid 0x1039 0x1234 inherit
 		chip northbridge/amd/amdk8 #mc0
 			device pci 18.0 on
-				#  devices on link 0, link 0 == LDT 0
-			        chip southbridge/sis/sis966
-					device pci 0.0 on end   # Northbridge
+				# devices on link 0, link 0 == LDT 0
+				chip southbridge/sis/sis966
+					device pci 0.0 on end	# Northbridge
 					device pci 1.0 on		# AGP bridge
 						device pci 0.0 on end
 					end
-                			device pci 2.0 on # LPC
+					device pci 2.0 on	# LPC
 						chip superio/ite/it8716f
-							device pnp 2e.0 off #  Floppy (N/A)
-                	                 			io 0x60 = 0x3f0
-                	                			irq 0x70 = 6
-                	                			drq 0x74 = 2
+							device pnp 2e.0 off	# Floppy (N/A)
+								io 0x60 = 0x3f0
+								irq 0x70 = 6
+								drq 0x74 = 2
 							end
-                	        			device pnp 2e.1 on #  Com1
-                	                 			io 0x60 = 0x3f8
-                	                			irq 0x70 = 4
+							device pnp 2e.1 on	# Com1
+								io 0x60 = 0x3f8
+								irq 0x70 = 4
 							end
-                	        			device pnp 2e.2 off #  Com2 (N/A)
-                	                 			io 0x60 = 0x2f8
-                	                			irq 0x70 = 3
+							device pnp 2e.2 off	# Com2 (N/A)
+								io 0x60 = 0x2f8
+								irq 0x70 = 3
 							end
-                	        			device pnp 2e.3 off #  Parallel port (N/A)
-                	                 			io 0x60 = 0x378
-                	                			irq 0x70 = 7
+							device pnp 2e.3 off	# Parallel port (N/A)
+								io 0x60 = 0x378
+								irq 0x70 = 7
 							end
-                	        			device pnp 2e.4 on #  EC
-                	                 			io 0x60 = 0x290
-                	                 			io 0x62 = 0x230
-                	                			irq 0x70 = 9
+							device pnp 2e.4 on	# EC
+								io 0x60 = 0x290
+								io 0x62 = 0x230
+								irq 0x70 = 9
 							end
-							device pnp 2e.5 off #  PS/2 keyboard (N/A)
-                	                 			io 0x60 = 0x60
-                	                 			io 0x62 = 0x64
-                	                			irq 0x70 = 1
+							device pnp 2e.5 off	# PS/2 keyboard (N/A)
+								io 0x60 = 0x60
+								io 0x62 = 0x64
+								irq 0x70 = 1
 							end
-							device pnp 2e.6 off #  Mouse (N/A)
-                	                			irq 0x70 = 12
+							device pnp 2e.6 off	# Mouse (N/A)
+								irq 0x70 = 12
 							end
-                	        			device pnp 2e.8 off #  MIDI (N/A)
+							device pnp 2e.8 off	# MIDI (N/A)
 								io 0x60 = 0x300
 								irq 0x70 = 10
 							end
-                	        			device pnp 2e.9 off #  GAME (N/A)
+							device pnp 2e.9 off	# GAME (N/A)
 								io 0x60 = 0x220
 							end
-                	        			device pnp 2e.a off end #  CIR (N/A)
+							device pnp 2e.a off end	# CIR (N/A)
 						end
 					end
 
-                                        device pci 2.5 off end # IDE (SiS5513)
-                                        device pci 2.6 off end # Modem (SiS7013)
-                                        device pci 2.7 off end # Audio (SiS7012)
-                                        device pci 3.0 on end # USB (SiS7001,USB1.1)
-                                        device pci 3.1 on end # USB (SiS7001,USB1.1)
-                                        device pci 3.3 on end # USB (SiS7002,USB2.0)
-                                        device pci 4.0 on end # NIC (SiS191)
-                                        device pci 5.0 on end # SATA (SiS1183,Native Mode)
-                                        device pci 6.0 on end # PCI-e x1
-                                        device pci 7.0 on end # PCI-e x1
-                                        device pci a.0 off end
-                                        device pci b.0 off end
-                                        device pci c.0 off end
-                                        device pci d.0 off end
-                                        device pci e.0 off end
-                                        device pci f.0 off end # HD Audio (SiS7502)
+					device pci 2.5 off end	# IDE (SiS5513)
+					device pci 2.6 off end	# Modem (SiS7013)
+					device pci 2.7 off end	# Audio (SiS7012)
+					device pci 3.0 on end	# USB (SiS7001,USB1.1)
+					device pci 3.1 on end	# USB (SiS7001,USB1.1)
+					device pci 3.3 on end	# USB (SiS7002,USB2.0)
+					device pci 4.0 on end	# NIC (SiS191)
+					device pci 5.0 on end	# SATA (SiS1183,Native Mode)
+					device pci 6.0 on end	# PCI-e x1
+					device pci 7.0 on end	# PCI-e x1
+					device pci a.0 off end
+					device pci b.0 off end
+					device pci c.0 off end
+					device pci d.0 off end
+					device pci e.0 off end
+					device pci f.0 off end	# HD Audio (SiS7502)
 
-                                        register "ide0_enable" = "1"
-                                        register "ide1_enable" = "1"
-                                        register "sata0_enable" = "1"
-                                        register "sata1_enable" = "1"
+					register "ide0_enable" = "1"
+					register "ide1_enable" = "1"
+					register "sata0_enable" = "1"
+					register "sata1_enable" = "1"
 				end
-			end #  device pci 18.0
+			end # device pci 18.0
 			device pci 18.0 on end # Link 1
 			device pci 18.0 on end
 			device pci 18.1 on end
 			device pci 18.2 on end
 			device pci 18.3 on end
 		end # mc0
-
 	end # PCI domain
-
 end #root_complex
diff --git a/src/mainboard/gigabyte/m57sli/devicetree.cb b/src/mainboard/gigabyte/m57sli/devicetree.cb
index efbf76e..3453b8c 100644
--- a/src/mainboard/gigabyte/m57sli/devicetree.cb
+++ b/src/mainboard/gigabyte/m57sli/devicetree.cb
@@ -1,154 +1,154 @@
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device cpu_cluster 0 on			# (L)APIC cluster
-    chip cpu/amd/socket_AM2			# CPU socket
-      device lapic 0 on end			# Local APIC of the CPU
-    end
+	device cpu_cluster 0 on			# (L)APIC cluster
+		chip cpu/amd/socket_AM2			# 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/ite/it8716f		# Super I/O
-            device pnp 2e.0 on			# Floppy and any LDN
-              # Watchdog from CLKIN (24 MHz)
-              irq 0x23 = 0x11
-              # Serial Flash (SPI only)
-              # 0x24 = 0x1a
-              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
-              irq 0x70 = 7
-            end
-            device pnp 2e.4 on			# Embedded controller
-              io 0x60 = 0x290
-              io 0x62 = 0x230
-              irq 0x70 = 9
-            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, SPI flash
-              # Pin 84 is not GP10
-              irq 0x25 = 0x0
-              # Pin 21 is GP26, pin 26 is GP21, pin 27 is GP20
-              irq 0x26 = 0x43
-              # Pin 13 is GP35
-              irq 0x27 = 0x20
-              # Pin 70 is not GP46
-              # irq 0x28 = 0x0
-              # Pin 6,3,128,127,126 is GP63,64,65,66,67
-              irq 0x29 = 0x81
-              # Enable FAN_CTL/FAN_TAC set to 5 (pin 21, 23),
-              # enable FAN_CTL/FAN_TAC set to 4 (pin 20, 22),
-              # pin 48 is PCIRST5#, pin91 is PCIRSTIN#, VIN7 is internal
-              # voltage divider for VCCH5V, pin 95 is ATXPG, VIN3 is internal
-              # voltage divider for VCC5V
-              # irq 0x2c = 0x1f
-              # Simple I/O base
-              io 0x62 = 0x800
-              # Serial Flash I/O (SPI only)
-              io 0x64 = 0x820
-              # Watchdog force timeout (parallel flash only)
-              # irq 0x71 = 0x1
-              # No WDT interrupt
-              irq 0x72 = 0x0
-              # GPIO pin set 1 disable internal pullup
-              irq 0xb8 = 0x0
-              # GPIO pin set 5 enable internal pullup
-              irq 0xbc = 0x01
-              # SIO pin set 1 alternate function
-              # irq 0xc0 = 0x0
-              # SIO pin set 2 mixed function
-              irq 0xc1 = 0x43
-              # SIO pin set 3 mixed function
-              irq 0xc2 = 0x20
-              # SIO pin set 4 alternate function
-              # irq 0xc3 = 0x0
-              # SIO pin set 1 input mode
-              # irq 0xc8 = 0x0
-              # SIO pin set 2 input mode
-              irq 0xc9 = 0x0
-              # SIO pin set 4 input mode
-              # irq 0xcb = 0x0
-              # Generate SMI# on EC IRQ
-              # irq 0xf0 = 0x10
-              # SMI# level trigger
-              # irq 0xf1 = 0x40
-              # HWMON alert beep pin location
-              irq 0xf6 = 0x28
-            end
-            device pnp 2e.8 off			# MIDI
-              io 0x60 = 0x300
-              irq 0x70 = 10
-            end
-            device pnp 2e.9 off			# Game port
-              io 0x60 = 0x220
-            end
-            device pnp 2e.a off end		# Consumer IR
-          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
-        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			# AUDIO
-        device pci 8.0 on end			# NIC
-        device pci 9.0 off end			# N/A
-        device pci a.0 on end			# PCI E 5
-        device pci b.0 on end			# PCI E 4
-        device pci c.0 on 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.0 on end			# Link 1
-      device pci 18.0 on end
-      device pci 18.1 on end
-      device pci 18.2 on end
-      device pci 18.3 on end
-    end
-  end
+	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/ite/it8716f		# Super I/O
+						device pnp 2e.0 on			# Floppy and any LDN
+							# Watchdog from CLKIN (24 MHz)
+							irq 0x23 = 0x11
+							# Serial Flash (SPI only)
+							# 0x24 = 0x1a
+							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
+							irq 0x70 = 7
+						end
+						device pnp 2e.4 on			# Embedded controller
+							io 0x60 = 0x290
+							io 0x62 = 0x230
+							irq 0x70 = 9
+						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, SPI flash
+							# Pin 84 is not GP10
+							irq 0x25 = 0x0
+							# Pin 21 is GP26, pin 26 is GP21, pin 27 is GP20
+							irq 0x26 = 0x43
+							# Pin 13 is GP35
+							irq 0x27 = 0x20
+							# Pin 70 is not GP46
+							# irq 0x28 = 0x0
+							# Pin 6,3,128,127,126 is GP63,64,65,66,67
+							irq 0x29 = 0x81
+							# Enable FAN_CTL/FAN_TAC set to 5 (pin 21, 23),
+							# enable FAN_CTL/FAN_TAC set to 4 (pin 20, 22),
+							# pin 48 is PCIRST5#, pin91 is PCIRSTIN#, VIN7 is internal
+							# voltage divider for VCCH5V, pin 95 is ATXPG, VIN3 is internal
+							# voltage divider for VCC5V
+							# irq 0x2c = 0x1f
+							# Simple I/O base
+							io 0x62 = 0x800
+							# Serial Flash I/O (SPI only)
+							io 0x64 = 0x820
+							# Watchdog force timeout (parallel flash only)
+							# irq 0x71 = 0x1
+							# No WDT interrupt
+							irq 0x72 = 0x0
+							# GPIO pin set 1 disable internal pullup
+							irq 0xb8 = 0x0
+							# GPIO pin set 5 enable internal pullup
+							irq 0xbc = 0x01
+							# SIO pin set 1 alternate function
+							# irq 0xc0 = 0x0
+							# SIO pin set 2 mixed function
+							irq 0xc1 = 0x43
+							# SIO pin set 3 mixed function
+							irq 0xc2 = 0x20
+							# SIO pin set 4 alternate function
+							# irq 0xc3 = 0x0
+							# SIO pin set 1 input mode
+							# irq 0xc8 = 0x0
+							# SIO pin set 2 input mode
+							irq 0xc9 = 0x0
+							# SIO pin set 4 input mode
+							# irq 0xcb = 0x0
+							# Generate SMI# on EC IRQ
+							# irq 0xf0 = 0x10
+							# SMI# level trigger
+							# irq 0xf1 = 0x40
+							# HWMON alert beep pin location
+							irq 0xf6 = 0x28
+						end
+						device pnp 2e.8 off			# MIDI
+							io 0x60 = 0x300
+							irq 0x70 = 10
+						end
+						device pnp 2e.9 off			# Game port
+							io 0x60 = 0x220
+						end
+						device pnp 2e.a off end		# Consumer IR
+					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
+				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			# AUDIO
+				device pci 8.0 on end			# NIC
+				device pci 9.0 off end			# N/A
+				device pci a.0 on end			# PCI E 5
+				device pci b.0 on end			# PCI E 4
+				device pci c.0 on 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.0 on end			# Link 1
+			device pci 18.0 on 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/gigabyte/ma785gm/devicetree.cb b/src/mainboard/gigabyte/ma785gm/devicetree.cb
index c7d9932..f8dd04c 100644
--- a/src/mainboard/gigabyte/ma785gm/devicetree.cb
+++ b/src/mainboard/gigabyte/ma785gm/devicetree.cb
@@ -1,28 +1,28 @@
 # sample config for gigabyte/ma785gm
 chip northbridge/amd/amdfam10/root_complex
 	device cpu_cluster 0 on
-		chip cpu/amd/socket_AM3  #L1 and DDR2
+		chip cpu/amd/socket_AM3	#L1 and DDR2
 			 device lapic 0 on end
 		end
 	end
 	device domain 0 on
 		subsystemid 0x1022 0x3060 inherit
 		chip northbridge/amd/amdfam10
-			device pci 18.0 on #  northbridge
+			device pci 18.0 on	# northbridge
 				chip southbridge/amd/rs780
-					device pci 0.0 on end # HT  	0x9601
-					device pci 1.0 on end # Internal Graphics P2P bridge 0x9602
-					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x9603
-					device pci 3.0 off end # PCIE P2P bridge	0x960b
-					device pci 4.0 off end # PCIE P2P bridge 0x9604
-					device pci 5.0 off end # PCIE P2P bridge 0x9605
-					device pci 6.0 off end # PCIE P2P bridge 0x9606
-					device pci 7.0 off end # PCIE P2P bridge 0x9607
-					device pci 8.0 off end # NB/SB Link P2P bridge
-					device pci 9.0 off end #
-					device pci a.0 on end #	PCIE P2P bridge 0x9609
-					register "gppsb_configuration" = "1"   # Configuration B
-					register "gpp_configuration" = "3"   # Configuration D default
+					device pci 0.0 on end	# HT	0x9601
+					device pci 1.0 on end	# Internal Graphics P2P bridge 0x9602
+					device pci 2.0 on end	# PCIE P2P bridge (external graphics) 0x9603
+					device pci 3.0 off end	# PCIE P2P bridge 0x960b
+					device pci 4.0 off end	# PCIE P2P bridge 0x9604
+					device pci 5.0 off end	# PCIE P2P bridge 0x9605
+					device pci 6.0 off end	# PCIE P2P bridge 0x9606
+					device pci 7.0 off end	# PCIE P2P bridge 0x9607
+					device pci 8.0 off end	# NB/SB Link P2P bridge
+					device pci 9.0 off end	#
+					device pci a.0 on end	# PCIE P2P bridge 0x9609
+					register "gppsb_configuration" = "1"	# Configuration B
+					register "gpp_configuration" = "3"	# Configuration D default
 					register "port_enable" = "0x6fc"
 					register "gfx_dev2_dev3" = "1"
 					register "gfx_dual_slot" = "2"
@@ -34,14 +34,14 @@ chip northbridge/amd/amdfam10/root_complex
 					register "gfx_link_width" = "0"
 				end
 				chip southbridge/amd/sb700 # it is under NB/SB Link, but on the same pri bus
-					device pci 11.0 on end # SATA
-					device pci 12.0 on end # USB
-					device pci 12.1 on end # USB
-					device pci 12.2 on end # USB
-					device pci 13.0 on end # USB
-					device pci 13.1 on end # USB
-					device pci 13.2 on end # USB
-	 				device pci 14.0 on # SM
+					device pci 11.0 on end	# SATA
+					device pci 12.0 on end	# USB
+					device pci 12.1 on end	# USB
+					device pci 12.2 on end	# USB
+					device pci 13.0 on end	# USB
+					device pci 13.1 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
@@ -55,53 +55,53 @@ chip northbridge/amd/amdfam10/root_complex
 							device i2c 53 on end
 						end
 					end # SM
-					device pci 14.1 on end # IDE    0x439c
-					device pci 14.2 on end # HDA    0x4383
-					device pci 14.3 on # LPC	0x439d
+					device pci 14.1 on end	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on	# LPC	0x439d
 						chip superio/ite/it8718f
-							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 on #  Com1
+							device pnp 2e.1 on	# Com1
 								io 0x60 = 0x3f8
 								irq 0x70 = 4
 							end
-							device pnp 2e.2 off #  Com2
+							device pnp 2e.2 off	# Com2
 								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 2e.3 off #  Parallel Port
+							device pnp 2e.3 off	# Parallel Port
 								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 2e.4 off end #  EC
-							device pnp 2e.5 on #  Keyboard
+							device pnp 2e.4 off end	# EC
+							device pnp 2e.5 on	# Keyboard
 								io 0x60 = 0x60
 								io 0x62 = 0x64
 								irq 0x70 = 1
 							end
-							device pnp 2e.6 on #  Mouse
+							device pnp 2e.6 on	# Mouse
 								irq 0x70 = 12
 							end
-							device pnp 2e.7 off #  GPIO, must be closed for unresolved reason.
+							device pnp 2e.7 off	# GPIO, must be closed for unresolved reason.
 							end
-							device pnp 2e.8 off #  MIDI
+							device pnp 2e.8 off	# MIDI
 								io 0x60 = 0x300
 								irq 0x70 = 9
 							end
-							device pnp 2e.9 off #  GAME
+							device pnp 2e.9 off	# GAME
 								io 0x60 = 0x220
 							end
-							device pnp 2e.a off end #  CIR
+							device pnp 2e.a off end	# CIR
 						end	#superio/ite/it8718f
 					end		#LPC
 					device pci 14.4 on end # PCI 0x4384
 					device pci 14.5 on end # USB 2
 					register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				end	#southbridge/amd/sb700
-			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/gigabyte/ma785gmt/devicetree.cb b/src/mainboard/gigabyte/ma785gmt/devicetree.cb
index bd98313..15e9bff 100644
--- a/src/mainboard/gigabyte/ma785gmt/devicetree.cb
+++ b/src/mainboard/gigabyte/ma785gmt/devicetree.cb
@@ -1,28 +1,28 @@
 # sample config for gigabyte/ma785gmt
 chip northbridge/amd/amdfam10/root_complex
 	device cpu_cluster 0 on
-		chip cpu/amd/socket_AM3  #L1 and DDR3
+		chip cpu/amd/socket_AM3	#L1 and DDR3
 			 device lapic 0 on end
 		end
 	end
 	device domain 0 on
 		subsystemid 0x1022 0x3060 inherit
 		chip northbridge/amd/amdfam10
-			device pci 18.0 on #  northbridge
+			device pci 18.0 on	# northbridge
 				chip southbridge/amd/rs780
-					device pci 0.0 on end # HT  	0x9600
-					device pci 1.0 on end # Internal Graphics P2P bridge 0x9602
-					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x9603
-					device pci 3.0 on end # PCIE P2P bridge	0x960b
-					device pci 4.0 on end # PCIE P2P bridge 0x9604
-					device pci 5.0 off end # PCIE P2P bridge 0x9605
-					device pci 6.0 off end # PCIE P2P bridge 0x9606
-					device pci 7.0 off end # PCIE P2P bridge 0x9607
-					device pci 8.0 off end # NB/SB Link P2P bridge
-					device pci 9.0 on end #
-					device pci a.0 on end #
-					register "gppsb_configuration" = "1"   # Configuration B
-					register "gpp_configuration" = "3"   # Configuration D default
+					device pci 0.0 on end	# HT	0x9600
+					device pci 1.0 on end	# Internal Graphics P2P bridge 0x9602
+					device pci 2.0 on end	# PCIE P2P bridge (external graphics) 0x9603
+					device pci 3.0 on end	# PCIE P2P bridge 0x960b
+					device pci 4.0 on end	# PCIE P2P bridge 0x9604
+					device pci 5.0 off end	# PCIE P2P bridge 0x9605
+					device pci 6.0 off end	# PCIE P2P bridge 0x9606
+					device pci 7.0 off end	# PCIE P2P bridge 0x9607
+					device pci 8.0 off end	# NB/SB Link P2P bridge
+					device pci 9.0 on end	#
+					device pci a.0 on end	#
+					register "gppsb_configuration" = "1"	# Configuration B
+					register "gpp_configuration" = "3"	# Configuration D default
 					register "port_enable" = "0x6fc"
 					register "gfx_dev2_dev3" = "1"
 					register "gfx_dual_slot" = "2"
@@ -34,14 +34,14 @@ chip northbridge/amd/amdfam10/root_complex
 					register "gfx_link_width" = "0"
 				end
 				chip southbridge/amd/sb700 # it is under NB/SB Link, but on the same pri bus
-					device pci 11.0 on end # SATA
-					device pci 12.0 on end # USB
-					device pci 12.1 on end # USB
-					device pci 12.2 on end # USB
-					device pci 13.0 on end # USB
-					device pci 13.1 on end # USB
-					device pci 13.2 on end # USB
-	 				device pci 14.0 on # SM
+					device pci 11.0 on end	# SATA
+					device pci 12.0 on end	# USB
+					device pci 12.1 on end	# USB
+					device pci 12.2 on end	# USB
+					device pci 13.0 on end	# USB
+					device pci 13.1 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
@@ -55,53 +55,53 @@ chip northbridge/amd/amdfam10/root_complex
 							device i2c 53 on end
 						end
 					end # SM
-					device pci 14.1 on end # IDE    0x439c
-					device pci 14.2 on end # HDA    0x4383
-					device pci 14.3 on # LPC	0x439d
+					device pci 14.1 on end	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on	# LPC	0x439d
 						chip superio/ite/it8718f
-							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 on #  Com1
+							device pnp 2e.1 on	# Com1
 								io 0x60 = 0x3f8
 								irq 0x70 = 4
 							end
-							device pnp 2e.2 off #  Com2
+							device pnp 2e.2 off	# Com2
 								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 2e.3 off #  Parallel Port
+							device pnp 2e.3 off	# Parallel Port
 								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 2e.4 off end #  EC
-							device pnp 2e.5 on #  Keyboard
+							device pnp 2e.4 off end	# EC
+							device pnp 2e.5 on	# Keyboard
 								io 0x60 = 0x60
 								io 0x62 = 0x64
 								irq 0x70 = 1
 							end
-							device pnp 2e.6 on #  Mouse
+							device pnp 2e.6 on	# Mouse
 								irq 0x70 = 12
 							end
-							device pnp 2e.7 off #  GPIO, must be closed for unresolved reason.
+							device pnp 2e.7 off	# GPIO, must be closed for unresolved reason.
 							end
-							device pnp 2e.8 off #  MIDI
+							device pnp 2e.8 off	# MIDI
 								io 0x60 = 0x300
 								irq 0x70 = 9
 							end
-							device pnp 2e.9 off #  GAME
+							device pnp 2e.9 off	# GAME
 								io 0x60 = 0x220
 							end
-							device pnp 2e.a off end #  CIR
+							device pnp 2e.a off end	# CIR
 						end	#superio/ite/it8718f
 					end		#LPC
-					device pci 14.4 on end # PCI 0x4384
-					device pci 14.5 on end # USB 2
+					device pci 14.4 on end	# PCI 0x4384
+					device pci 14.5 on end	# USB 2
 					register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				end	#southbridge/amd/sb700
-			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/gigabyte/ma78gm/devicetree.cb b/src/mainboard/gigabyte/ma78gm/devicetree.cb
index 8d81fbe..3ee484f 100644
--- a/src/mainboard/gigabyte/ma78gm/devicetree.cb
+++ b/src/mainboard/gigabyte/ma78gm/devicetree.cb
@@ -1,28 +1,28 @@
 # sample config for gigabyte/ma78gm
 chip northbridge/amd/amdfam10/root_complex
 	device cpu_cluster 0 on
-		chip cpu/amd/socket_AM2r2  #L1 and DDR2
+		chip cpu/amd/socket_AM2r2	#L1 and DDR2
 			 device lapic 0 on end
 		end
 	end
 	device domain 0 on
 		subsystemid 0x1022 0x3060 inherit
 		chip northbridge/amd/amdfam10
-			device pci 18.0 on #  northbridge
+			device pci 18.0 on	# northbridge
 				chip southbridge/amd/rs780
-					device pci 0.0 on end # HT  	0x9600
-					device pci 1.0 on end # Internal Graphics P2P bridge 0x9602
-					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x9603
-					device pci 3.0 off end # PCIE P2P bridge	0x960b
-					device pci 4.0 on end # PCIE P2P bridge 0x9604
-					device pci 5.0 off end # PCIE P2P bridge 0x9605
-					device pci 6.0 off end # PCIE P2P bridge 0x9606
-					device pci 7.0 off end # PCIE P2P bridge 0x9607
-					device pci 8.0 off end # NB/SB Link P2P bridge
-					device pci 9.0 on end #
-					device pci a.0 on end #
-					register "gppsb_configuration" = "1"   # Configuration B
-					register "gpp_configuration" = "3"   # Configuration D default
+					device pci 0.0 on end	# HT	0x9600
+					device pci 1.0 on end	# Internal Graphics P2P bridge 0x9602
+					device pci 2.0 on end	# PCIE P2P bridge (external graphics) 0x9603
+					device pci 3.0 off end	# PCIE P2P bridge	0x960b
+					device pci 4.0 on end	# PCIE P2P bridge 0x9604
+					device pci 5.0 off end	# PCIE P2P bridge 0x9605
+					device pci 6.0 off end	# PCIE P2P bridge 0x9606
+					device pci 7.0 off end	# PCIE P2P bridge 0x9607
+					device pci 8.0 off end	# NB/SB Link P2P bridge
+					device pci 9.0 on end	#
+					device pci a.0 on end	#
+					register "gppsb_configuration" = "1"	# Configuration B
+					register "gpp_configuration" = "3"	# Configuration D default
 					register "port_enable" = "0x6fc"
 					register "gfx_dev2_dev3" = "1"
 					register "gfx_dual_slot" = "1"
@@ -33,14 +33,14 @@ chip northbridge/amd/amdfam10/root_complex
 					register "gfx_link_width" = "0"
 				end
 				chip southbridge/amd/sb700 # it is under NB/SB Link, but on the same pri bus
-					device pci 11.0 on end # SATA
-					device pci 12.0 on end # USB
-					device pci 12.1 on end # USB
-					device pci 12.2 on end # USB
-					device pci 13.0 on end # USB
-					device pci 13.1 on end # USB
-					device pci 13.2 on end # USB
-	 				device pci 14.0 on # SM
+					device pci 11.0 on end	# SATA
+					device pci 12.0 on end	# USB
+					device pci 12.1 on end	# USB
+					device pci 12.2 on end	# USB
+					device pci 13.0 on end	# USB
+					device pci 13.1 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
@@ -54,53 +54,53 @@ chip northbridge/amd/amdfam10/root_complex
 							device i2c 53 on end
 						end
 					end # SM
-					device pci 14.1 on end # IDE    0x439c
-					device pci 14.2 on end # HDA    0x4383
-					device pci 14.3 on # LPC	0x439d
+					device pci 14.1 on end	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on	# LPC	0x439d
 						chip superio/ite/it8718f
-							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 on #  Com1
+							device pnp 2e.1 on	# Com1
 								io 0x60 = 0x3f8
 								irq 0x70 = 4
 							end
-							device pnp 2e.2 off #  Com2
+							device pnp 2e.2 off	# Com2
 								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 2e.3 off #  Parallel Port
+							device pnp 2e.3 off	# Parallel Port
 								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 2e.4 off end #  EC
-							device pnp 2e.5 on #  Keyboard
+							device pnp 2e.4 off end	# EC
+							device pnp 2e.5 on	# Keyboard
 								io 0x60 = 0x60
 								io 0x62 = 0x64
 								irq 0x70 = 1
 							end
-							device pnp 2e.6 on #  Mouse
+							device pnp 2e.6 on	# Mouse
 								irq 0x70 = 12
 							end
-							device pnp 2e.7 off #  GPIO, must be closed for unresolved reason.
+							device pnp 2e.7 off	# GPIO, must be closed for unresolved reason.
 							end
-							device pnp 2e.8 off #  MIDI
+							device pnp 2e.8 off	# MIDI
 								io 0x60 = 0x300
 								irq 0x70 = 9
 							end
-							device pnp 2e.9 off #  GAME
+							device pnp 2e.9 off	# GAME
 								io 0x60 = 0x220
 							end
-							device pnp 2e.a off end #  CIR
+							device pnp 2e.a off end	# CIR
 						end	#superio/ite/it8718f
 					end		#LPC
-					device pci 14.4 on end # PCI 0x4384
-					device pci 14.5 on end # USB 2
+					device pci 14.4 on end	# PCI 0x4384
+					device pci 14.5 on end	# USB 2
 					register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				end	#southbridge/amd/sb700
-			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/gizmosphere/gizmo/devicetree.cb b/src/mainboard/gizmosphere/gizmo/devicetree.cb
index 301f79a..c13f44c 100755
--- a/src/mainboard/gizmosphere/gizmo/devicetree.cb
+++ b/src/mainboard/gizmosphere/gizmo/devicetree.cb
@@ -20,39 +20,39 @@
 chip northbridge/amd/agesa/family14/root_complex
 	device cpu_cluster 0 on
 			chip cpu/amd/agesa/family14
-			  device lapic 0 on end
+				device lapic 0 on end
 			end
 	end
 	device domain 0 on
 		subsystemid 0x1022 0x1510 inherit
 			chip northbridge/amd/agesa/family14 # CPU side of HT root complex
 			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 0x9804
-				device pci 4.0 off end # PCIE P2P bridge 0x9604
-				device pci 5.0 on end # PCIE P2P bridge 0x9605
-				device pci 6.0 off end # PCIE P2P bridge 0x9606
-				device pci 7.0 off end # PCIE P2P bridge 0x9607
-				device pci 8.0 off end # NB/SB Link P2P bridge
+				device pci 0.0 on end	# Root Complex
+				device pci 1.0 on end	# Internal Graphics P2P bridge 0x9804
+				device pci 4.0 off end	# PCIE P2P bridge 0x9604
+				device pci 5.0 on end	# PCIE P2P bridge 0x9605
+				device pci 6.0 off end	# PCIE P2P bridge 0x9606
+				device pci 7.0 off end	# PCIE P2P bridge 0x9607
+				device pci 8.0 off end	# NB/SB Link P2P bridge
 			end # agesa northbridge
 
-			chip southbridge/amd/cimx/sb800 # it is under NB/SB Link, but on the same pri bus
-				device pci 11.0 on end # SATA
-				device pci 12.0 on end # USB
-				device pci 12.1 on end # USB
-				device pci 12.2 on end # USB
-				device pci 13.0 on end # USB
-				device pci 13.1 on end # USB
-				device pci 13.2 on end # USB
-				device pci 14.0 on end # SM
-				device pci 14.1 on end # IDE	0x439c
-				device pci 14.2 on end # HDA	0x4383
-				device pci 14.3 on end # LPC	0x439d
-				device pci 14.4 on end # PCIB 0x4384, NOTE: this device must always be enabled or removed
-				device pci 14.5 off end # USB 2
-				device pci 15.0 on end # PCIe PortA # PCIe x4 slot off of high speed edge connector
-				device pci 16.0 off end # OHCI USB3
-				device pci 16.2 off end # EHCI USB3
+			chip southbridge/amd/cimx/sb800	# it is under NB/SB Link, but on the same pri bus
+				device pci 11.0 on end	# SATA
+				device pci 12.0 on end	# USB
+				device pci 12.1 on end	# USB
+				device pci 12.2 on end	# USB
+				device pci 13.0 on end	# USB
+				device pci 13.1 on end	# USB
+				device pci 13.2 on end	# USB
+				device pci 14.0 on end	# SM
+				device pci 14.1 on end	# IDE	0x439c
+				device pci 14.2 on end	# HDA	0x4383
+				device pci 14.3 on end	# LPC	0x439d
+				device pci 14.4 on end	# PCIB 0x4384, NOTE: this device must always be enabled or removed
+				device pci 14.5 off end	# USB 2
+				device pci 15.0 on end	# PCIe PortA # PCIe x4 slot off of high speed edge connector
+				device pci 16.0 off end	# OHCI USB3
+				device pci 16.2 off end	# EHCI USB3
 				register "gpp_configuration" = "0" #4:0:0:0
 				register "boot_switch_sata_ide" = "0" # 0: boot from SATA. 1: IDE
 			end	#southbridge/amd/cimx/sb800
diff --git a/src/mainboard/google/butterfly/devicetree.cb b/src/mainboard/google/butterfly/devicetree.cb
index 9a7a1d5..10318fb 100644
--- a/src/mainboard/google/butterfly/devicetree.cb
+++ b/src/mainboard/google/butterfly/devicetree.cb
@@ -49,9 +49,9 @@ chip northbridge/intel/sandybridge
 			register "pirqh_routing" = "0x80"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
 			register "alt_gp_smi_en" = "0x0000"
 			#register "gpi1_routing" = "1"	#SMI from EC
 			register "gpi13_routing" = "2"	#SCI from EC
@@ -70,27 +70,27 @@ chip northbridge/intel/sandybridge
 			# Enable zero-based linear PCIe root port functions
 			register "pcie_port_coalesce" = "1"
 
-			device pci 14.0 on end # USB 3.0 Controller
-			device pci 16.0 on end # Management Engine Interface 1
-			device pci 16.1 off end # Management Engine Interface 2
-			device pci 16.2 off end # Management Engine IDE-R
-			device pci 16.3 off end # Management Engine KT
-			device pci 19.0 off end # Intel Gigabit Ethernet
-			device pci 1a.0 on end # USB2 EHCI #2
-			device pci 1b.0 on end # High Definition Audio
-			device pci 1c.0 on end # PCIe Port #1 (mini PCIe Slot - WLAN & Serial debug)
-			device pci 1c.1 on end # PCIe Port #2 (ETH0)
-			device pci 1c.2 on end # PCIe Port #3 (Card Reader)
+			device pci 14.0 on end	# USB 3.0 Controller
+			device pci 16.0 on end	# Management Engine Interface 1
+			device pci 16.1 off end	# Management Engine Interface 2
+			device pci 16.2 off end	# Management Engine IDE-R
+			device pci 16.3 off end	# Management Engine KT
+			device pci 19.0 off end	# Intel Gigabit Ethernet
+			device pci 1a.0 on end	# USB2 EHCI #2
+			device pci 1b.0 on end	# High Definition Audio
+			device pci 1c.0 on end	# PCIe Port #1 (mini PCIe Slot - WLAN & Serial debug)
+			device pci 1c.1 on end	# PCIe Port #2 (ETH0)
+			device pci 1c.2 on end	# PCIe Port #3 (Card Reader)
 				#force ASPM for PCIe bridge to Card Reader
 				register "pcie_aspm_f2" = "0x3"
-			device pci 1c.3 off end # PCIe Port #4
-			device pci 1c.4 off end # PCIe Port #5
-			device pci 1c.5 off end # PCIe Port #6
-			device pci 1c.6 off end # PCIe Port #7
-			device pci 1c.7 off end # PCIe Port #8
-			device pci 1d.0 on end # USB2 EHCI #1
-			device pci 1e.0 off end # PCI bridge
-			device pci 1f.0 on #LPC bridge
+			device pci 1c.3 off end	# PCIe Port #4
+			device pci 1c.4 off end	# PCIe Port #5
+			device pci 1c.5 off end	# PCIe Port #6
+			device pci 1c.6 off end	# PCIe Port #7
+			device pci 1c.7 off end	# PCIe Port #8
+			device pci 1d.0 on end	# USB2 EHCI #1
+			device pci 1e.0 off end	# PCI bridge
+			device pci 1f.0 on	#LPC bridge
 				chip ec/quanta/ene_kb3940q
 					# 60/64 KBC
 					device pnp ff.1 on # dummy address
diff --git a/src/mainboard/google/falco/devicetree.cb b/src/mainboard/google/falco/devicetree.cb
index ab8beae..d261608 100644
--- a/src/mainboard/google/falco/devicetree.cb
+++ b/src/mainboard/google/falco/devicetree.cb
@@ -15,11 +15,11 @@ chip northbridge/intel/haswell
 
 	# Enable Panel and configure power delays
 	register "gpu_panel_port_select" = "1"			# eDP
-	register "gpu_panel_power_cycle_delay" = "5"		# 400ms (T4)
-	register "gpu_panel_power_up_delay" = "600"		# 60ms  (T1+T2)
-	register "gpu_panel_power_down_delay" = "600"		# 60ms  (T3+T7)
-	register "gpu_panel_power_backlight_on_delay" = "2100"	# 210ms (T5)
-	register "gpu_panel_power_backlight_off_delay" = "2100"	# 210ms (T6)
+	register "gpu_panel_power_cycle_delay" = "5"		# 400ms	(T4)
+	register "gpu_panel_power_up_delay" = "600"		# 60ms	(T1+T2)
+	register "gpu_panel_power_down_delay" = "600"		# 60ms	(T3+T7)
+	register "gpu_panel_power_backlight_on_delay" = "2100"	# 210ms	(T5)
+	register "gpu_panel_power_backlight_off_delay" = "2100"	# 210ms	(T6)
 
 	device cpu_cluster 0 on
 		chip cpu/intel/socket_rPGA989
@@ -80,30 +80,30 @@ chip northbridge/intel/haswell
 			# Disable PCIe CLKOUT 1-5 and CLKOUT_XDP
 			register "icc_clock_disable" = "0x013e0000"
 
-			device pci 13.0 off end # Smart Sound Audio DSP
-			device pci 14.0 on end # USB3 XHCI
-			device pci 15.0 on end # Serial I/O DMA
-			device pci 15.1 on end # I2C0
-			device pci 15.2 on end # I2C1
-			device pci 15.3 off end # GSPI0
-			device pci 15.4 off end # GSPI1
-			device pci 15.5 off end # UART0
-			device pci 15.6 off end # UART1
-			device pci 16.0 on end # Management Engine Interface 1
-			device pci 16.1 off end # Management Engine Interface 2
-			device pci 16.2 off end # Management Engine IDE-R
-			device pci 16.3 off end # Management Engine KT
-			device pci 17.0 off end # SDIO
-			device pci 19.0 off end # GbE
-			device pci 1b.0 on end # High Definition Audio
-			device pci 1c.0 on end # PCIe Port #1
-			device pci 1c.1 off end # PCIe Port #2
-			device pci 1c.2 off end # PCIe Port #3
-			device pci 1c.3 off end # PCIe Port #4
-			device pci 1c.4 off end # PCIe Port #5
-			device pci 1c.5 off end # PCIe Port #6
-			device pci 1d.0 on end # USB2 EHCI
-			device pci 1e.0 off end # PCI bridge
+			device pci 13.0 off end	# Smart Sound Audio DSP
+			device pci 14.0 on end	# USB3 XHCI
+			device pci 15.0 on end	# Serial I/O DMA
+			device pci 15.1 on end	# I2C0
+			device pci 15.2 on end	# I2C1
+			device pci 15.3 off end	# GSPI0
+			device pci 15.4 off end	# GSPI1
+			device pci 15.5 off end	# UART0
+			device pci 15.6 off end	# UART1
+			device pci 16.0 on end	# Management Engine Interface 1
+			device pci 16.1 off end	# Management Engine Interface 2
+			device pci 16.2 off end	# Management Engine IDE-R
+			device pci 16.3 off end	# Management Engine KT
+			device pci 17.0 off end	# SDIO
+			device pci 19.0 off end	# GbE
+			device pci 1b.0 on end	# High Definition Audio
+			device pci 1c.0 on end	# PCIe Port #1
+			device pci 1c.1 off end	# PCIe Port #2
+			device pci 1c.2 off end	# PCIe Port #3
+			device pci 1c.3 off end	# PCIe Port #4
+			device pci 1c.4 off end	# PCIe Port #5
+			device pci 1c.5 off end	# PCIe Port #6
+			device pci 1d.0 on end	# USB2 EHCI
+			device pci 1e.0 off end	# PCI bridge
 			device pci 1f.0 on
 				chip ec/google/chromeec
 					# We only have one init function that
@@ -142,7 +142,7 @@ chip northbridge/intel/haswell
 					device i2c 35 on end
 				end
 			end
-			device pci 1f.6 on end # Thermal
+			device pci 1f.6 on end	# Thermal
 		end
 	end
 end
diff --git a/src/mainboard/google/link/devicetree.cb b/src/mainboard/google/link/devicetree.cb
index 8f0ed3c..128fd82 100644
--- a/src/mainboard/google/link/devicetree.cb
+++ b/src/mainboard/google/link/devicetree.cb
@@ -52,9 +52,9 @@ chip northbridge/intel/sandybridge
 			register "pirqh_routing" = "0x80"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
 			register "alt_gp_smi_en" = "0x0100"
 			register "gpi7_routing" = "2"
 			register "gpi8_routing" = "1"
@@ -72,23 +72,23 @@ chip northbridge/intel/sandybridge
 			# Enable zero-based linear PCIe root port functions
 			register "pcie_port_coalesce" = "1"
 
-			device pci 16.0 on end # Management Engine Interface 1
-			device pci 16.1 off end # Management Engine Interface 2
-			device pci 16.2 off end # Management Engine IDE-R
-			device pci 16.3 off end # Management Engine KT
-			device pci 19.0 off end # Intel Gigabit Ethernet
-			device pci 1a.0 on end # USB2 EHCI #2
-			device pci 1b.0 on end # High Definition Audio
-			device pci 1c.0 off end # PCIe Port #1 (WLAN remapped)
-			device pci 1c.1 off end # PCIe Port #2
-			device pci 1c.2 on end # PCIe Port #3 (WLAN actual)
-			device pci 1c.3 off end # PCIe Port #4
-			device pci 1c.4 off end # PCIe Port #5
-			device pci 1c.5 off end # PCIe Port #6
-			device pci 1c.6 off end # PCIe Port #7
-			device pci 1c.7 off end # PCIe Port #8
-			device pci 1d.0 on end # USB2 EHCI #1
-			device pci 1e.0 off end # PCI bridge
+			device pci 16.0 on end	# Management Engine Interface 1
+			device pci 16.1 off end	# Management Engine Interface 2
+			device pci 16.2 off end	# Management Engine IDE-R
+			device pci 16.3 off end	# Management Engine KT
+			device pci 19.0 off end	# Intel Gigabit Ethernet
+			device pci 1a.0 on end	# USB2 EHCI #2
+			device pci 1b.0 on end	# High Definition Audio
+			device pci 1c.0 off end	# PCIe Port #1 (WLAN remapped)
+			device pci 1c.1 off end	# PCIe Port #2
+			device pci 1c.2 on end	# PCIe Port #3 (WLAN actual)
+			device pci 1c.3 off end	# PCIe Port #4
+			device pci 1c.4 off end	# PCIe Port #5
+			device pci 1c.5 off end	# PCIe Port #6
+			device pci 1c.6 off end	# PCIe Port #7
+			device pci 1c.7 off end	# PCIe Port #8
+			device pci 1d.0 on end	# USB2 EHCI #1
+			device pci 1e.0 off end	# PCI bridge
 			device pci 1f.0 on
 				chip ec/google/chromeec
 					# We only have one init function that
@@ -98,10 +98,10 @@ chip northbridge/intel/sandybridge
 					end
 				end
 			end # LPC bridge
-			device pci 1f.2 on end # SATA Controller 1
-			device pci 1f.3 on end # SMBus
-			device pci 1f.5 off end # SATA Controller 2
-			device pci 1f.6 on end # Thermal
+			device pci 1f.2 on end	# SATA Controller 1
+			device pci 1f.3 on end	# SMBus
+			device pci 1f.5 off end	# SATA Controller 2
+			device pci 1f.6 on end	# Thermal
 		end
 	end
 end
diff --git a/src/mainboard/google/parrot/devicetree.cb b/src/mainboard/google/parrot/devicetree.cb
index 59586cc..07d071e 100644
--- a/src/mainboard/google/parrot/devicetree.cb
+++ b/src/mainboard/google/parrot/devicetree.cb
@@ -51,10 +51,10 @@ chip northbridge/intel/sandybridge
 			register "pirqh_routing" = "0x80"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
-			# Set Lid Switch to SMI to capture in recovery mode.  It gets reset to
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
+			# Set Lid Switch to SMI to capture in recovery mode. It gets reset to
 			# SCI mode when we go to ACPI mode.
 			register "alt_gp_smi_en" = "0x8100"
 			register "gpi7_routing" = "2"
@@ -70,23 +70,23 @@ chip northbridge/intel/sandybridge
 			# Enable zero-based linear PCIe root port functions
 			register "pcie_port_coalesce" = "1"
 
-			device pci 16.0 on end # Management Engine Interface 1
-			device pci 16.1 off end # Management Engine Interface 2
-			device pci 16.2 off end # Management Engine IDE-R
-			device pci 16.3 off end # Management Engine KT
-			device pci 19.0 off end # Intel Gigabit Ethernet
-			device pci 1a.0 on end # USB2 EHCI #2
-			device pci 1b.0 on end # High Definition Audio
-			device pci 1c.0 off end # PCIe Port #1
-			device pci 1c.1 on end # PCIe Port #2 (WLAN)
-			device pci 1c.2 on end # PCIe Port #3 (ETH0)
-			device pci 1c.3 off end # PCIe Port #4
-			device pci 1c.4 off end # PCIe Port #5
-			device pci 1c.5 off end # PCIe Port #6
-			device pci 1c.6 off end # PCIe Port #7
-			device pci 1c.7 off end # PCIe Port #8
-			device pci 1d.0 on end # USB2 EHCI #1
-			device pci 1e.0 off end # PCI bridge
+			device pci 16.0 on end	# Management Engine Interface 1
+			device pci 16.1 off end	# Management Engine Interface 2
+			device pci 16.2 off end	# Management Engine IDE-R
+			device pci 16.3 off end	# Management Engine KT
+			device pci 19.0 off end	# Intel Gigabit Ethernet
+			device pci 1a.0 on end	# USB2 EHCI #2
+			device pci 1b.0 on end	# High Definition Audio
+			device pci 1c.0 off end	# PCIe Port #1
+			device pci 1c.1 on end	# PCIe Port #2 (WLAN)
+			device pci 1c.2 on end	# PCIe Port #3 (ETH0)
+			device pci 1c.3 off end	# PCIe Port #4
+			device pci 1c.4 off end	# PCIe Port #5
+			device pci 1c.5 off end	# PCIe Port #6
+			device pci 1c.6 off end	# PCIe Port #7
+			device pci 1c.7 off end	# PCIe Port #8
+			device pci 1d.0 on end	# USB2 EHCI #1
+			device pci 1e.0 off end	# PCI bridge
 			device pci 1f.0 on
 				chip ec/compal/ene932
 					# 60/64 KBC
@@ -94,10 +94,10 @@ chip northbridge/intel/sandybridge
 					end
 				end
 			end # LPC bridge
-			device pci 1f.2 on end # SATA Controller 1
-			device pci 1f.3 on end # SMBus
-			device pci 1f.5 off end # SATA Controller 2
-			device pci 1f.6 on end # Thermal
+			device pci 1f.2 on end	# SATA Controller 1
+			device pci 1f.3 on end	# SMBus
+			device pci 1f.5 off end	# SATA Controller 2
+			device pci 1f.6 on end	# Thermal
 		end
 	end
 end
diff --git a/src/mainboard/google/rambi/devicetree.cb b/src/mainboard/google/rambi/devicetree.cb
index fe5ec7b..53c95e2 100644
--- a/src/mainboard/google/rambi/devicetree.cb
+++ b/src/mainboard/google/rambi/devicetree.cb
@@ -24,8 +24,8 @@ chip soc/intel/baytrail
 	register "usb2_per_port_rcomp_hs_pullup3" = "0x0300401d"
 
 	# LPE audio codec settings
-	register "lpe_codec_clk_freq" = "25" # 25MHz clock
-	register "lpe_codec_clk_num" = "0"   # PMC_PLT_CLK[0]
+	register "lpe_codec_clk_freq" = "25"	# 25MHz clock
+	register "lpe_codec_clk_num" = "0"	# PMC_PLT_CLK[0]
 
 	# SD Card controller
 	register "sdcard_cap_low" = "0x036864b2"
@@ -48,35 +48,35 @@ chip soc/intel/baytrail
 		device lapic 0 on end
 	end
 	device domain 0 on
-		device pci 00.0 on  end # SoC router
-		device pci 02.0 on  end # GFX
-		device pci 11.0 off end # SDIO
-		device pci 12.0 on  end # SD
-		device pci 13.0 on  end # SATA
-		device pci 14.0 on  end # XHCI
-		device pci 15.0 on  end # LPE
-		device pci 17.0 on  end # MMC
-		device pci 18.0 on  end # SIO_DMA1
-		device pci 18.1 on  end # I2C1
-		device pci 18.2 on  end # I2C2
-		device pci 18.3 off end # I2C3
-		device pci 18.4 off end # I2C4
-		device pci 18.5 on  end # I2C5
-		device pci 18.6 on  end # I2C6
-		device pci 18.7 off end # I2C7
-		device pci 1a.0 on  end # TXE
-		device pci 1b.0 off end # HDA
-		device pci 1c.0 on  end # PCIE_PORT1
-		device pci 1c.1 on  end # PCIE_PORT2
-		device pci 1c.2 off end # PCIE_PORT3
-		device pci 1c.3 off end # PCIE_PORT4
-		device pci 1d.0 on  end # EHCI
-		device pci 1e.0 on  end # SIO_DMA2
-		device pci 1e.1 off end # PWM1
-		device pci 1e.2 off end # PWM2
-		device pci 1e.3 off end # HSUART1
-		device pci 1e.4 off end # HSUART2
-		device pci 1e.5 off end # SPI
+		device pci 00.0 on end	# SoC router
+		device pci 02.0 on end	# GFX
+		device pci 11.0 off end	# SDIO
+		device pci 12.0 on end	# SD
+		device pci 13.0 on end	# SATA
+		device pci 14.0 on end	# XHCI
+		device pci 15.0 on end	# LPE
+		device pci 17.0 on end	# MMC
+		device pci 18.0 on end	# SIO_DMA1
+		device pci 18.1 on end	# I2C1
+		device pci 18.2 on end	# I2C2
+		device pci 18.3 off end	# I2C3
+		device pci 18.4 off end	# I2C4
+		device pci 18.5 on end	# I2C5
+		device pci 18.6 on end	# I2C6
+		device pci 18.7 off end	# I2C7
+		device pci 1a.0 on end	# TXE
+		device pci 1b.0 off end	# HDA
+		device pci 1c.0 on end	# PCIE_PORT1
+		device pci 1c.1 on end	# PCIE_PORT2
+		device pci 1c.2 off end	# PCIE_PORT3
+		device pci 1c.3 off end	# PCIE_PORT4
+		device pci 1d.0 on end	# EHCI
+		device pci 1e.0 on end	# SIO_DMA2
+		device pci 1e.1 off end	# PWM1
+		device pci 1e.2 off end	# PWM2
+		device pci 1e.3 off end	# HSUART1
+		device pci 1e.4 off end	# HSUART2
+		device pci 1e.5 off end	# SPI
 		device pci 1f.0 on
 			chip ec/google/chromeec
 				# We only have one init function that
diff --git a/src/mainboard/google/stout/devicetree.cb b/src/mainboard/google/stout/devicetree.cb
index 653d3fe..9f596d3 100644
--- a/src/mainboard/google/stout/devicetree.cb
+++ b/src/mainboard/google/stout/devicetree.cb
@@ -4,12 +4,12 @@ chip northbridge/intel/sandybridge
 	register "gpu_dp_d_hotplug" = "0x06"
 
 	# Enable Panel as LVDS and configure power delays
-	register "gpu_panel_port_select" = "0"                  # LVDS
-	register "gpu_panel_power_cycle_delay" = "5"            # T4: 400ms
-	register "gpu_panel_power_up_delay" = "400"             # T1+T2: 40ms
-	register "gpu_panel_power_down_delay" = "150"           # T3: 15ms
-	register "gpu_panel_power_backlight_on_delay" = "2100"  # T5: 210ms
-	register "gpu_panel_power_backlight_off_delay" = "2100" # TD: 210ms
+	register "gpu_panel_port_select" = "0"			# LVDS
+	register "gpu_panel_power_cycle_delay" = "5"		# T4: 400ms
+	register "gpu_panel_power_up_delay" = "400"		# T1+T2: 40ms
+	register "gpu_panel_power_down_delay" = "150"		# T3: 15ms
+	register "gpu_panel_power_backlight_on_delay" = "2100"	# T5: 210ms
+	register "gpu_panel_power_backlight_off_delay" = "2100"	# TD: 210ms
 
 	device cpu_cluster 0 on
 		chip cpu/intel/socket_rPGA989
@@ -50,9 +50,9 @@ chip northbridge/intel/sandybridge
 			register "pirqh_routing" = "0x80"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
 			register "alt_gp_smi_en" = "0x0002"
 			register "gpi1_routing" = "1"
 			register "gpi6_routing" = "2"
@@ -73,25 +73,25 @@ chip northbridge/intel/sandybridge
 			# Enable zero-based linear PCIe root port functions
 			register "pcie_port_coalesce" = "1"
 
-			device pci 14.0 on end # USB 3.0 Controller
-			device pci 16.0 on end # Management Engine Interface 1
-			device pci 16.1 off end # Management Engine Interface 2
-			device pci 16.2 off end # Management Engine IDE-R
-			device pci 16.3 off end # Management Engine KT
-			device pci 19.0 off end # Intel Gigabit Ethernet
-			device pci 1a.0 on end # USB2 EHCI #2 (AUO4, BlueTooth)
-			device pci 1b.0 on end # High Definition Audio
-			device pci 1c.0 on end # PCIe Port #1
-			device pci 1c.1 on end # PCIe Port #2 (WLAN)
-			device pci 1c.2 on end # PCIe Port #3 (Card Reader)
+			device pci 14.0 on end	# USB 3.0 Controller
+			device pci 16.0 on end	# Management Engine Interface 1
+			device pci 16.1 off end	# Management Engine Interface 2
+			device pci 16.2 off end	# Management Engine IDE-R
+			device pci 16.3 off end	# Management Engine KT
+			device pci 19.0 off end	# Intel Gigabit Ethernet
+			device pci 1a.0 on end	# USB2 EHCI #2 (AUO4, BlueTooth)
+			device pci 1b.0 on end	# High Definition Audio
+			device pci 1c.0 on end	# PCIe Port #1
+			device pci 1c.1 on end	# PCIe Port #2 (WLAN)
+			device pci 1c.2 on end	# PCIe Port #3 (Card Reader)
 				register "pcie_aspm_f2" = "0x3"
-			device pci 1c.3 off end # PCIe Port #4
-			device pci 1c.4 off end # PCIe Port #5
-			device pci 1c.5 on end # PCIe Port #6 (LAN)
-			device pci 1c.6 off end # PCIe Port #7
-			device pci 1c.7 off end # PCIe Port #8
-			device pci 1d.0 on end # USB2 EHCI #1 (Camera, WLAN, WWAN)
-			device pci 1e.0 off end # PCI bridge
+			device pci 1c.3 off end	# PCIe Port #4
+			device pci 1c.4 off end	# PCIe Port #5
+			device pci 1c.5 on end	# PCIe Port #6 (LAN)
+			device pci 1c.6 off end	# PCIe Port #7
+			device pci 1c.7 off end	# PCIe Port #8
+			device pci 1d.0 on end	# USB2 EHCI #1 (Camera, WLAN, WWAN)
+			device pci 1e.0 off end	# PCI bridge
 			device pci 1f.0 on
 				chip ec/quanta/it8518
 					# 60h/64h KBC
@@ -99,10 +99,10 @@ chip northbridge/intel/sandybridge
 					end
 				end
 			end # LPC bridge
-			device pci 1f.2 on end # SATA Controller 1 (HDD/SSD)
-			device pci 1f.3 on end # SMBus Controller
-			device pci 1f.5 off end # SATA Controller 2 (MSATA)
-			device pci 1f.6 off end # Thermal
+			device pci 1f.2 on end	# SATA Controller 1 (HDD/SSD)
+			device pci 1f.3 on end	# SMBus Controller
+			device pci 1f.5 off end	# SATA Controller 2 (MSATA)
+			device pci 1f.6 off end	# Thermal
 		end
 	end
 end
diff --git a/src/mainboard/hp/dl145_g1/devicetree.cb b/src/mainboard/hp/dl145_g1/devicetree.cb
index c955ac3..b597d94 100644
--- a/src/mainboard/hp/dl145_g1/devicetree.cb
+++ b/src/mainboard/hp/dl145_g1/devicetree.cb
@@ -7,73 +7,73 @@ chip northbridge/amd/amdk8/root_complex
 	device domain 0 on
 		subsystemid 0x1022 0x7460 inherit
 		chip northbridge/amd/amdk8
-			device pci 18.0 on end # link 0
-			device pci 18.0 on end # link 1
-			device pci 18.0 on     # link 2
+			device pci 18.0 on end	# link 0
+			device pci 18.0 on end	# link 1
+			device pci 18.0 on	# link 2
 				chip southbridge/amd/amd8131
 					# the on/off keyword is mandatory
 					device pci 0.0 on # PCIX Bridge A
 						# PCI-X expansion slot cards auto-detected here
 					end
-					device pci 0.1 on end  # IOAPIC A
-					device pci 1.0 on      # PCIX Bridge B
+					device pci 0.1 on end	# IOAPIC A
+					device pci 1.0 on	# PCIX Bridge B
 						# On-board BCM5704 dual port ethernet chip auto-detected here
 						# Optional SCSI board also (?)
 					end
-					device pci 1.1 on end  # IOAPIC B
+					device pci 1.1 on end	# IOAPIC B
 					device pci 2.0 off end
 				end
 				chip southbridge/amd/amd8111
 					# this "device pci 0.0" is the parent of the next one
 					# PCI bridge
 					device pci 0.0 on
-						device pci 0.0 on end  # OHCI-based USB controller 0
-						device pci 0.1 on end  # OCHI-based USB controller 1
-						device pci 0.2 on end  # EHCI-based USB2 controller
-						device pci 1.0 off end # LAN Ethernet controller
-						#device pci 4.0 on end # VGA PCI-card (auto detected)
+						device pci 0.0 on end	# OHCI-based USB controller 0
+						device pci 0.1 on end	# OCHI-based USB controller 1
+						device pci 0.2 on end	# EHCI-based USB2 controller
+						device pci 1.0 off end	# LAN Ethernet controller
+						#device pci 4.0 on end	# VGA PCI-card (auto detected)
 					end
 					device pci 1.0 on # LPC Bridge
 						chip superio/winbond/w83627hf
-							device pnp 2e.0 off # Floppy
-								#io  0x60 = 0x3f0
+							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
+							device pnp 2e.1 off	# Parallel Port
+								#io 0x60 = 0x378
 								#irq 0x70 = 7
 								#drq 0x74 = 1
 							end
-							device pnp 2e.2 on  # Com1
-								io  0x60 = 0x3f8
+							device pnp 2e.2 on	# Com1
+								io 0x60 = 0x3f8
 								irq 0x70 = 4
 							end
-							device pnp 2e.3 off # Com2
-								#io  0x60 = 0x2f8
+							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
+							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
 							end
-							device pnp 2e.7 off # GAM_MIDI_GPIO1
-								#io  0x60 = 0x201
-								#io  0x62 = 0x330
+							device pnp 2e.7 off	# GAM_MIDI_GPIO1
+								#io 0x60 = 0x201
+								#io 0x62 = 0x330
 								#irq 0x70 = 9
 							end
-							device pnp 2e.8 on  # GPIO2 (watchdog timer)
+							device pnp 2e.8 on	# GPIO2 (watchdog timer)
 							end
-							device pnp 2e.9 on  # GPIO3
+							device pnp 2e.9 on	# GPIO3
 							end
-							device pnp 2e.a on  # ACPI
+							device pnp 2e.a on	# ACPI
 							end
-							device pnp 2e.b on  # HW Monitor
-								io  0x60 = 0x290
+							device pnp 2e.b on	# HW Monitor
+								io 0x60 = 0x290
 								irq 0x70 = 5
 							end
 						end
@@ -121,14 +121,14 @@ chip northbridge/amd/amdk8/root_complex
 					end
 					device pci 1.2 on
 						chip drivers/generic/generic
-							device i2c 69 on end  # Texas Instruments cdc960 clock synthesizer
+							device i2c 69 on end # Texas Instruments cdc960 clock synthesizer
 						end
 					end # SMBus 2.0 controller
-					device pci 1.3 on     # System management registers (ACPI)
+					device pci 1.3 on	# System management registers (ACPI)
 					end # System management
 					#device pci 1.4 off end
-					device pci 1.5 off end # AC97 Audio
-					device pci 1.6 off end # AC97 Modem
+					device pci 1.5 off end	# AC97 Audio
+					device pci 1.6 off end	# AC97 Modem
 					register "ide0_enable" = "1"
 					register "ide1_enable" = "1"
 				end
@@ -139,4 +139,3 @@ chip northbridge/amd/amdk8/root_complex
 		end
 	end
 end
-
diff --git a/src/mainboard/hp/dl145_g3/devicetree.cb b/src/mainboard/hp/dl145_g3/devicetree.cb
index 7012cf9..3591d7b 100644
--- a/src/mainboard/hp/dl145_g3/devicetree.cb
+++ b/src/mainboard/hp/dl145_g3/devicetree.cb
@@ -5,73 +5,68 @@ chip northbridge/amd/amdk8/root_complex
 		end
 	end
 	device domain 0 on
-		chip northbridge/amd/amdk8  # northbridge
-			device pci 18.0 on  # devices on link 0
+		chip northbridge/amd/amdk8	# northbridge
+			device pci 18.0 on	# devices on link 0
 				chip southbridge/broadcom/bcm21000 # HT2100
-					device pci 0.0 on
-					end   # bridge to slot PCI-E 4x ??
-					device pci 1.0 on
-					end
-					device pci 2.0 on
-					end  # unused
-					device pci 3.0 on  	# bridge to slot PCI-E 16x ??
-					end
-					device pci 4.0 on
-					end  # unused
+					device pci 0.0 on end	# bridge to slot PCI-E 4x ??
+					device pci 1.0 on end
+					device pci 2.0 on end	# unused
+					device pci 3.0 on end	# bridge to slot PCI-E 16x ??
+					device pci 4.0 on end	# unused
 					device pci 5.0 on
 						device pci 4.0 on end # BCM5715 NIC
 						device pci 4.1 on end # BCM5715 NIC
 					end
 				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 # PCI/PCI-X bridge 0x0104
 						device pci e.0 on end # SATA 0x024a
 					end
-					device pci 1.0 on end # Legacy  pci main  0x0205
-					device pci 1.1 on end # IDE	0x0214
-					device pci 1.2 on     # LPC	0x0234
+					device pci 1.0 on end	# Legacy pci main 0x0205
+					device pci 1.1 on end	# IDE	0x0214
+					device pci 1.2 on	# LPC	0x0234
 						chip superio/nsc/pc87417
-							device  pnp 4e.0 off  # Floppy
+							device pnp 4e.0 off	# Floppy
 								io 0x60 = 0x3f0
 								irq 0x70 = 6
 								drq 0x74 = 2
 							end
-							device pnp 4e.1 off  # Parallel Port
-									io 0x60 = 0x378
+							device pnp 4e.1 off	# Parallel Port
+								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 4e.2 off # Com 2
-									io 0x60 = 0x2f8
+							device pnp 4e.2 off	# Com 2
+								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 4e.3 off  # Com 1
-									io 0x60 = 0x3f8
+							device pnp 4e.3 off	# Com 1
+								io 0x60 = 0x3f8
 								irq 0x70 = 4
 							end
-							device pnp 4e.4 off end # SWC
-							device pnp 4e.5 off end # Mouse
-							device pnp 4e.6 off  # Keyboard
-									io 0x60 = 0x60
-									io 0x62 = 0x64
+							device pnp 4e.4 off end	# SWC
+							device pnp 4e.5 off end	# Mouse
+							device pnp 4e.6 off	# Keyboard
+								io 0x60 = 0x60
+								io 0x62 = 0x64
 								irq 0x70 = 1
 							end
-							device pnp 4e.7 off end # GPIO
-							device pnp 4e.f off end # XBUS
-							device pnp 4e.10 on #RTC
+							device pnp 4e.7 off end	# GPIO
+							device pnp 4e.f off end	# XBUS
+							device pnp 4e.10 on	#RTC
 								io 0x60 = 0x70
 								io 0x62 = 0x72
 							end
 						end # end superio
 					end # end pci 1.2
-					device pci 1.3 off 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.1 on end # USB
-					device pci 2.2 on end # USB
-					device pci 3.0 on end # VGA
+					device pci 1.3 off 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.1 on end	# USB
+					device pci 2.2 on end	# USB
+					device pci 3.0 on end	# VGA
 				end
 			end
 			device pci 18.0 on end
@@ -79,9 +74,6 @@ chip northbridge/amd/amdk8/root_complex
 			device pci 18.1 on end
 			device pci 18.2 on end
 			device pci 18.3 on end
-      end # amdk8
-
-   end #domain
+		end # amdk8
+	end #domain
 end
-
-
diff --git a/src/mainboard/hp/dl165_g6_fam10/devicetree.cb b/src/mainboard/hp/dl165_g6_fam10/devicetree.cb
index 2dbcb9b..d83ba91 100644
--- a/src/mainboard/hp/dl165_g6_fam10/devicetree.cb
+++ b/src/mainboard/hp/dl165_g6_fam10/devicetree.cb
@@ -5,75 +5,70 @@ chip northbridge/amd/amdfam10/root_complex
 		end
 	end
 	device domain 0 on
-		chip northbridge/amd/amdfam10  # northbridge
+		chip northbridge/amd/amdfam10	# northbridge
 			device pci 18.0 on end
 			device pci 18.0 on end
-			device pci 18.0 on  # devices on link 2
+			device pci 18.0 on	# devices on link 2
 				chip southbridge/broadcom/bcm21000 # HT2100
-					device pci 0.0 on
-					end   # bridge to slot PCI-E 4x ??
-					device pci 1.0 on
-					end
-					device pci 2.0 on
-					end  # unused
-					device pci 3.0 on  	# bridge to slot PCI-E 16x ??
-					end
-					device pci 4.0 on
-					end  # unused
+					device pci 0.0 on end	# bridge to slot PCI-E 4x ??
+					device pci 1.0 on end
+					device pci 2.0 on end	# unused
+					device pci 3.0 on end	# bridge to slot PCI-E 16x ??
+					device pci 4.0 on end	# unused
 					device pci 5.0 on
 						device pci 4.0 on end # BCM5715 NIC
 						device pci 4.1 on end # BCM5715 NIC
 					end
 				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 # PCI/PCI-X bridge 0x0104
 						device pci e.0 on end # SATA 0x024a
 					end
-					device pci 1.0 on end # Legacy  pci main  0x0205
-					device pci 1.1 on end # IDE	0x0214
-					device pci 1.2 on     # LPC	0x0234
+					device pci 1.0 on end	# Legacy pci main 0x0205
+					device pci 1.1 on end	# IDE	0x0214
+					device pci 1.2 on	# LPC	0x0234
 						chip superio/nsc/pc87417
-							device  pnp 4e.0 off  # Floppy
+							device pnp 4e.0 off	# Floppy
 								io 0x60 = 0x3f0
 								irq 0x70 = 6
 								drq 0x74 = 2
 							end
-							device pnp 4e.1 off  # Parallel Port
-									io 0x60 = 0x378
+							device pnp 4e.1 off	# Parallel Port
+								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 4e.2 off # Com 2
-									io 0x60 = 0x2f8
+							device pnp 4e.2 off	# Com 2
+								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 4e.3 off  # Com 1
-									io 0x60 = 0x3f8
+							device pnp 4e.3 off	# Com 1
+								io 0x60 = 0x3f8
 								irq 0x70 = 4
 							end
-							device pnp 4e.4 off end # SWC
-							device pnp 4e.5 off end # Mouse
-							device pnp 4e.6 off  # Keyboard
-									io 0x60 = 0x60
-									io 0x62 = 0x64
+							device pnp 4e.4 off end	# SWC
+							device pnp 4e.5 off end	# Mouse
+							device pnp 4e.6 off	# Keyboard
+								io 0x60 = 0x60
+								io 0x62 = 0x64
 								irq 0x70 = 1
 							end
-							device pnp 4e.7 off end # GPIO
-							device pnp 4e.f off end # XBUS
-							device pnp 4e.10 on #RTC
+							device pnp 4e.7 off end	# GPIO
+							device pnp 4e.f off end	# XBUS
+							device pnp 4e.10 on	#RTC
 								io 0x60 = 0x70
 								io 0x62 = 0x72
 							end
 						end # end superio
 					end # end pci 1.2
-					device pci 1.3 off 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.1 on end # USB
-					device pci 2.2 on end # USB
-					device pci 3.0 on end # VGA
+					device pci 1.3 off 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.1 on end	# USB
+					device pci 2.2 on end	# USB
+					device pci 3.0 on end	# VGA
 				end
 			end
 			device pci 18.0 on end
@@ -82,9 +77,6 @@ chip northbridge/amd/amdfam10/root_complex
 			device pci 18.2 on end
 			device pci 18.3 on end
 			device pci 18.4 on end
-      end # amdfam10
-
-   end #domain
+		end # amdfam10
+	end #domain
 end
-
-
diff --git a/src/mainboard/hp/e_vectra_p2706t/devicetree.cb b/src/mainboard/hp/e_vectra_p2706t/devicetree.cb
index 7de0c83..b73b982 100644
--- a/src/mainboard/hp/e_vectra_p2706t/devicetree.cb
+++ b/src/mainboard/hp/e_vectra_p2706t/devicetree.cb
@@ -1,59 +1,58 @@
 # TODO: i810E actually!
 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 on end			# Onboard VGA
-    chip southbridge/intel/i82801ax		# Southbridge
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
+	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 on end			# Onboard VGA
+		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
-        # TODO: PC87364 actually!
-        # TODO: Check Super I/O settings and compare to superiotool -d.
-        chip superio/nsc/pc87360		# Super I/O
-          device pnp 2e.0 on			# 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			# Com2
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 2e.3 on			# Com1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 2e.4 off end		# SWC
-          device pnp 2e.5 off end		# PS/2 mouse
-          device pnp 2e.6 on			# PS/2 keyboard
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1
-          end
-          device pnp 2e.7 off end		# GPIO
-          device pnp 2e.8 off end		# ACB
-          device pnp 2e.9 off end		# FSCM
-          device pnp 2e.a off end		# WDT
-        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
+				# TODO: PC87364 actually!
+				# TODO: Check Super I/O settings and compare to superiotool -d.
+				chip superio/nsc/pc87360		# Super I/O
+					device pnp 2e.0 on			# 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			# Com2
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 2e.3 on			# Com1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 2e.4 off end		# SWC
+					device pnp 2e.5 off end		# PS/2 mouse
+					device pnp 2e.6 on			# PS/2 keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1
+					end
+					device pnp 2e.7 off end		# GPIO
+					device pnp 2e.8 off end		# ACB
+					device pnp 2e.9 off end		# FSCM
+					device pnp 2e.a off end		# WDT
+				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/hp/pavilion_m6_1035dx/devicetree.cb b/src/mainboard/hp/pavilion_m6_1035dx/devicetree.cb
index 683d9ad..6bf6a65 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/devicetree.cb
+++ b/src/mainboard/hp/pavilion_m6_1035dx/devicetree.cb
@@ -29,23 +29,23 @@ chip northbridge/amd/agesa/family15tn/root_complex
 		chip northbridge/amd/agesa/family15tn # CPU 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 1.0 on  end # Internal Graphics P2P bridge 0x99XX
-				device pci 1.1 on  end # Internal Multimedia
+				device pci 0.0 on end	# Root Complex
+				device pci 1.0 on end	# Internal Graphics P2P bridge 0x99XX
+				device pci 1.1 on end	# Internal Multimedia
 				device pci 3.0 off end
-				device pci 4.0 on  end # PCIE MINI0
-				device pci 5.0 on  end # PCIE MINI1
-				device pci 8.0 off end # NB/SB Link P2P bridge
+				device pci 4.0 on end	# PCIE MINI0
+				device pci 5.0 on end	# PCIE MINI1
+				device pci 8.0 off end	# NB/SB Link P2P bridge
 			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
-				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      # SMBUS
+				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	# SMBUS
 					chip drivers/generic/generic #dimm 0
 						device i2c 50 on end # 7-bit SPD address
 					end
@@ -53,21 +53,21 @@ chip northbridge/amd/agesa/family15tn/root_complex
 						device i2c 51 on end # 7-bit SPD address
 					end
 				end # SM
-				device pci 14.2 on  end # HDA	0x4383
-				device pci 14.3 on  # LPC	0x439d
+				device pci 14.2 on end	# HDA	0x4383
+				device pci 14.3 on	# LPC	0x439d
 					chip ec/compal/ene932
 						# 60/64 KBC
 						device pnp ff.1 on end # dummy address
 					end
 				end
-				device pci 14.4 on  end # PCI	0x4384 # PCI-b conflict with GPIO.
-				device pci 14.5 on  end # USB 2
-				device pci 14.6 off end # Gec
-				device pci 14.7 on  end # SD
-				device pci 15.0 off end # PCIe 0
-				device pci 15.1 off end # PCIe 1
-				device pci 15.2 off end # PCIe 2
-				device pci 15.3 off end # PCIe 3
+				device pci 14.4 on end	# PCI	0x4384 # PCI-b conflict with GPIO.
+				device pci 14.5 on end	# USB 2
+				device pci 14.6 off end	# Gec
+				device pci 14.7 on end	# SD
+				device pci 15.0 off end	# PCIe 0
+				device pci 15.1 off end	# PCIe 1
+				device pci 15.2 off end	# PCIe 2
+				device pci 15.3 off end	# PCIe 3
 				register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				register "gpp_configuration" = "4"
 			end	#chip southbridge/amd/hudson
diff --git a/src/mainboard/ibase/mb899/devicetree.cb b/src/mainboard/ibase/mb899/devicetree.cb
index c304908..fba768d 100644
--- a/src/mainboard/ibase/mb899/devicetree.cb
+++ b/src/mainboard/ibase/mb899/devicetree.cb
@@ -22,9 +22,9 @@ chip northbridge/intel/i945
 			register "pirqh_routing" = "0x06"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
 			register "gpi13_routing" = "1"
 
 			register "ide_legacy_combined" = "0x0"
@@ -96,9 +96,9 @@ chip northbridge/intel/i945
 					end
 				end # chip superio/winbond/w83627ehg
 			end # LPC bridge
-			device pci 1f.1 on end  # IDE
-			device pci 1f.2 on end  # SATA
-			device pci 1f.3 on end  # SMBus
+			device pci 1f.1 on end	# IDE
+			device pci 1f.2 on end	# SATA
+			device pci 1f.3 on end	# SMBus
 			# device pci 1f.4 off end # Realtek ID Codec
 		end # chip southbridge/intel/i82801gx
 
diff --git a/src/mainboard/ibm/e325/devicetree.cb b/src/mainboard/ibm/e325/devicetree.cb
index bdaee50..a83d30d 100644
--- a/src/mainboard/ibm/e325/devicetree.cb
+++ b/src/mainboard/ibm/e325/devicetree.cb
@@ -6,8 +6,8 @@ chip northbridge/amd/amdk8/root_complex
 	end
 	device domain 0 on
 		chip northbridge/amd/amdk8
-			device pci 18.0 on end # LDT 0
-			device pci 18.0 on     # LDT 1
+			device pci 18.0 on end	# LDT 0
+			device pci 18.0 on	# LDT 1
 				chip southbridge/amd/amd8131
 					device pci 0.0 on end
 					device pci 0.1 on end
@@ -23,34 +23,34 @@ chip northbridge/amd/amdk8/root_complex
 					end
 					device pci 1.0 on
 						chip superio/nsc/pc87366
-							device	pnp 2e.0 off  # Floppy
-								 io 0x60 = 0x3f0
+							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
+							device pnp 2e.1 off	# Parallel Port
+								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 2e.2 off # Com 2
-								 io 0x60 = 0x2f8
+							device pnp 2e.2 off	# Com 2
+								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 2e.3 on  # Com 1
-								 io 0x60 = 0x3f8
+							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
-								 io 0x60 = 0x60
-								 io 0x62 = 0x64
+							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.8 off end # ACB
-							device pnp 2e.9 off end # FSCM
-							device pnp 2e.a off end # WDT
+							device pnp 2e.7 off end	# GPIO
+							device pnp 2e.8 off end	# ACB
+							device pnp 2e.9 off end	# FSCM
+							device pnp 2e.a off end	# WDT
 						end
 					end
 					device pci 1.1 on end
@@ -59,7 +59,7 @@ chip northbridge/amd/amdk8/root_complex
 					device pci 1.5 off end
 					device pci 1.6 off end
 				end
-			end #  device pci 18.0
+			end # device pci 18.0
 			device pci 18.0 on end # LDT2
 			device pci 18.1 on end
 			device pci 18.2 on end
@@ -67,4 +67,3 @@ chip northbridge/amd/amdk8/root_complex
 		end
 	end
 end
-
diff --git a/src/mainboard/ibm/e326/devicetree.cb b/src/mainboard/ibm/e326/devicetree.cb
index 1888987..fefc6a9 100644
--- a/src/mainboard/ibm/e326/devicetree.cb
+++ b/src/mainboard/ibm/e326/devicetree.cb
@@ -7,8 +7,8 @@ chip northbridge/amd/amdk8/root_complex
 
 	device domain 0 on
 		chip northbridge/amd/amdk8
-			device pci 18.0 on end # LDT 0
-			device pci 18.0 on     # LDT 1
+			device pci 18.0 on end	# LDT 0
+			device pci 18.0 on	# LDT 1
 				chip southbridge/amd/amd8131
 					device pci 0.0 on end
 					device pci 0.1 on end
@@ -21,38 +21,38 @@ chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 on end
 						device pci 1.0 off end
-                                               device pci 5.0 on end # ATI Rage XL
+						device pci 5.0 on end # ATI Rage XL
 					end
 					device pci 1.0 on
 						chip superio/nsc/pc87366
-							device	pnp 2e.0 off  # Floppy
-								 io 0x60 = 0x3f0
+							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
+							device pnp 2e.1 off	# Parallel Port
+								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 2e.2 off # Com 2
-								 io 0x60 = 0x2f8
+							device pnp 2e.2 off	# Com 2
+								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 2e.3 on  # Com 1
-								 io 0x60 = 0x3f8
+							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
-								 io 0x60 = 0x60
-								 io 0x62 = 0x64
+							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.8 off end # ACB
-							device pnp 2e.9 off end # FSCM
-							device pnp 2e.a off end # WDT
+							device pnp 2e.7 off end	# GPIO
+							device pnp 2e.8 off end	# ACB
+							device pnp 2e.9 off end	# FSCM
+							device pnp 2e.a off end	# WDT
 						end
 					end
 					device pci 1.1 on end
@@ -63,7 +63,7 @@ chip northbridge/amd/amdk8/root_complex
 					register "ide0_enable" = "1"
 					register "ide1_enable" = "1"
 				end
-			end #  device pci 18.0
+			end # device pci 18.0
 			device pci 18.0 on end # LDT2
 			device pci 18.1 on end
 			device pci 18.2 on end
@@ -71,4 +71,3 @@ chip northbridge/amd/amdk8/root_complex
 		end
 	end
 end
-
diff --git a/src/mainboard/iei/juki-511p/devicetree.cb b/src/mainboard/iei/juki-511p/devicetree.cb
index 4706ff5..cd7a15e 100644
--- a/src/mainboard/iei/juki-511p/devicetree.cb
+++ b/src/mainboard/iei/juki-511p/devicetree.cb
@@ -1,57 +1,56 @@
 chip northbridge/amd/gx1
-  device domain 0 on
-    device pci 0.0 on end
-      chip southbridge/amd/cs5530
+	device domain 0 on
+		device pci 0.0 on end
+			chip southbridge/amd/cs5530
 
-        device pci 12.0 on
-          chip superio/winbond/w83977f
-            device pnp 3f0.0 on		# FDC
-              irq 0x70 = 6
-            end
-            device pnp 3f0.1 on		# Parallel port
-              io 0x60 = 0x378
-              irq 0x70 = 7
-            end
-            device pnp 3f0.2 on		# COM1
-              io 0x60 = 0x3f8
-              irq 0x70 = 4
-            end
-            device pnp 3f0.3 on		# COM2
-              io 0x60 = 0x2f8
-              irq 0x70 = 3
-            end
-            device pnp 3f0.4 on		# RTC
-              io 0x60 = 0x070
-              irq 0x70 = 8
-            end
-            device pnp 3f0.5 on		# Keyboard
-              io 0x60 = 0x60
-              io 0x62 = 0x64
-              irq 0x70 = 1		# Int  1 for PS/2 keyboard
-              irq 0x72 = 12		# Int 12 for PS/2 mouse
-            end
-            device pnp 3f0.6 off	# IR
-            end
-            device pnp 3f0.7 off	# GPIO1
-            end
-            device pnp 3f0.8 off	# GPIO
-            end
-          end
-        device pci 12.1 on 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 12.0 on
+					chip superio/winbond/w83977f
+						device pnp 3f0.0 on		# FDC
+							irq 0x70 = 6
+						end
+						device pnp 3f0.1 on		# Parallel port
+							io 0x60 = 0x378
+							irq 0x70 = 7
+						end
+						device pnp 3f0.2 on		# COM1
+							io 0x60 = 0x3f8
+							irq 0x70 = 4
+						end
+						device pnp 3f0.3 on		# COM2
+							io 0x60 = 0x2f8
+							irq 0x70 = 3
+						end
+						device pnp 3f0.4 on		# RTC
+							io 0x60 = 0x070
+							irq 0x70 = 8
+						end
+						device pnp 3f0.5 on		# Keyboard
+							io 0x60 = 0x60
+							io 0x62 = 0x64
+							irq 0x70 = 1		# Int	1 for PS/2 keyboard
+							irq 0x72 = 12		# Int 12 for PS/2 mouse
+						end
+						device pnp 3f0.6 off	# IR
+						end
+						device pnp 3f0.7 off	# GPIO1
+						end
+						device pnp 3f0.8 off	# GPIO
+						end
+					end
+				device pci 12.1 on end		# SMI
+				device pci 12.2 on end		# IDE
+				device pci 12.3 on end		# Audio
+				device pci 12.4 on end		# VGA onboard
 
-      end
+			end
 
-      device pci 0e.0 on end		# ETH0
-      device pci 13.0 on end		# USB
+			device pci 0e.0 on end		# ETH0
+			device pci 13.0 on end		# USB
 
-    end
-  end
+		end
+	end
 
-  chip cpu/amd/geode_gx1
-  end
+	chip cpu/amd/geode_gx1
+	end
 
 end
-
diff --git a/src/mainboard/iei/kino-780am2-fam10/devicetree.cb b/src/mainboard/iei/kino-780am2-fam10/devicetree.cb
index d5c7033..c8c8af9 100644
--- a/src/mainboard/iei/kino-780am2-fam10/devicetree.cb
+++ b/src/mainboard/iei/kino-780am2-fam10/devicetree.cb
@@ -1,27 +1,27 @@
 # Config for iei/kino-780am2-fam10
 chip northbridge/amd/amdfam10/root_complex
 	device cpu_cluster 0 on
-		chip cpu/amd/socket_AM2r2  #L1 and DDR2
+		chip cpu/amd/socket_AM2r2	#L1 and DDR2
 			 device lapic 0 on end
 		end
 	end
 	device domain 0 on
 		chip northbridge/amd/amdfam10
-			device pci 18.0 on #  northbridge
+			device pci 18.0 on	# northbridge
 				chip southbridge/amd/rs780
-					device pci 0.0 on end # HT  	0x9600
-					device pci 1.0 on end # Internal Graphics P2P bridge 0x9602
-					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x9603
-					device pci 3.0 on end # PCIE P2P bridge	0x960b
-					device pci 4.0 on end # PCIE P2P bridge 0x9604
-					device pci 5.0 on end # PCIE P2P bridge 0x9605
-					device pci 6.0 off end # PCIE P2P bridge 0x9606
-					device pci 7.0 off end # PCIE P2P bridge 0x9607
-					device pci 8.0 off end # NB/SB Link P2P bridge
-					device pci 9.0 on end #
-					device pci a.0 on end #
-					register "gppsb_configuration" = "1"   # Configuration B
-					register "gpp_configuration" = "3"   # Configuration D default
+					device pci 0.0 on end	# HT	0x9600
+					device pci 1.0 on end	# Internal Graphics P2P bridge 0x9602
+					device pci 2.0 on end	# PCIE P2P bridge (external graphics) 0x9603
+					device pci 3.0 on end	# PCIE P2P bridge	0x960b
+					device pci 4.0 on end	# PCIE P2P bridge 0x9604
+					device pci 5.0 on end	# PCIE P2P bridge 0x9605
+					device pci 6.0 off end	# PCIE P2P bridge 0x9606
+					device pci 7.0 off end	# PCIE P2P bridge 0x9607
+					device pci 8.0 off end	# NB/SB Link P2P bridge
+					device pci 9.0 on end	#
+					device pci a.0 on end	#
+					register "gppsb_configuration" = "1"	# Configuration B
+					register "gpp_configuration" = "3"	# Configuration D default
 					register "port_enable" = "0x6fc"
 					register "gfx_dev2_dev3" = "1"
 					register "gfx_dual_slot" = "1"
@@ -32,14 +32,14 @@ chip northbridge/amd/amdfam10/root_complex
 					register "gfx_link_width" = "0"
 				end
 				chip southbridge/amd/sb700 # it is under NB/SB Link, but on the same pri bus
-					device pci 11.0 on end # SATA
-					device pci 12.0 on end # USB
-					device pci 12.1 on end # USB
-					device pci 12.2 on end # USB
-					device pci 13.0 on end # USB
-					device pci 13.1 on end # USB
-					device pci 13.2 on end # USB
-	 				device pci 14.0 on # SM
+					device pci 11.0 on end	# SATA
+					device pci 12.0 on end	# USB
+					device pci 12.1 on end	# USB
+					device pci 12.2 on end	# USB
+					device pci 13.0 on end	# USB
+					device pci 13.1 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
@@ -47,11 +47,11 @@ chip northbridge/amd/amdfam10/root_complex
 							device i2c 51 on end
 						end
 					end # SM
-					device pci 14.1 on end # IDE    0x439c
-					device pci 14.2 on end # HDA    0x4383
-					device pci 14.3 on # LPC	0x439d
+					device pci 14.1 on end	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on	# LPC	0x439d
 						chip superio/fintek/f71859
-							device pnp 2e.3 on #  Com1
+							device pnp 2e.3 on	# Com1
 								io 0x60 = 0x3f8
 								irq 0x70 = 4
 							end
@@ -61,11 +61,10 @@ chip northbridge/amd/amdfam10/root_complex
 					device pci 14.5 on end # USB 2
 					register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				end	#southbridge/amd/sb700
-			end #  device pci 18.0
+			end # device pci 18.0
 			device pci 18.1 on end
 			device pci 18.2 on end
 			device pci 18.3 on end
 		end
 	end #domain
 end #root_complex
-
diff --git a/src/mainboard/iei/nova4899r/devicetree.cb b/src/mainboard/iei/nova4899r/devicetree.cb
index f27662e..902be8a 100644
--- a/src/mainboard/iei/nova4899r/devicetree.cb
+++ b/src/mainboard/iei/nova4899r/devicetree.cb
@@ -1,64 +1,63 @@
 chip northbridge/amd/gx1
-  device domain 0 on
-    device pci 0.0 on end
-      chip southbridge/amd/cs5530
-        device pci 0a.0 on  end		# ETH0
-        device pci 0b.0 off end		# ETH1
-        device pci 0c.0 on  end		# ETH2
-        device pci 0f.0 on  end		# PCI slot
-        device pci 12.0 on
-          chip superio/winbond/w83977tf
-            device pnp 2e.0 on		# FDC
-              irq 0x70 = 6
-            end
-            device pnp 2e.1 on		# 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.4 off		# Reserved
-            end
-            device pnp 2e.5 on		# Keyboard
-               io 0x60 = 0x60
-               io 0x62 = 0x64
-              irq 0x70 = 0x01		# Int  1 for PS/2 keyboard
-              irq 0x72 = 0x0c		# Int 12 for PS/2 mouse
-            end
-            device pnp 2e.6 on		# IR
-               io 0x60 = 0x2e8
-              irq 0x70 = 3
-            end
-            device pnp 2e.7 on		# GAME/MIDI/GPIO1
-               io 0x60 = 0x290
-            end
-            device pnp 2e.8 on		# GPIO2
-               io 0x60 = 0x110
-            end
-            device pnp 2e.9 on		# GPIO3
-               io 0x60 = 0x120
-            end
-            device pnp 2e.A on		# Power Management
-               io 0x60 = 0xe800
-            end
-          end
-        device pci 12.1 on  end		# SMI
-        device pci 12.2 on  end		# IDE
-        device pci 12.3 on  end		# Audio
-        device pci 12.4 on  end		# VGA onboard
-      end
-      device pci 13.0 on end		# USB
-    end
-  end
+	device domain 0 on
+		device pci 0.0 on end
+			chip southbridge/amd/cs5530
+				device pci 0a.0 on end		# ETH0
+				device pci 0b.0 off end		# ETH1
+				device pci 0c.0 on end		# ETH2
+				device pci 0f.0 on end		# PCI slot
+				device pci 12.0 on
+					chip superio/winbond/w83977tf
+						device pnp 2e.0 on		# FDC
+							irq 0x70 = 6
+						end
+						device pnp 2e.1 on		# 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.4 off		# Reserved
+						end
+						device pnp 2e.5 on		# Keyboard
+							 io 0x60 = 0x60
+							 io 0x62 = 0x64
+							irq 0x70 = 0x01		# Int	1 for PS/2 keyboard
+							irq 0x72 = 0x0c		# Int 12 for PS/2 mouse
+						end
+						device pnp 2e.6 on		# IR
+							 io 0x60 = 0x2e8
+							irq 0x70 = 3
+						end
+						device pnp 2e.7 on		# GAME/MIDI/GPIO1
+							 io 0x60 = 0x290
+						end
+						device pnp 2e.8 on		# GPIO2
+							 io 0x60 = 0x110
+						end
+						device pnp 2e.9 on		# GPIO3
+							 io 0x60 = 0x120
+						end
+						device pnp 2e.A on		# Power Management
+							 io 0x60 = 0xe800
+						end
+					end
+				device pci 12.1 on end		# SMI
+				device pci 12.2 on end		# IDE
+				device pci 12.3 on end		# Audio
+				device pci 12.4 on end		# VGA onboard
+			end
+			device pci 13.0 on end		# USB
+		end
+	end
 
-  chip cpu/amd/geode_gx1
-  end
+	chip cpu/amd/geode_gx1
+	end
 
 end
-
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb b/src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb
index a6dba30..5284fcc 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb
+++ b/src/mainboard/iei/pcisa-lx-800-r10/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"
@@ -73,4 +73,3 @@ chip northbridge/amd/lx
 		end
 	end
 end
-
diff --git a/src/mainboard/iei/pm-lx-800-r11/devicetree.cb b/src/mainboard/iei/pm-lx-800-r11/devicetree.cb
index 2bf4b7f..2e5cbe1 100644
--- a/src/mainboard/iei/pm-lx-800-r11/devicetree.cb
+++ b/src/mainboard/iei/pm-lx-800-r11/devicetree.cb
@@ -25,14 +25,14 @@ chip northbridge/amd/lx
 		device pci 1.1 on end					# Video Adapter
 		device pci 1.2 on end					# AES Security Block
 		chip southbridge/amd/cs5536
-			register "lpc_serirq_enable" =   "0x0000115a"
-			register "lpc_serirq_polarity" = "0x0000eea5"
+			register "lpc_serirq_enable"	= "0x0000115a"
+			register "lpc_serirq_polarity"	= "0x0000eea5"
 			register "lpc_serirq_mode" = "1"
 			register "enable_gpio_int_route" = "0x0d0c0700"
 			register "enable_ide_nand_flash" = "0"
 			register "enable_USBP4_device" = "0"		# 0:host, 1:device
 			register "enable_USBP4_overcurrent" = "0"
-			register "com1_enable" = "1"                    # CN10 (RS422/486 COM3)
+			register "com1_enable" = "1"			# CN10 (RS422/486 COM3)
 			register "com1_address" = "0x3e8"
 			register "com1_irq" = "5"
 			register "com2_enable" = "0"
@@ -49,7 +49,7 @@ chip northbridge/amd/lx
 					device pnp 2e.1 on		# Parallel port
 						io 0x60 = 0x378
 						irq 0x70 = 7
-					        drq 0x74 = 3
+						drq 0x74 = 3
 					end
 
 					device pnp 2e.2 on		# COM1
@@ -72,7 +72,7 @@ chip northbridge/amd/lx
 					device pnp 2e.b on		# HW Monitor
 						io 0x60 = 0x290
 						irq 0x70 = 0
-                                        end
+					end
 
 					device pnp 2e.6 off end		# Serial Flash Interface
 					device pnp 2e.7 off end		# GPIO1, GPIO6, Game Port & MIDI Port
diff --git a/src/mainboard/intel/baskingridge/devicetree.cb b/src/mainboard/intel/baskingridge/devicetree.cb
index a173aaa..faf635e 100644
--- a/src/mainboard/intel/baskingridge/devicetree.cb
+++ b/src/mainboard/intel/baskingridge/devicetree.cb
@@ -42,9 +42,9 @@ chip northbridge/intel/haswell
 			register "pirqh_routing" = "0x80"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
 			register "gpi1_routing" = "1"
 			register "gpi14_routing" = "2"
 			register "alt_gp_smi_en" = "0x0000"
diff --git a/src/mainboard/intel/bayleybay_fsp/devicetree.cb b/src/mainboard/intel/bayleybay_fsp/devicetree.cb
index befd3dc..2e657ff 100644
--- a/src/mainboard/intel/bayleybay_fsp/devicetree.cb
+++ b/src/mainboard/intel/bayleybay_fsp/devicetree.cb
@@ -20,22 +20,22 @@
 chip soc/intel/fsp_baytrail
 
 	#### ACPI Register Settings ####
-	register "fadt_pm_profile" = "PM_MOBILE"
-	register "fadt_boot_arch"  = "ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042"
+	register "fadt_pm_profile"	= "PM_MOBILE"
+	register "fadt_boot_arch"	= "ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042"
 
 	#### FSP register settings ####
-	register "SataMode"             = "SATA_MODE_AHCI"
-	register "MrcInitSPDAddr1"      = "SPD_ADDR_DEFAULT"
-	register "MrcInitSPDAddr2"      = "SPD_ADDR_DEFAULT"
-	register "MrcInitTsegSize"      = "TSEG_SIZE_DEFAULT"
-	register "MrcInitMmioSize"      = "MMIO_SIZE_DEFAULT"
-	register "eMMCBootMode"         = "EMMC_FOLLOWS_DEVICETREE"
-	register "IgdDvmt50PreAlloc"    = "IGD_MEMSIZE_DEFAULT"
-	register "ApertureSize"         = "APERTURE_SIZE_DEFAULT"
-	register "GttSize"              = "GTT_SIZE_DEFAULT"
-	register "LpssSioEnablePciMode" = "LPSS_PCI_MODE_DEFAULT"
-	register "AzaliaAutoEnable"     = "AZALIA_FOLLOWS_DEVICETREE"
-	register "LpeAcpiModeEnable"    = "LPE_ACPI_MODE_DISABLED"
+	register "SataMode"		= "SATA_MODE_AHCI"
+	register "MrcInitSPDAddr1"	= "SPD_ADDR_DEFAULT"
+	register "MrcInitSPDAddr2"	= "SPD_ADDR_DEFAULT"
+	register "MrcInitTsegSize"	= "TSEG_SIZE_DEFAULT"
+	register "MrcInitMmioSize"	= "MMIO_SIZE_DEFAULT"
+	register "eMMCBootMode"		= "EMMC_FOLLOWS_DEVICETREE"
+	register "IgdDvmt50PreAlloc"	= "IGD_MEMSIZE_DEFAULT"
+	register "ApertureSize"		= "APERTURE_SIZE_DEFAULT"
+	register "GttSize"		= "GTT_SIZE_DEFAULT"
+	register "LpssSioEnablePciMode"	= "LPSS_PCI_MODE_DEFAULT"
+	register "AzaliaAutoEnable"	= "AZALIA_FOLLOWS_DEVICETREE"
+	register "LpeAcpiModeEnable"	= "LPE_ACPI_MODE_DISABLED"
 
 	device cpu_cluster 0 on
 		device lapic 0 on end
@@ -44,7 +44,7 @@ chip soc/intel/fsp_baytrail
 	device domain 0 on
 		device pci 00.0 on end	# 8086 0F00 - SoC router
 		device pci 02.0 on end	# 8086 0F31 - GFX
-		device pci 03.0 off end # 8086 0F38 - MIPI - camera interface
+		device pci 03.0 off end	# 8086 0F38 - MIPI - camera interface
 
 		device pci 10.0 off end	# 8086 0F14 - EMMC 4.1 Port (MMC1 pins) - (DO NOT USE) - Only 1 EMMC port at a time
 		device pci 11.0 on end	# 8086 0F15 - SDIO Port (SD2 pins)
@@ -52,16 +52,16 @@ chip soc/intel/fsp_baytrail
 		device pci 13.0 on end	# 8086 0F23 - SATA AHCI (0F20, 0F21, 0F22, 0F23)
 		device pci 14.0 on end	# 8086 0F35 - USB XHCI - Only 1 USB controller at a time
 		device pci 15.0 off end	# 8086 0F28 - LP Engine Audio
-		device pci 16.0 off end # 8086 0F37 - OTG controller
+		device pci 16.0 off end	# 8086 0F37 - OTG controller
 		device pci 17.0 on end	# 8086 0F50 - EMMC 4.5 Port (MMC1 pins) - Only 1 EMMC port at a time
 		device pci 18.0 on end	# 8086 0F40 - SIO - DMA
-		device pci 18.1 on end	# 8086 0F41 -   I2C Port 1
-		device pci 18.2 on end	# 8086 0F42 -   I2C Port 2
-		device pci 18.3 on end	# 8086 0F43 -   I2C Port 3
-		device pci 18.4 on end	# 8086 0F44 -   I2C Port 4
-		device pci 18.5 on end	# 8086 0F45 -   I2C Port 5
-		device pci 18.6 on end	# 8086 0F46 -   I2C Port 6
-		device pci 18.7 on end	# 8086 0F47 -   I2C Port 7
+		device pci 18.1 on end	# 8086 0F41 -	I2C Port 1
+		device pci 18.2 on end	# 8086 0F42 -	I2C Port 2
+		device pci 18.3 on end	# 8086 0F43 -	I2C Port 3
+		device pci 18.4 on end	# 8086 0F44 -	I2C Port 4
+		device pci 18.5 on end	# 8086 0F45 -	I2C Port 5
+		device pci 18.6 on end	# 8086 0F46 -	I2C Port 6
+		device pci 18.7 on end	# 8086 0F47 -	I2C Port 7
 		device pci 1a.0 on end	# 8086 0F18 - Trusted Execution Engine
 		device pci 1b.0 on end	# 8086 0F04 - HD Audio
 		device pci 1c.0 on end	# 8086 0F48 - PCIe Root Port 1 (x4 slot)
@@ -70,11 +70,11 @@ chip soc/intel/fsp_baytrail
 		device pci 1c.3 on end	# 8086 0F4E - PCIe Root Port 4 (rear x1 slot)
 		device pci 1d.0 off end	# 8086 0F34 - USB EHCI - Only 1 USB controller at a time
 		device pci 1e.0 on end	# 8086 0F06 - SIO - DMA
-		device pci 1e.1 on end	# 8086 0F08 -   PWM 1
-		device pci 1e.2 on end	# 8086 0F09 -   PWM 2
-		device pci 1e.3 on end	# 8086 0F0A -   HSUART 1
-		device pci 1e.4 on end	# 8086 0F0C -   HSUART 2
-		device pci 1e.5 on end	# 8086 0F0E -   SPI
+		device pci 1e.1 on end	# 8086 0F08 -	PWM 1
+		device pci 1e.2 on end	# 8086 0F09 -	PWM 2
+		device pci 1e.3 on end	# 8086 0F0A -	HSUART 1
+		device pci 1e.4 on end	# 8086 0F0C -	HSUART 2
+		device pci 1e.5 on end	# 8086 0F0E -	SPI
 		device pci 1f.0 on end	# 8086 0F1C - LPC bridge
 		device pci 1f.3 on end	# 8086 0F12 - SMBus 0
 	end
diff --git a/src/mainboard/intel/d810e2cb/devicetree.cb b/src/mainboard/intel/d810e2cb/devicetree.cb
index 8b67c5a..2caac6b 100644
--- a/src/mainboard/intel/d810e2cb/devicetree.cb
+++ b/src/mainboard/intel/d810e2cb/devicetree.cb
@@ -18,65 +18,65 @@
 ## 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_FC_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		# Chipset Graphics Controller (CGC)
-    chip southbridge/intel/i82801bx     # 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/i82810			# Northbridge
+	device cpu_cluster 0 on			# APIC cluster
+		chip cpu/intel/socket_FC_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			# Chipset Graphics Controller (CGC)
+		chip southbridge/intel/i82801bx		# 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 1e.0 on end		# PCI bridge
-      device pci 1f.0 on                # ISA bridge
-        chip superio/smsc/smscsuperio   # Super I/O (SMSC LPC47M102)
-          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 = 4
-          end
-          device pnp 4e.4 on            # COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 4e.5 off end       # COM2
-          device pnp 4e.7 on            # PS/2 keyboard / mouse
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1                # PS/2 keyboard interrupt
-            irq 0x72 = 12               # PS/2 mouse interrupt
-          end
-          device pnp 4e.9 off end       # Game port
-          device pnp 4e.a on            # Runtime registers
-            io 0x60 = 0x800
-          end
-          device pnp 4e.b off end       # MPU-401
-        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.4 on end            # USB
-      device pci 1f.5 on end            # Audio controller
-      device pci 1f.6 off end           # Modem controller
-    end
-  end
+			device pci 1e.0 on end		# PCI bridge
+			device pci 1f.0 on		# ISA bridge
+				chip superio/smsc/smscsuperio	# Super I/O (SMSC LPC47M102)
+					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 = 4
+					end
+					device pnp 4e.4 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 4e.5 off end	# COM2
+					device pnp 4e.7 on		# PS/2 keyboard / mouse
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1		# PS/2 keyboard interrupt
+						irq 0x72 = 12		# PS/2 mouse interrupt
+					end
+					device pnp 4e.9 off end	# Game port
+					device pnp 4e.a on		# Runtime registers
+						io 0x60 = 0x800
+					end
+					device pnp 4e.b off end	# MPU-401
+				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.4 on end		# USB
+			device pci 1f.5 on end		# Audio controller
+			device pci 1f.6 off end		# Modem controller
+		end
+	end
 end
diff --git a/src/mainboard/intel/d945gclf/devicetree.cb b/src/mainboard/intel/d945gclf/devicetree.cb
index d389d8a..52fd004 100644
--- a/src/mainboard/intel/d945gclf/devicetree.cb
+++ b/src/mainboard/intel/d945gclf/devicetree.cb
@@ -19,20 +19,20 @@
 
 chip northbridge/intel/i945
 
-        device cpu_cluster 0 on
-                chip cpu/intel/socket_441
-                        device lapic 0 on end
-                end
-        end
+	device cpu_cluster 0 on
+		chip cpu/intel/socket_441
+			device lapic 0 on end
+		end
+	end
 
-        device domain 0 on
-                subsystemid 0x8086 0x464c inherit
-                device pci 00.0 on end # host bridge
-		device pci 01.0 off end # i945 PCIe root port
-		device pci 02.0 on end # vga controller
-		device pci 02.1 on end # display controller
+	device domain 0 on
+		subsystemid 0x8086 0x464c inherit
+		device pci 00.0 on end	# host bridge
+		device pci 01.0 off end	# i945 PCIe root port
+		device pci 02.0 on end	# vga controller
+		device pci 02.1 on end	# display controller
 
-                chip southbridge/intel/i82801gx
+		chip southbridge/intel/i82801gx
 			register "pirqa_routing" = "0x05"
 			register "pirqb_routing" = "0x07"
 			register "pirqc_routing" = "0x05"
@@ -43,50 +43,50 @@ chip northbridge/intel/i945
 			register "pirqh_routing" = "0x06"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
 			register "gpi13_routing" = "1"
 			register "gpe0_en" = "0x20000601"
 
-                        register "ide_legacy_combined" = "0x1"
-                        register "ide_enable_primary" = "0x1"
-                        register "ide_enable_secondary" = "0x0"
-                        register "sata_ahci" = "0x0"
+			register "ide_legacy_combined" = "0x1"
+			register "ide_enable_primary" = "0x1"
+			register "ide_enable_secondary" = "0x0"
+			register "sata_ahci" = "0x0"
 
-                	device pci 1b.0 on end # High Definition Audio
-                	device pci 1c.0 on end # PCIe
-                	device pci 1c.1 on end # PCIe
-                	device pci 1c.2 on end # PCIe
+			device pci 1b.0 on end	# High Definition Audio
+			device pci 1c.0 on end	# PCIe
+			device pci 1c.1 on end	# PCIe
+			device pci 1c.2 on end	# PCIe
 			#device pci 1c.3 off end # PCIe port 4
 			#device pci 1c.4 off end # PCIe port 5
 			#device pci 1c.5 off end # PCIe port 6
-                	device pci 1d.0 on end # USB UHCI
-                	device pci 1d.1 on end # USB UHCI
-                	device pci 1d.2 on end # USB UHCI
-                	device pci 1d.3 on end # USB UHCI
-                	device pci 1d.7 on end # USB2 EHCI
-                	device pci 1e.0 on end # PCI bridge
+			device pci 1d.0 on end	# USB UHCI
+			device pci 1d.1 on end	# USB UHCI
+			device pci 1d.2 on end	# USB UHCI
+			device pci 1d.3 on end	# USB UHCI
+			device pci 1d.7 on end	# USB2 EHCI
+			device pci 1e.0 on end	# PCI bridge
 			#device pci 1e.2 off end # AC'97 Audio
 			#device pci 1e.3 off end # AC'97 Modem
-                        device pci 1f.0 on # LPC bridge
-                                chip superio/smsc/lpc47m15x
+			device pci 1f.0 on	# LPC bridge
+				chip superio/smsc/lpc47m15x
 					device pnp 2e.0 off		# Floppy
 					end
 					device pnp 2e.3 off		# Parport
 					end
-                                        device pnp 2e.4 on
-                                                 io 0x60 = 0x3f8
-                                                irq 0x70 = 4
-                                        end
-                                        device pnp 2e.5 on
-                                                 io 0x60 = 0x2f8
-                                                irq 0x70 = 3
+					device pnp 2e.4 on
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 2e.5 on
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
 						irq 0xf1 = 4 # set IRMODE 0 # XXX not an irq
-                                        end
+					end
 					device pnp 2e.7 on		# Keyboard+Mouse
-						 io 0x60 = 0x60
-						 io 0x62 = 0x64
+						io 0x60 = 0x60
+						io 0x62 = 0x64
 						irq 0x70 = 1
 						irq 0x72 = 12
 						irq 0xf0 = 0x82		# HW accel A20.
@@ -98,12 +98,12 @@ chip northbridge/intel/i945
 					end
 					device pnp 2e.b on		# MPU
 					end
-                                end
-                        end
-			#device pci 1f.1 off end # IDE
-                        device pci 1f.2 on end  # SATA
-                        device pci 1f.3 on end  # SMBus
-			#device pci 1f.4 off end # Realtek ID Codec
-                end
-        end
+				end
+			end
+			#device pci 1f.1 off end	# IDE
+			device pci 1f.2 on end		# SATA
+			device pci 1f.3 on end		# SMBus
+			#device pci 1f.4 off end	# Realtek ID Codec
+		end
+	end
 end
diff --git a/src/mainboard/intel/eagleheights/devicetree.cb b/src/mainboard/intel/eagleheights/devicetree.cb
index b37750c..b006959 100644
--- a/src/mainboard/intel/eagleheights/devicetree.cb
+++ b/src/mainboard/intel/eagleheights/devicetree.cb
@@ -1,34 +1,34 @@
 chip northbridge/intel/i3100
-        device domain 0 on
-                device pci 00.0 on end # IMCH
-                device pci 00.1 on end # IMCH error status
-                device pci 01.0 on end # IMCH EDMA engine
-                device pci 02.0 on end # PCIe port A/A0
-                device pci 03.0 on end # PCIe port A1
-                chip southbridge/intel/i3100
-                        # PIRQ line -> legacy IRQ mappings
+	device domain 0 on
+		device pci 00.0 on end	# IMCH
+		device pci 00.1 on end	# IMCH error status
+		device pci 01.0 on end	# IMCH EDMA engine
+		device pci 02.0 on end	# PCIe port A/A0
+		device pci 03.0 on end	# PCIe port A1
+		chip southbridge/intel/i3100
+			# PIRQ line -> legacy IRQ mappings
 			register "pirq_a_d" = "0x8b808a8a"
-                        register "pirq_e_h" = "0x85808080"
+			register "pirq_e_h" = "0x85808080"
 
-                        device pci 1c.0 on end # PCIe port B0
-                        device pci 1c.1 off end # PCIe port B1
-                        device pci 1c.2 off end # PCIe port B2
-                        device pci 1c.3 off end # PCIe port B3
-                        device pci 1d.0 on end # USB (UHCI) 1
-                        device pci 1d.1 on end # USB (UHCI) 2
-                        device pci 1d.7 on end # USB (EHCI)
-                        device pci 1e.0 on end # PCI bridge
-                        device pci 1f.0 on     # LPC bridge
-                                chip superio/intel/i3100
-                                        device pnp 4e.4 on # Com1
-                                                 io 0x60 = 0x3f8
-                                                irq 0x70 = 4
-                                        end
-                                        device pnp 4e.5 on # Com2
-                                                 io 0x60 = 0x2f8
-                                                irq 0x70 = 3
-                                        end
-                                end
+			device pci 1c.0 on end	# PCIe port B0
+			device pci 1c.1 off end	# PCIe port B1
+			device pci 1c.2 off end	# PCIe port B2
+			device pci 1c.3 off end	# PCIe port B3
+			device pci 1d.0 on end	# USB (UHCI) 1
+			device pci 1d.1 on end	# USB (UHCI) 2
+			device pci 1d.7 on end	# USB (EHCI)
+			device pci 1e.0 on end	# PCI bridge
+			device pci 1f.0 on	# LPC bridge
+				chip superio/intel/i3100
+					device pnp 4e.4 on	# Com1
+						 io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 4e.5 on	# Com2
+						 io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+				end
 				chip superio/smsc/smscsuperio
 					device pnp 2e.0 off	# Floppy
 						io 0x60 = 0x3f0
@@ -51,23 +51,22 @@ chip northbridge/intel/i3100
 					device pnp 2e.7 on	# PS/2 Keyboard / Mouse
 						io 0x60 = 0x60
 						io 0x62 = 0x64
-						irq 0x70 = 1    # PS/2 keyboard interrupt
-						irq 0x72 = 12   # PS/2 mouse interrupt
+						irq 0x70 = 1	# PS/2 keyboard interrupt
+						irq 0x72 = 12	# PS/2 mouse interrupt
 					end
-					device pnp 2e.a off     # Runtime registers
-					       io 0x60 = 0x600
+					device pnp 2e.a off	# Runtime registers
+						io 0x60 = 0x600
 					end
 				end
-                        end
-                        device pci 1f.2 on end # SATA
-                        device pci 1f.3 on end # SMBus
+			end
+			device pci 1f.2 on end # SATA
+			device pci 1f.3 on end # SMBus
 			device pci 1f.4 on end # Performance counters
-                end
-        end
-        device cpu_cluster 0 on
-                chip cpu/intel/socket_BGA956
-                        device lapic 0 on end
-                end
-        end
+		end
+	end
+	device cpu_cluster 0 on
+		chip cpu/intel/socket_BGA956
+			device lapic 0 on end
+		end
+	end
 end
-
diff --git a/src/mainboard/intel/emeraldlake2/devicetree.cb b/src/mainboard/intel/emeraldlake2/devicetree.cb
index 0d81502..78aeede 100644
--- a/src/mainboard/intel/emeraldlake2/devicetree.cb
+++ b/src/mainboard/intel/emeraldlake2/devicetree.cb
@@ -42,9 +42,9 @@ chip northbridge/intel/sandybridge
 			register "pirqh_routing" = "0x80"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
 			register "gpi1_routing" = "1"
 			register "gpi14_routing" = "2"
 			register "alt_gp_smi_en" = "0x0002"
diff --git a/src/mainboard/intel/mtarvon/devicetree.cb b/src/mainboard/intel/mtarvon/devicetree.cb
index c1ff1d5..9847215 100644
--- a/src/mainboard/intel/mtarvon/devicetree.cb
+++ b/src/mainboard/intel/mtarvon/devicetree.cb
@@ -1,45 +1,45 @@
 chip northbridge/intel/i3100
-        device domain 0 on
-                subsystemid 0x8086 0x2680 inherit
-                device pci 00.0 on end # IMCH
-                device pci 00.1 on end # IMCH error status
-                device pci 01.0 on end # IMCH EDMA engine
-                device pci 02.0 on end # PCIe port A/A0
-                device pci 03.0 on end # PCIe port A1
-                chip southbridge/intel/i3100
-                        # PIRQ line -> legacy IRQ mappings
-                        register "pirq_a_d" = "0x0b070a05"
-                        register "pirq_e_h" = "0x0a808080"
+	device domain 0 on
+		subsystemid 0x8086 0x2680 inherit
+		device pci 00.0 on end	# IMCH
+		device pci 00.1 on end	# IMCH error status
+		device pci 01.0 on end	# IMCH EDMA engine
+		device pci 02.0 on end	# PCIe port A/A0
+		device pci 03.0 on end	# PCIe port A1
+		chip southbridge/intel/i3100
+			# PIRQ line -> legacy IRQ mappings
+			register "pirq_a_d" = "0x0b070a05"
+			register "pirq_e_h" = "0x0a808080"
 
-                        device pci 1c.0 on end # PCIe port B0
-                        device pci 1c.1 on end # PCIe port B1
-                        device pci 1c.2 on end # PCIe port B2
-                        device pci 1c.3 on end # PCIe port B3
-                        device pci 1d.0 on end # USB (UHCI) 1
-                        device pci 1d.1 on end # USB (UHCI) 2
-                        device pci 1d.7 on end # USB (EHCI)
-                        device pci 1e.0 on end # PCI bridge
-                        device pci 1e.2 on end # audio
-                        device pci 1e.3 on end # modem
-                        device pci 1f.0 on     # LPC bridge
-                                chip superio/intel/i3100
-                                        device pnp 4e.4 on # Com1
-                                                 io 0x60 = 0x3f8
-                                                irq 0x70 = 4
-                                        end
-                                        device pnp 4e.5 on # Com2
-                                                 io 0x60 = 0x2f8
-                                                irq 0x70 = 3
-                                        end
-                                end
-                        end
-                        device pci 1f.2 on end # SATA
-                        device pci 1f.3 on end # SMBus
-                end
-        end
-        device cpu_cluster 0 on
-                chip cpu/intel/socket_mPGA479M
-                        device lapic 0 on end
-                end
-        end
+			device pci 1c.0 on end	# PCIe port B0
+			device pci 1c.1 on end	# PCIe port B1
+			device pci 1c.2 on end	# PCIe port B2
+			device pci 1c.3 on end	# PCIe port B3
+			device pci 1d.0 on end	# USB (UHCI) 1
+			device pci 1d.1 on end	# USB (UHCI) 2
+			device pci 1d.7 on end	# USB (EHCI)
+			device pci 1e.0 on end	# PCI bridge
+			device pci 1e.2 on end	# audio
+			device pci 1e.3 on end	# modem
+			device pci 1f.0 on	# LPC bridge
+				chip superio/intel/i3100
+					device pnp 4e.4 on	# Com1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 4e.5 on	# Com2
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+				end
+			end
+			device pci 1f.2 on end	# SATA
+			device pci 1f.3 on end	# SMBus
+		end
+	end
+	device cpu_cluster 0 on
+		chip cpu/intel/socket_mPGA479M
+			device lapic 0 on end
+		end
+	end
 end
diff --git a/src/mainboard/intel/truxton/devicetree.cb b/src/mainboard/intel/truxton/devicetree.cb
index 05fb05e..136bfbe 100644
--- a/src/mainboard/intel/truxton/devicetree.cb
+++ b/src/mainboard/intel/truxton/devicetree.cb
@@ -1,55 +1,55 @@
 chip northbridge/intel/i3100
-        device domain 0 on
-                subsystemid 0x8086 0x2680 inherit
-                device pci 00.0 on end # IMCH
-                device pci 00.1 on end # IMCH error status
-                device pci 01.0 on end # IMCH EDMA engine
-                device pci 02.0 on end # PCIe port A/A0
-                device pci 03.0 on end # PCIe port A1
-                device pci 04.0 on end # ?
-                device pci 08.0 off end # must be off to boot
-                device pci 0d.0 off end # must be off to boot
-                device pci 0d.1 off end # must be off to boot
-                chip southbridge/intel/i3100
-                        # PIRQ line -> legacy IRQ mappings
-                        register "pirq_a_d" = "0x0b070a05"
-                        register "pirq_e_h" = "0x0a808080"
+	device domain 0 on
+		subsystemid 0x8086 0x2680 inherit
+		device pci 00.0 on end	# IMCH
+		device pci 00.1 on end	# IMCH error status
+		device pci 01.0 on end	# IMCH EDMA engine
+		device pci 02.0 on end	# PCIe port A/A0
+		device pci 03.0 on end	# PCIe port A1
+		device pci 04.0 on end	# ?
+		device pci 08.0 off end	# must be off to boot
+		device pci 0d.0 off end	# must be off to boot
+		device pci 0d.1 off end	# must be off to boot
+		chip southbridge/intel/i3100
+			# PIRQ line -> legacy IRQ mappings
+			register "pirq_a_d" = "0x0b070a05"
+			register "pirq_e_h" = "0x0a808080"
 
-                        device pci 1d.0 on end  # USB (UHCI)
-                        device pci 1d.7 on end  # USB (EHCI)
-                        device pci 1f.0 on      # LPC bridge
-                                chip superio/intel/i3100
-                                        device pnp 4e.4 on # Com1
-                                                 io 0x60 = 0x3f8
-                                                irq 0x70 = 4
-                                        end
-                                        device pnp 4e.5 on # Com2
-                                                 io 0x60 = 0x2f8
-                                                irq 0x70 = 3
-                                        end
+			device pci 1d.0 on end	# USB (UHCI)
+			device pci 1d.7 on end	# USB (EHCI)
+			device pci 1f.0 on	# LPC bridge
+				chip superio/intel/i3100
+					device pnp 4e.4 on	# Com1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 4e.5 on	# Com2
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
 				end
 				chip superio/smsc/smscsuperio
 					device pnp 2e.0 off end
 					device pnp 2e.3 off end
 					device pnp 2e.4 off end
 					device pnp 2e.5 off end
-					device pnp 2e.7 on # PS/2 keyboard / mouse
-            					io 0x60 = 0x60
-            					io 0x62 = 0x64
-            					irq 0x70 = 1	# PS/2 keyboard interrupt
-            					irq 0x72 = 12	# PS/2 mouse interrupt
+					device pnp 2e.7 on	# PS/2 keyboard / mouse
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1	# PS/2 keyboard interrupt
+						irq 0x72 = 12	# PS/2 mouse interrupt
 					end
 					device pnp 2e.a off end
-                                end
-                        end
-                        device pci 1f.2 on end  # SATA
-                        device pci 1f.3 on end  # SMBus
-                        device pci 1f.4 on end  # ?
-                end
-        end
-        device cpu_cluster 0 on
-                chip cpu/intel/ep80579
-                        device lapic 0 on end
-                end
-        end
+				end
+			end
+			device pci 1f.2 on end	# SATA
+			device pci 1f.3 on end	# SMBus
+			device pci 1f.4 on end	# ?
+		end
+	end
+	device cpu_cluster 0 on
+		chip cpu/intel/ep80579
+			device lapic 0 on end
+		end
+	end
 end
diff --git a/src/mainboard/iwave/iWRainbowG6/devicetree.cb b/src/mainboard/iwave/iWRainbowG6/devicetree.cb
index 84cfc4b..c0cc931 100644
--- a/src/mainboard/iwave/iWRainbowG6/devicetree.cb
+++ b/src/mainboard/iwave/iWRainbowG6/devicetree.cb
@@ -20,20 +20,19 @@ chip northbridge/intel/sch
 			register "pirqg_routing" = "0x80"
 			register "pirqh_routing" = "0x80"
 
-			device pci 1a.0 on end  # 26 0 USB Client
-			device pci 1b.0 on end  # 27 0 HD Audio Controller
-			device pci 1c.0 on end  # 28 0 PCI Express Port 1
-			device pci 1c.1 on end  # 28 1 PCI Express Port 2
-			device pci 1d.0 on end  # USB Classic UHCI Controller 1
-			device pci 1d.1 on end  # USB Classic UHCI Controller 2
-			device pci 1d.2 on end  # USB Classic UHCI Controller 3
-			device pci 1d.7 on end  # USB2 EHCI Controller
-			device pci 1e.0 on end  # SDIO/MMC Port 0
-			device pci 1e.1 on end  # SDIO/MMC Port 1
-			device pci 1e.2 on end  # SDIO/MMC Port 2
-			device pci 1f.0 on end  # LPC bridge
-			device pci 1f.1 on end  # PATA Controller
+			device pci 1a.0 on end	# 26 0 USB Client
+			device pci 1b.0 on end	# 27 0 HD Audio Controller
+			device pci 1c.0 on end	# 28 0 PCI Express Port 1
+			device pci 1c.1 on end	# 28 1 PCI Express Port 2
+			device pci 1d.0 on end	# USB Classic UHCI Controller 1
+			device pci 1d.1 on end	# USB Classic UHCI Controller 2
+			device pci 1d.2 on end	# USB Classic UHCI Controller 3
+			device pci 1d.7 on end	# USB2 EHCI Controller
+			device pci 1e.0 on end	# SDIO/MMC Port 0
+			device pci 1e.1 on end	# SDIO/MMC Port 1
+			device pci 1e.2 on end	# SDIO/MMC Port 2
+			device pci 1f.0 on end	# LPC bridge
+			device pci 1f.1 on end	# PATA Controller
 		end
 	end
 end
-
diff --git a/src/mainboard/iwill/dk8_htx/devicetree.cb b/src/mainboard/iwill/dk8_htx/devicetree.cb
index 50d214b..278d4e4 100644
--- a/src/mainboard/iwill/dk8_htx/devicetree.cb
+++ b/src/mainboard/iwill/dk8_htx/devicetree.cb
@@ -1,15 +1,15 @@
 chip northbridge/amd/amdk8/root_complex
-        device cpu_cluster 0 on
-                chip cpu/amd/socket_940
-                        device lapic 0 on end
-                end
-        end
+	device cpu_cluster 0 on
+		chip cpu/amd/socket_940
+			device lapic 0 on end
+		end
+	end
 	device domain 0 on
 		subsystemid 0x1022 0x2b80 inherit
 		chip northbridge/amd/amdk8
 			device pci 18.0 on end
 			device pci 18.0 on end
-			device pci 18.0 on #  northbridge
+			device pci 18.0 on	# northbridge
 				chip southbridge/amd/amd8131
 					# the on/off keyword is mandatory
 					device pci 0.0 on end
@@ -28,49 +28,49 @@ chip northbridge/amd/amdk8/root_complex
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
-							device pnp 2e.0 off #  Floppy
-                	                 			io 0x60 = 0x3f0
-                	                			irq 0x70 = 6
-                	                			drq 0x74 = 2
+							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
+							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 #  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 on #  GPIO2
+							device pnp 2e.8 on	# GPIO2
 								io 0x07 = 0x08ff
 								io 0x30 = 0x01ff
 								io 0x2b = 0xd0ff
 								io 0xf0 = 0xef16
 							end
-                	        			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.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
+							end
 						end
 					end
 					device pci 1.1 on end
@@ -103,10 +103,10 @@ chip northbridge/amd/amdk8/root_complex
 					end # acpi
 					device pci 1.5 off end
 					device pci 1.6 off end
-                	                register "ide0_enable" = "1"
-                	                register "ide1_enable" = "1"
+					register "ide0_enable" = "1"
+					register "ide1_enable" = "1"
 				end
-			end #  device pci 18.0
+			end # device pci 18.0
 
 			device pci 18.1 on end
 			device pci 18.2 on end
@@ -115,5 +115,3 @@ chip northbridge/amd/amdk8/root_complex
 
 	end #domain
 end
-
-
diff --git a/src/mainboard/iwill/dk8s2/devicetree.cb b/src/mainboard/iwill/dk8s2/devicetree.cb
index fda8ca2..6f542d3 100644
--- a/src/mainboard/iwill/dk8s2/devicetree.cb
+++ b/src/mainboard/iwill/dk8s2/devicetree.cb
@@ -25,36 +25,36 @@ chip northbridge/amd/amdk8/root_complex
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
-							device pnp  2e.0 on      # Floppy
-								 io 0x60 = 0x3f0
+							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
+							device pnp 2e.1 off	# Parallel Port
+								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp  2e.2 on      # Com1
-								 io 0x60 = 0x3f8
+							device pnp 2e.2 on	# Com1
+								io 0x60 = 0x3f8
 								irq 0x70 = 4
 							end
-							device pnp  2e.3 off     # Com2
+							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
@@ -73,4 +73,3 @@ chip northbridge/amd/amdk8/root_complex
 		end
 	end
 end
-
diff --git a/src/mainboard/iwill/dk8x/devicetree.cb b/src/mainboard/iwill/dk8x/devicetree.cb
index ea7430b..b5ab8ff 100644
--- a/src/mainboard/iwill/dk8x/devicetree.cb
+++ b/src/mainboard/iwill/dk8x/devicetree.cb
@@ -6,8 +6,8 @@ chip northbridge/amd/amdk8/root_complex
 	end
 	device domain 0 on
 		chip northbridge/amd/amdk8
-			device pci 18.0 on #  northbridge
-				#  devices on link 0, link 0 == LDT 0
+			device pci 18.0 on	# northbridge
+				# devices on link 0, link 0 == LDT 0
 				chip southbridge/amd/amd8131
 					# the on/off keyword is mandatory
 					device pci 0.0 on end
@@ -54,4 +54,3 @@ chip northbridge/amd/amdk8/root_complex
 		end
 	end
 end
-
diff --git a/src/mainboard/jetway/j7f2/devicetree.cb b/src/mainboard/jetway/j7f2/devicetree.cb
index 3b99b9c..e428a49 100644
--- a/src/mainboard/jetway/j7f2/devicetree.cb
+++ b/src/mainboard/jetway/j7f2/devicetree.cb
@@ -1,62 +1,62 @@
 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"
-      register "fn_ctrl_lo" = "0x80"
-      register "fn_ctrl_hi" = "0x1d"
-      device pci a.0 on end			# Firewire
-      device pci f.0 on end			# SATA
-      device pci f.1 on end			# IDE
-      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 11.0 on			# Southbridge LPC
-        chip superio/fintek/f71805f		# 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"
+			register "fn_ctrl_lo" = "0x80"
+			register "fn_ctrl_hi" = "0x1d"
+			device pci a.0 on end			# Firewire
+			device pci f.0 on end			# SATA
+			device pci f.1 on end			# IDE
+			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 11.0 on			# Southbridge LPC
+				chip superio/fintek/f71805f		# 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/jetway/nf81-t56n-lf/devicetree.cb b/src/mainboard/jetway/nf81-t56n-lf/devicetree.cb
index 8f4d3b3..b6ef9b0 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/devicetree.cb
+++ b/src/mainboard/jetway/nf81-t56n-lf/devicetree.cb
@@ -26,25 +26,25 @@ 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]
-#						device pci 1.1 on end # Internal Audio P2P bridge 0x1314
-						device pci 4.0 on end # PCIE P2P bridge PCIe slot
-						device pci 5.0 off end # PCIE P2P bridge
-						device pci 6.0 on end # GbE MAC: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 (10ec:8168)
-						device pci 7.0 off end # PCIE P2P bridge
-						device pci 8.0 off end # NB/SB Link P2P bridge
+						device pci 0.0 on end	# Root Complex
+						device pci 1.0 on end	# Internal Graphics P2P bridge 0x980[2456]
+#						device pci 1.1 on end	# Internal Audio P2P bridge 0x1314
+						device pci 4.0 on end	# PCIE P2P bridge PCIe slot
+						device pci 5.0 off end	# PCIE P2P bridge
+						device pci 6.0 on end	# GbE MAC: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 (10ec:8168)
+						device pci 7.0 off end	# PCIE P2P bridge
+						device pci 8.0 off end	# NB/SB Link P2P bridge
 					end # agesa northbridge
 
 					chip southbridge/amd/cimx/sb800 # it is under NB/SB Link, but on the same pri bus
-						device pci 11.0 on end # SATA
-						device pci 12.0 on end # OHCI USB 0-4
-						device pci 12.2 on end # EHCI USB 0-4
-						device pci 13.0 on end # OHCI USB 5-9
-						device pci 13.2 on end # EHCI USB 5-9
-						device pci 14.0 on # SM
+						device pci 11.0 on end	# SATA
+						device pci 12.0 on end	# OHCI USB 0-4
+						device pci 12.2 on end	# EHCI USB 0-4
+						device pci 13.0 on end	# OHCI USB 5-9
+						device pci 13.2 on end	# EHCI USB 5-9
+						device pci 14.0 on	# SM
 							chip drivers/generic/generic #dimm 0-0-0
 								device i2c 50 on end
 							end
@@ -76,7 +76,7 @@ chip northbridge/amd/agesa/family14/root_complex
 # XXX: 4e is the default index port and .xy is the
 # LDN indexing the pnp_info array found in the superio.c
 # NB: Jetway board changes the default (0x4e) index port to (0x2e) by pin 124,
-#     see page 18 from Fintek F71869 V1.1 datasheet.
+#	see page 18 from Fintek F71869 V1.1 datasheet.
 								device pnp 2e.00 off		# Floppy
 									io 0x60 = 0x3f0
 									irq 0x70 = 6
@@ -111,20 +111,20 @@ chip northbridge/amd/agesa/family14/root_complex
 								device pnp 2e.0a on end	# PME
 							end # f71869ad
 						end #LPC
-				device pci 14.4 on  end # PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0}
-				device pci 14.5 on end # OHCI FS/LS USB (0x4399)
-				device pci 14.6 off end # Hudson-E1 GbE MAC: Broadcom BCM5785 (14E4:1699)
-				device pci 15.0 on end # PCIe PortA (0x43a0) GbE MAC: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 (10ec:8168)
-				device pci 15.1 on 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 (0x4397)
-				device pci 16.2 on end # EHCI USB 10-13 (0x4396)
+				device pci 14.4 on end	# PCIB 0x4384, NOTE: PCI interface pins shared with GPIO {GPIO 35:0}
+				device pci 14.5 on end	# OHCI FS/LS USB (0x4399)
+				device pci 14.6 off end	# Hudson-E1 GbE MAC: Broadcom BCM5785 (14E4:1699)
+				device pci 15.0 on end	# PCIe PortA (0x43a0) GbE MAC: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 (10ec:8168)
+				device pci 15.1 on 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 (0x4397)
+				device pci 16.2 on end	# EHCI USB 10-13 (0x4396)
 				register "gpp_configuration" = "4" # GPP_CFGMODE_X1111 - PortA-D on 15.0-3 are each x1 lanes.
 				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
@@ -138,7 +138,7 @@ chip northbridge/amd/agesa/family14/root_complex
 #
 # TODO: Verify the proper SocketId/MemChannelId/DimmId addresses of the SPD
 # with i2cdump tool.
-# Notes:  0xa0=0x50*2, 0xa2=0x51*2.. 0x50-0x54 are usually RAM modules on the SMBus.
+# Notes: 0xa0=0x50*2, 0xa2=0x51*2.. 0x50-0x54 are usually RAM modules on the SMBus.
 #
 			register "spdAddrLookup" = "
 			{
diff --git a/src/mainboard/jetway/pa78vm5/devicetree.cb b/src/mainboard/jetway/pa78vm5/devicetree.cb
index 783e4ae..a9c8f39 100644
--- a/src/mainboard/jetway/pa78vm5/devicetree.cb
+++ b/src/mainboard/jetway/pa78vm5/devicetree.cb
@@ -1,28 +1,28 @@
 # sample config for jetway/PA78VM5
 chip northbridge/amd/amdfam10/root_complex
 	device cpu_cluster 0 on
-		chip cpu/amd/socket_AM2r2  #L1 and DDR2
+		chip cpu/amd/socket_AM2r2	#L1 and DDR2
 			 device lapic 0 on end
 		end
 	end
 	device domain 0 on
 		subsystemid 0x1022 0x3060 inherit
 		chip northbridge/amd/amdfam10
-			device pci 18.0 on #  northbridge
+			device pci 18.0 on	# northbridge
 				chip southbridge/amd/rs780
-					device pci 0.0 on end # HT  	0x9600
-					device pci 1.0 on end # Internal Graphics P2P bridge 0x9602
-					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x9603
-					device pci 3.0 on end # PCIE P2P bridge	0x960b
-					device pci 4.0 on end # PCIE P2P bridge 0x9604
-					device pci 5.0 off end # PCIE P2P bridge 0x9605
-					device pci 6.0 off end # PCIE P2P bridge 0x9606
-					device pci 7.0 off end # PCIE P2P bridge 0x9607
-					device pci 8.0 off end # NB/SB Link P2P bridge
-					device pci 9.0 on end #
-					device pci a.0 on end #
-					register "gppsb_configuration" = "1"   # Configuration B
-					register "gpp_configuration" = "3"   # Configuration D default
+					device pci 0.0 on end	# HT	0x9600
+					device pci 1.0 on end	# Internal Graphics P2P bridge 0x9602
+					device pci 2.0 on end	# PCIE P2P bridge (external graphics) 0x9603
+					device pci 3.0 on end	# PCIE P2P bridge	0x960b
+					device pci 4.0 on end	# PCIE P2P bridge 0x9604
+					device pci 5.0 off end	# PCIE P2P bridge 0x9605
+					device pci 6.0 off end	# PCIE P2P bridge 0x9606
+					device pci 7.0 off end	# PCIE P2P bridge 0x9607
+					device pci 8.0 off end	# NB/SB Link P2P bridge
+					device pci 9.0 on end	#
+					device pci a.0 on end	#
+					register "gppsb_configuration" = "1"	# Configuration B
+					register "gpp_configuration" = "3"	# Configuration D default
 					register "port_enable" = "0x6fc"
 					register "gfx_dev2_dev3" = "1"
 					register "gfx_dual_slot" = "1"
@@ -33,14 +33,14 @@ chip northbridge/amd/amdfam10/root_complex
 					register "gfx_link_width" = "0"
 				end
 				chip southbridge/amd/sb700 # it is under NB/SB Link, but on the same pri bus
-					device pci 11.0 on end # SATA
-					device pci 12.0 on end # USB
-					device pci 12.1 on end # USB
-					device pci 12.2 on end # USB
-					device pci 13.0 on end # USB
-					device pci 13.1 on end # USB
-					device pci 13.2 on end # USB
-	 				device pci 14.0 on # SM
+					device pci 11.0 on end	# SATA
+					device pci 12.0 on end	# USB
+					device pci 12.1 on end	# USB
+					device pci 12.2 on end	# USB
+					device pci 13.0 on end	# USB
+					device pci 13.1 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
@@ -48,53 +48,53 @@ chip northbridge/amd/amdfam10/root_complex
 							device i2c 51 on end
 						end
 					end # SM
-					device pci 14.1 on end # IDE    0x439c
-					device pci 14.2 on end # HDA    0x4383
-					device pci 14.3 on # LPC	0x439d
+					device pci 14.1 on end	# IDE	0x439c
+					device pci 14.2 on end	# HDA	0x4383
+					device pci 14.3 on	# LPC	0x439d
 						chip superio/fintek/f71863fg
-							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 on #  Com1
+							device pnp 2e.1 on	# Com1
 								io 0x60 = 0x3f8
 								irq 0x70 = 4
 							end
-							device pnp 2e.2 off #  Com2
+							device pnp 2e.2 off	# Com2
 								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 2e.3 off #  Parallel Port
+							device pnp 2e.3 off	# Parallel Port
 								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 2e.4 off end #  EC
-							device pnp 2e.5 on #  Keyboard
+							device pnp 2e.4 off end	# EC
+							device pnp 2e.5 on	# Keyboard
 								io 0x60 = 0x60
 								io 0x62 = 0x64
 								irq 0x70 = 1
 							end
-							device pnp 2e.6 on #  Mouse
+							device pnp 2e.6 on	# Mouse
 								irq 0x70 = 12
 							end
-							device pnp 2e.7 off #  GPIO, must be closed for unresolved reason.
+							device pnp 2e.7 off	# GPIO, must be closed for unresolved reason.
 							end
-							device pnp 2e.8 off #  MIDI
+							device pnp 2e.8 off	# MIDI
 								io 0x60 = 0x300
 								irq 0x70 = 9
 							end
-							device pnp 2e.9 off #  GAME
+							device pnp 2e.9 off	# GAME
 								io 0x60 = 0x220
 							end
-							device pnp 2e.a off end #  CIR
+							device pnp 2e.a off end	# CIR
 						end	#superio/ite/it8718f
 					end		#LPC
 					device pci 14.4 on end # PCI 0x4384
 					device pci 14.5 on end # USB 2
 					register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				end	#southbridge/amd/sb700
-			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/kontron/986lcd-m/devicetree.cb b/src/mainboard/kontron/986lcd-m/devicetree.cb
index 65a96a0..8d4da22 100644
--- a/src/mainboard/kontron/986lcd-m/devicetree.cb
+++ b/src/mainboard/kontron/986lcd-m/devicetree.cb
@@ -1,18 +1,18 @@
 chip northbridge/intel/i945
 
-        device cpu_cluster 0 on
-                chip cpu/intel/socket_mFCPGA478
-                        device lapic 0 on end
-                end
-        end
+	device cpu_cluster 0 on
+		chip cpu/intel/socket_mFCPGA478
+			device lapic 0 on end
+		end
+	end
 
-        device domain 0 on
-                device pci 00.0 on end # host bridge
-		device pci 01.0 off end # i945 PCIe root port
-		device pci 02.0 on end # vga controller
-		device pci 02.1 on end # display controller
+	device domain 0 on
+		device pci 00.0 on end	# host bridge
+		device pci 01.0 off end	# i945 PCIe root port
+		device pci 02.0 on end	# vga controller
+		device pci 02.1 on end	# display controller
 
-                chip southbridge/intel/i82801gx
+		chip southbridge/intel/i82801gx
 			register "pirqa_routing" = "0x05"
 			register "pirqb_routing" = "0x07"
 			register "pirqc_routing" = "0x05"
@@ -23,57 +23,57 @@ chip northbridge/intel/i945
 			register "pirqh_routing" = "0x06"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
 			register "gpi13_routing" = "1"
 
-                        register "ide_legacy_combined" = "0x1"
-                        register "ide_enable_primary" = "0x1"
-                        register "ide_enable_secondary" = "0x1"
-                        register "sata_ahci" = "0x0"
+			register "ide_legacy_combined" = "0x1"
+			register "ide_enable_primary" = "0x1"
+			register "ide_enable_secondary" = "0x1"
+			register "sata_ahci" = "0x0"
 
-                	device pci 1b.0 on end # High Definition Audio
-                	device pci 1c.0 on end # PCIe
-                	device pci 1c.1 on end # PCIe
-                	device pci 1c.2 on end # PCIe
-			#device pci 1c.3 off end # PCIe port 4
-			#device pci 1c.4 off end # PCIe port 5
-			#device pci 1c.5 off end # PCIe port 6
-                	device pci 1d.0 on end # USB UHCI
-                	device pci 1d.1 on end # USB UHCI
-                	device pci 1d.2 on end # USB UHCI
-                	device pci 1d.3 on end # USB UHCI
-                	device pci 1d.7 on end # USB2 EHCI
-                	device pci 1e.0 on end # PCI bridge
-			#device pci 1e.2 off end # AC'97 Audio
-			#device pci 1e.3 off end # AC'97 Modem
-                        device pci 1f.0 on # LPC bridge
-                                chip superio/winbond/w83627thg
+			device pci 1b.0 on end		# High Definition Audio
+			device pci 1c.0 on end		# PCIe
+			device pci 1c.1 on end		# PCIe
+			device pci 1c.2 on end		# PCIe
+			#device pci 1c.3 off end	# PCIe port 4
+			#device pci 1c.4 off end	# PCIe port 5
+			#device pci 1c.5 off end	# PCIe port 6
+			device pci 1d.0 on end		# USB UHCI
+			device pci 1d.1 on end		# USB UHCI
+			device pci 1d.2 on end		# USB UHCI
+			device pci 1d.3 on end		# USB UHCI
+			device pci 1d.7 on end		# USB2 EHCI
+			device pci 1e.0 on end		# PCI bridge
+			#device pci 1e.2 off end	# AC'97 Audio
+			#device pci 1e.3 off end	# AC'97 Modem
+			device pci 1f.0 on		# LPC bridge
+				chip superio/winbond/w83627thg
 					device pnp 2e.0 off		# Floppy
 					end
 					device pnp 2e.1 on		# Parallel port
-						 io 0x60 = 0x378
+						io 0x60 = 0x378
 						irq 0x70 = 5
 					end
-                                        device pnp 2e.2 on
-                                                 io 0x60 = 0x3f8
-                                                irq 0x70 = 4
-                                        end
-                                        device pnp 2e.3 on
-                                                 io 0x60 = 0x2f8
-                                                irq 0x70 = 3
+					device pnp 2e.2 on
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 2e.3 on
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
 						irq 0xf1 = 4 # set IRMODE 0 # XXX not an irq
-                                        end
+					end
 					device pnp 2e.5 on		# Keyboard+Mouse
 						 io 0x60 = 0x60
-						 io 0x62 = 0x64
+						io 0x62 = 0x64
 						irq 0x70 = 1
 						irq 0x72 = 12
 						irq 0xf0 = 0x82		# HW accel A20.
 					end
 					device pnp 2e.7 on		# GPIO1, GAME, MIDI
-						 io 0x62 = 0x330
+						io 0x62 = 0x330
 						irq 0x70 = 9
 					end
 					device pnp 2e.8 on		# GPIO2
@@ -87,25 +87,25 @@ chip northbridge/intel/i945
 					device pnp 2e.a off		# ACPI
 					end
 					device pnp 2e.b on		# HWM
-						 io 0x60 = 0xa00
+						io 0x60 = 0xa00
 						irq 0x70 = 0
 					end
 
-                                end
-                                chip superio/winbond/w83627thg
-                                        device pnp 4e.0 off		# Floppy
+				end
+				chip superio/winbond/w83627thg
+					device pnp 4e.0 off		# Floppy
 					end
 					device pnp 4e.1 off		# Parport
 					end
-                                        device pnp 4e.2 on		# COM3
-                                                 io 0x60 = 0x3e8
-                                                irq 0x70 = 11
-                                        end
-                                        device pnp 4e.3 on		# COM4
-                                                 io 0x60 = 0x2e8
-                                                irq 0x70 = 10
+					device pnp 4e.2 on		# COM3
+						io 0x60 = 0x3e8
+						irq 0x70 = 11
+					end
+					device pnp 4e.3 on		# COM4
+						io 0x60 = 0x2e8
+						irq 0x70 = 10
 						irq 0xf1 = 4 # set IRMODE 0 # XXX not an irq
-                                        end
+					end
 					device pnp 4e.5 off		# Keyboard
 					end
 					device pnp 4e.7 off		# GPIO1, GAME, MIDI
@@ -118,13 +118,12 @@ chip northbridge/intel/i945
 					end
 					device pnp 4e.b off		# HWM
 					end
-                                end
-
-                        end
-			#device pci 1f.1 off end # IDE
-                        device pci 1f.2 on end  # SATA
-                        device pci 1f.3 on end  # SMBus
-			#device pci 1f.4 off end # Realtek ID Codec
-                end
-        end
+				end
+			end
+			#device pci 1f.1 off end	# IDE
+			device pci 1f.2 on end		# SATA
+			device pci 1f.3 on end		# SMBus
+			#device pci 1f.4 off end	# Realtek ID Codec
+		end
+	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/kontron/ktqm77/devicetree.cb b/src/mainboard/kontron/ktqm77/devicetree.cb
index f6390ac..9792f9a 100644
--- a/src/mainboard/kontron/ktqm77/devicetree.cb
+++ b/src/mainboard/kontron/ktqm77/devicetree.cb
@@ -74,39 +74,39 @@ chip northbridge/intel/sandybridge
 			device pci 1e.0 off end # PCI bridge
 			device pci 1f.0 on #LPC bridge
 				chip superio/winbond/w83627dhg
-					device pnp 2e.0 off #  Floppy
+					device pnp 2e.0 off	# Floppy
 					end
-					device pnp 2e.1 off #  Parallel Port
+					device pnp 2e.1 off	# Parallel Port
 					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 off #  Keyboard
+					device pnp 2e.5 off	# Keyboard
 					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 off #  WDTO#, PLED
+					device pnp 2e.8 off	# WDTO#, PLED
 					end
-					device pnp 2e.009 on #  GPIO2 -- original firmware sets this on
+					device pnp 2e.009 on	# GPIO2 -- original firmware sets this on
 					end
-					device pnp 2e.109 on #  GPIO3 -- original firmware sets this on
+					device pnp 2e.109 on	# GPIO3 -- original firmware sets this on
 					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 off # HWM
+					device pnp 2e.b off	# HWM
 					end
-					device pnp 2e.c off # PECI, SST
+					device pnp 2e.c off	# PECI, SST
 					end
 				end	#superio/winbond/w83627dhg
 				chip ec/kontron/it8516e
@@ -115,47 +115,47 @@ chip northbridge/intel/sandybridge
 					register "default_fan_target" = "{ 50, 75 }"
 
 					# TODO: Check status when Linux runs
-					device pnp 20e.1 on #  Com3
+					device pnp 20e.1 on	# Com3
 						io 0x60 = 0x03e8
 						irq 0x70 = 4
 					end
-					device pnp 20e.2 on #  Com4
+					device pnp 20e.2 on	# Com4
 						io 0x60 = 0x02e8
 						irq 0x70 = 3
 					end
-					device pnp 20e.4 off #  System Wakeup
+					device pnp 20e.4 off	# System Wakeup
 					end
-					device pnp 20e.5 on #  Mouse
+					device pnp 20e.5 on	# Mouse
 						irq 0x70 = 12
 					end
-					device pnp 20e.6 on #  Keyboard
+					device pnp 20e.6 on	# Keyboard
 						io 0x60 = 0x0060
 						io 0x62 = 0x0064
 						irq 0x70 = 1
 					end
-					device pnp 20e.f off #  Shared Memory
+					device pnp 20e.f off	# Shared Memory
 					end
-					device pnp 20e.10 off #  BRAM / RTC
+					device pnp 20e.10 off	# BRAM / RTC
 					end
-					device pnp 20e.11 on #  PM channel 1
+					device pnp 20e.11 on	# PM channel 1
 						io 0x60 = 0x0062
 						io 0x62 = 0x0066
 						irq 0x70 = 0
 					end
-					device pnp 20e.12 on #  PM channel 2
+					device pnp 20e.12 on	# PM channel 2
 						io 0x60 = 0x020c
 						io 0x62 = 0x020d
 						irq 0x70 = 0
 					end
-					device pnp 20e.17 off #  PM channel 3
+					device pnp 20e.17 off	# PM channel 3
 					end
 				end	#ec/kontron/it8516e
 				# TODO: TPM on 4e
 			end # LPC bridge
-			device pci 1f.2 on end # SATA Controller 1
-			device pci 1f.3 on end # SMBus
-			device pci 1f.5 off end # SATA Controller 2
-			device pci 1f.6 off end # Thermal
+			device pci 1f.2 on end	# SATA Controller 1
+			device pci 1f.3 on end	# SMBus
+			device pci 1f.5 off end	# SATA Controller 2
+			device pci 1f.6 off end	# Thermal
 		end
 	end
 end
diff --git a/src/mainboard/lanner/em8510/devicetree.cb b/src/mainboard/lanner/em8510/devicetree.cb
index 257d894..02a966b 100644
--- a/src/mainboard/lanner/em8510/devicetree.cb
+++ b/src/mainboard/lanner/em8510/devicetree.cb
@@ -13,39 +13,39 @@ chip northbridge/intel/i855
 			register "enable_usb" = "0"
 			register "enable_native_ide" = "0"
 			device pci 1f.0 on
-				chip superio/winbond/w83627thg # link 1
-                		        device pnp 2e.0 on      #  Floppy
-                	        	        io 0x60 = 0x3f0
-                	                	irq 0x70 = 6
-                	                	drq 0x74 = 2
+				chip superio/winbond/w83627thg	# link 1
+					device pnp 2e.0 on	# 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      #  Com1
-                	        	       io 0x60 = 0x3f8
-                	            	       irq 0x70 = 4
+					device pnp 2e.1 on	# Parallel Port
+						io 0x60 = 0x378
+						irq 0x70 = 7
 					end
-                	      		device pnp 2e.3 on      #  Com2
-                	                       io 0x60 = 0x2f8
-                	                       irq 0x70 = 3
+					device pnp 2e.2 on	# Com1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
 					end
-                	 	        device pnp 2e.5 on      #  Keyboard
-                	 	                io 0x60 = 0x60
-                		                io 0x62 = 0x64
-                		                irq 0x70 = 1
+					device pnp 2e.3 on	# Com2
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 2e.5 on	# Keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1
 						irq 0x72 = 12
 					end
-                		        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.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
 	end
 	device cpu_cluster 0 on
diff --git a/src/mainboard/lenovo/t520/devicetree.cb b/src/mainboard/lenovo/t520/devicetree.cb
index 475e49c..74e71cc 100644
--- a/src/mainboard/lenovo/t520/devicetree.cb
+++ b/src/mainboard/lenovo/t520/devicetree.cb
@@ -47,9 +47,9 @@ chip northbridge/intel/sandybridge
 			register "pirqh_routing" = "0x80"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
 			register "alt_gp_smi_en" = "0x0000"
 			register "gpi1_routing" = "2"
 			register "gpi8_routing" = "2"
@@ -122,7 +122,7 @@ chip northbridge/intel/sandybridge
 			end # LPC bridge
 			device pci 1f.2 on end # SATA Controller 1
 			device pci 1f.3 on # SMBUS controller
-			        # eeprom, 8 virtual devices, same chip
+				# eeprom, 8 virtual devices, same chip
 				chip drivers/i2c/at24rf08c
 					device i2c 54 on end
 					device i2c 55 on end
diff --git a/src/mainboard/lenovo/t530/devicetree.cb b/src/mainboard/lenovo/t530/devicetree.cb
index 6a09004..bca52f6 100644
--- a/src/mainboard/lenovo/t530/devicetree.cb
+++ b/src/mainboard/lenovo/t530/devicetree.cb
@@ -48,9 +48,9 @@ chip northbridge/intel/sandybridge
 			register "pirqh_routing" = "0x80"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
 			register "alt_gp_smi_en" = "0x0000"
 			register "gpi1_routing" = "2"
 			register "gpi8_routing" = "2"
@@ -128,7 +128,7 @@ chip northbridge/intel/sandybridge
 			end # LPC bridge
 			device pci 1f.2 on end # SATA Controller 1
 			device pci 1f.3 on
-			        # eeprom, 8 virtual devices, same chip
+				# eeprom, 8 virtual devices, same chip
 				chip drivers/i2c/at24rf08c
 					device i2c 54 on end
 					device i2c 55 on end
diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb
index f092380..2ca0ce1 100644
--- a/src/mainboard/lenovo/t60/devicetree.cb
+++ b/src/mainboard/lenovo/t60/devicetree.cb
@@ -56,9 +56,9 @@ chip northbridge/intel/i945
 			register "pirqh_routing" = "0x0b"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
 			register "gpi13_routing" = "2"
 			register "gpi12_routing" = "2"
 			register "gpi8_routing" = "2"
@@ -213,7 +213,7 @@ chip northbridge/intel/i945
 					register "reg11" = "0x07"
 					device i2c 69 on end
 				end
-			        # eeprom, 8 virtual devices, same chip
+				# eeprom, 8 virtual devices, same chip
 				chip drivers/i2c/at24rf08c
 					device i2c 54 on end
 					device i2c 55 on end
diff --git a/src/mainboard/lenovo/x201/devicetree.cb b/src/mainboard/lenovo/x201/devicetree.cb
index 1db5bf0..aa0962f 100644
--- a/src/mainboard/lenovo/x201/devicetree.cb
+++ b/src/mainboard/lenovo/x201/devicetree.cb
@@ -103,9 +103,9 @@ chip northbridge/intel/nehalem
 			register "pirqh_routing" = "0x0b"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
 			register "gpi1_routing" = "2"
 			register "gpi13_routing" = "2"
 
@@ -163,7 +163,7 @@ chip northbridge/intel/nehalem
 			end
 			device pci 1f.3 on # SMBUS
 				subsystemid 0x17aa 0x2167
-			        # eeprom, 8 virtual devices, same chip
+				# eeprom, 8 virtual devices, same chip
 				chip drivers/i2c/at24rf08c
 					device i2c 54 on end
 					device i2c 55 on end
diff --git a/src/mainboard/lenovo/x230/devicetree.cb b/src/mainboard/lenovo/x230/devicetree.cb
index a76de5f..728fa9a 100644
--- a/src/mainboard/lenovo/x230/devicetree.cb
+++ b/src/mainboard/lenovo/x230/devicetree.cb
@@ -48,9 +48,9 @@ chip northbridge/intel/sandybridge
 			register "pirqh_routing" = "0x80"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
 			register "alt_gp_smi_en" = "0x0000"
 			register "gpi1_routing" = "2"
 			register "gpi8_routing" = "2"
@@ -128,7 +128,7 @@ chip northbridge/intel/sandybridge
 			end # LPC bridge
 			device pci 1f.2 on end # SATA Controller 1
 			device pci 1f.3 on
-			        # eeprom, 8 virtual devices, same chip
+				# eeprom, 8 virtual devices, same chip
 				chip drivers/i2c/at24rf08c
 					device i2c 54 on end
 					device i2c 55 on end
diff --git a/src/mainboard/lenovo/x60/devicetree.cb b/src/mainboard/lenovo/x60/devicetree.cb
index 81648bd..15a95d4 100644
--- a/src/mainboard/lenovo/x60/devicetree.cb
+++ b/src/mainboard/lenovo/x60/devicetree.cb
@@ -49,9 +49,9 @@ chip northbridge/intel/i945
 			register "pirqh_routing" = "0x0b"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
 			register "gpi13_routing" = "2"
 			register "gpi12_routing" = "1"
 			register "gpi8_routing" = "2"
@@ -193,7 +193,7 @@ chip northbridge/intel/i945
 					register "reg11" = "0x07"
 					device i2c 69 on end
 				end
-			        # eeprom, 8 virtual devices, same chip
+				# eeprom, 8 virtual devices, same chip
 				chip drivers/i2c/at24rf08c
 					device i2c 54 on end
 					device i2c 55 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/msi/ms6119/devicetree.cb b/src/mainboard/msi/ms6119/devicetree.cb
index 159a444..ec2503b 100644
--- a/src/mainboard/msi/ms6119/devicetree.cb
+++ b/src/mainboard/msi/ms6119/devicetree.cb
@@ -1,60 +1,60 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device cpu_cluster 0 on		# APIC cluster
-    chip cpu/intel/slot_1		# CPU
-      device lapic 0 on end		# APIC
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 1.0 on end		# PCI/AGP bridge
-    chip southbridge/intel/i82371eb	# Southbridge
-      device pci 7.0 on			# ISA bridge
-        chip superio/winbond/w83977tf	# Super I/O
-          device pnp 3f0.0 on		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 3f0.1 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-            drq 0x74 = 3
-          end
-          device pnp 3f0.2 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 3f0.3 on		# COM2 / IR
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 3f0.5 on		# PS/2 keyboard
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1		# PS/2 keyboard interrupt
-            irq 0x72 = 12		# PS/2 mouse interrupt
-          end
-          device pnp 3f0.7 on		# GPIO 1
-          end
-          device pnp 3f0.8 on		# GPIO 2
-          end
-          device pnp 3f0.9 on		# GPIO 3
-          end
-          device pnp 3f0.a on		# ACPI
-          end
-        end
-      end
-      device pci 7.1 on	end		# IDE
-      device pci 7.2 on	end		# USB
-      device pci 7.3 on end		# ACPI
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      register "ide_legacy_enable" = "1"
-      # Enable UDMA/33 for higher speed if your IDE device(s) support it.
-      register "ide0_drive0_udma33_enable" = "0"
-      register "ide0_drive1_udma33_enable" = "0"
-      register "ide1_drive0_udma33_enable" = "0"
-      register "ide1_drive1_udma33_enable" = "0"
-    end
-  end
+	device cpu_cluster 0 on		# APIC cluster
+		chip cpu/intel/slot_1		# CPU
+			device lapic 0 on end		# APIC
+		end
+	end
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 1.0 on end		# PCI/AGP bridge
+		chip southbridge/intel/i82371eb	# Southbridge
+			device pci 7.0 on			# ISA bridge
+				chip superio/winbond/w83977tf	# Super I/O
+					device pnp 3f0.0 on		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 3f0.1 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+						drq 0x74 = 3
+					end
+					device pnp 3f0.2 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 3f0.3 on		# COM2 / IR
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 3f0.5 on		# PS/2 keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1		# PS/2 keyboard interrupt
+						irq 0x72 = 12		# PS/2 mouse interrupt
+					end
+					device pnp 3f0.7 on		# GPIO 1
+					end
+					device pnp 3f0.8 on		# GPIO 2
+					end
+					device pnp 3f0.9 on		# GPIO 3
+					end
+					device pnp 3f0.a on		# ACPI
+					end
+				end
+			end
+			device pci 7.1 on	end		# IDE
+			device pci 7.2 on	end		# USB
+			device pci 7.3 on end		# ACPI
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			register "ide_legacy_enable" = "1"
+			# Enable UDMA/33 for higher speed if your IDE device(s) support it.
+			register "ide0_drive0_udma33_enable" = "0"
+			register "ide0_drive1_udma33_enable" = "0"
+			register "ide1_drive0_udma33_enable" = "0"
+			register "ide1_drive1_udma33_enable" = "0"
+		end
+	end
 end
diff --git a/src/mainboard/msi/ms6147/devicetree.cb b/src/mainboard/msi/ms6147/devicetree.cb
index 55f2745..7b16672 100644
--- a/src/mainboard/msi/ms6147/devicetree.cb
+++ b/src/mainboard/msi/ms6147/devicetree.cb
@@ -1,60 +1,60 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device cpu_cluster 0 on		# APIC cluster
-    chip cpu/intel/slot_1		# CPU
-      device lapic 0 on end		# APIC
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 1.0 on end		# PCI/AGP bridge
-    chip southbridge/intel/i82371eb	# Southbridge
-      device pci 7.0 on			# ISA bridge
-        chip superio/winbond/w83977tf	# Super I/O
-          device pnp 3f0.0 on		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 3f0.1 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-            drq 0x74 = 3
-          end
-          device pnp 3f0.2 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 3f0.3 on		# COM2 / IR
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 3f0.5 on		# PS/2 keyboard
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1		# PS/2 keyboard interrupt
-            irq 0x72 = 12		# PS/2 mouse interrupt
-          end
-          device pnp 3f0.7 on		# GPIO 1
-          end
-          device pnp 3f0.8 on		# GPIO 2
-          end
-          device pnp 3f0.9 off		# GPIO 3
-          end
-          device pnp 3f0.a on		# ACPI
-          end
-        end
-      end
-      device pci 7.1 on end		# IDE
-      device pci 7.2 on end		# USB
-      device pci 7.3 on end		# ACPI
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      register "ide_legacy_enable" = "1"
-      # Enable UDMA/33 for higher speed if your IDE device(s) support it.
-      register "ide0_drive0_udma33_enable" = "1"
-      register "ide0_drive1_udma33_enable" = "1"
-      register "ide1_drive0_udma33_enable" = "1"
-      register "ide1_drive1_udma33_enable" = "1"
-    end
-  end
+	device cpu_cluster 0 on		# APIC cluster
+		chip cpu/intel/slot_1		# CPU
+			device lapic 0 on end		# APIC
+		end
+	end
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 1.0 on end		# PCI/AGP bridge
+		chip southbridge/intel/i82371eb	# Southbridge
+			device pci 7.0 on			# ISA bridge
+				chip superio/winbond/w83977tf	# Super I/O
+					device pnp 3f0.0 on		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 3f0.1 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+						drq 0x74 = 3
+					end
+					device pnp 3f0.2 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 3f0.3 on		# COM2 / IR
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 3f0.5 on		# PS/2 keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1		# PS/2 keyboard interrupt
+						irq 0x72 = 12		# PS/2 mouse interrupt
+					end
+					device pnp 3f0.7 on		# GPIO 1
+					end
+					device pnp 3f0.8 on		# GPIO 2
+					end
+					device pnp 3f0.9 off		# GPIO 3
+					end
+					device pnp 3f0.a on		# ACPI
+					end
+				end
+			end
+			device pci 7.1 on end		# IDE
+			device pci 7.2 on end		# USB
+			device pci 7.3 on end		# ACPI
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			register "ide_legacy_enable" = "1"
+			# Enable UDMA/33 for higher speed if your IDE device(s) support it.
+			register "ide0_drive0_udma33_enable" = "1"
+			register "ide0_drive1_udma33_enable" = "1"
+			register "ide1_drive0_udma33_enable" = "1"
+			register "ide1_drive1_udma33_enable" = "1"
+		end
+	end
 end
diff --git a/src/mainboard/msi/ms6178/devicetree.cb b/src/mainboard/msi/ms6178/devicetree.cb
index 26e0e0a..a49231c 100644
--- a/src/mainboard/msi/ms6178/devicetree.cb
+++ b/src/mainboard/msi/ms6178/devicetree.cb
@@ -19,66 +19,66 @@
 ##
 
 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 on end			# Onboard VGA
-    chip southbridge/intel/i82801ax		# Southbridge
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
+	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 on end			# Onboard VGA
+		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/winbond/w83627hf		# Super I/O
-          device pnp 2e.0 on			# 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 (only header on board)
-            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			# Keyboard interrupt
-            irq 0x72 = 12			# Mouse interrupt
-          end
-          device pnp 2e.6 off end		# Consumer IR (TODO)
-          device pnp 2e.7 on			# Game port / MIDI / GPIO 1
-            io 0x60 = 0x201
-            io 0x62 = 0x330
-            irq 0x70 = 9
-          end
-          device pnp 2e.8 on end		# GPIO 2
-          device pnp 2e.9 on end		# GPIO 3
-          device pnp 2e.a on end		# ACPI
-          device pnp 2e.b on			# Hardware monitor
-            io 0x60 = 0x290
-            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 on end			# AC'97 modem
-    end
-  end
+			device pci 1e.0 on end			# PCI bridge
+			device pci 1f.0 on			# ISA/LPC bridge
+				chip superio/winbond/w83627hf		# Super I/O
+					device pnp 2e.0 on			# 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 (only header on board)
+						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			# Keyboard interrupt
+						irq 0x72 = 12			# Mouse interrupt
+					end
+					device pnp 2e.6 off end		# Consumer IR (TODO)
+					device pnp 2e.7 on			# Game port / MIDI / GPIO 1
+						io 0x60 = 0x201
+						io 0x62 = 0x330
+						irq 0x70 = 9
+					end
+					device pnp 2e.8 on end		# GPIO 2
+					device pnp 2e.9 on end		# GPIO 3
+					device pnp 2e.a on end		# ACPI
+					device pnp 2e.b on			# Hardware monitor
+						io 0x60 = 0x290
+						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 on end			# AC'97 modem
+		end
+	end
 end
 
diff --git a/src/mainboard/msi/ms7260/devicetree.cb b/src/mainboard/msi/ms7260/devicetree.cb
index 717ad00..e526625 100644
--- a/src/mainboard/msi/ms7260/devicetree.cb
+++ b/src/mainboard/msi/ms7260/devicetree.cb
@@ -1,143 +1,143 @@
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device cpu_cluster 0 on			# (L)APIC cluster
-    chip cpu/amd/socket_AM2			# CPU socket
-      device lapic 0 on end			# Local APIC of the CPU
-    end
-  end
-  device domain 0 on			# PCI domain
-    subsystemid 0x1462 0x7260 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 4e.0 on		# Floppy
-                io 0x60 = 0x3f0
-                irq 0x70 = 6
-                drq 0x74 = 2
-              end
-              device pnp 4e.1 on		# Parallel port
-                io 0x60 = 0x378
-                irq 0x70 = 7
-              end
-              device pnp 4e.2 on		# Com1
-                io 0x60 = 0x3f8
-                irq 0x70 = 4
-              end
-              device pnp 4e.3 on		# Com2 / IrDA
-                io 0x60 = 0x2f8
-                irq 0x70 = 3
-              end
-              device pnp 4e.5 on		# PS/2 keyboard & mouse
-                io 0x60 = 0x60
-                io 0x62 = 0x64
-                irq 0x70 = 1			# PS/2 keyboard IRQ
-                irq 0x72 = 12			# PS/2 mouse IRQ
-              end
-              device pnp 4e.106 off		# Serial flash interface (SFI)
-                # io 0x62 = 0x100
-              end
-              device pnp 4e.007 off		# GPIO 1
-              end
-              device pnp 4e.107 off		# Game port
-                # io 0x60 = 0x220		# Datasheet: 0x201
-              end
-              device pnp 4e.207 off		# MIDI
-                # io 0x62 = 0x300		# Datasheet: 0x330
-                # irq 0x70 = 9
-              end
-              device pnp 4e.307 off		# GPIO 6
-              end
-              device pnp 4e.8 off		# WDTO#, PLED
-              end
-              device pnp 4e.009 off		# GPIO 2
-              end
-              device pnp 4e.109 off		# GPIO 3
-              end
-              device pnp 4e.209 off		# GPIO 4
-              end
-              device pnp 4e.309 off		# GPIO 5
-              end
-              device pnp 4e.a off		# ACPI
-              end
-              device pnp 4e.b on		# Hardware monitor
-                io 0x60 = 0xa10
-                # TODO: IRQ?
-              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
-          end
-          # TODO: Check if the stuff below is correct / needed.
-          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 off end		# SATA 2 (N/A on this board)
-          device pci 6.0 on end			# PCI
-          device pci 6.1 on end			# AZA (HD Audio)
-          device pci 8.0 on end			# NIC
-          device pci 9.0 off end		# NIC (N/A on this board)
-          device pci a.0 off end		# PCI E 5 (N/A on this board?)
-          device pci b.0 on end			# PCI E 4
-          device pci c.0 on 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"
-          # TODO: Check the two lines below.
-          # 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 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_AM2			# CPU socket
+			device lapic 0 on end			# Local APIC of the CPU
+		end
+	end
+	device domain 0 on			# PCI domain
+		subsystemid 0x1462 0x7260 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 4e.0 on		# Floppy
+								io 0x60 = 0x3f0
+								irq 0x70 = 6
+								drq 0x74 = 2
+							end
+							device pnp 4e.1 on		# Parallel port
+								io 0x60 = 0x378
+								irq 0x70 = 7
+							end
+							device pnp 4e.2 on		# Com1
+								io 0x60 = 0x3f8
+								irq 0x70 = 4
+							end
+							device pnp 4e.3 on		# Com2 / IrDA
+								io 0x60 = 0x2f8
+								irq 0x70 = 3
+							end
+							device pnp 4e.5 on		# PS/2 keyboard & mouse
+								io 0x60 = 0x60
+								io 0x62 = 0x64
+								irq 0x70 = 1			# PS/2 keyboard IRQ
+								irq 0x72 = 12			# PS/2 mouse IRQ
+							end
+							device pnp 4e.106 off		# Serial flash interface (SFI)
+								# io 0x62 = 0x100
+							end
+							device pnp 4e.007 off		# GPIO 1
+							end
+							device pnp 4e.107 off		# Game port
+								# io 0x60 = 0x220		# Datasheet: 0x201
+							end
+							device pnp 4e.207 off		# MIDI
+								# io 0x62 = 0x300		# Datasheet: 0x330
+								# irq 0x70 = 9
+							end
+							device pnp 4e.307 off		# GPIO 6
+							end
+							device pnp 4e.8 off		# WDTO#, PLED
+							end
+							device pnp 4e.009 off		# GPIO 2
+							end
+							device pnp 4e.109 off		# GPIO 3
+							end
+							device pnp 4e.209 off		# GPIO 4
+							end
+							device pnp 4e.309 off		# GPIO 5
+							end
+							device pnp 4e.a off		# ACPI
+							end
+							device pnp 4e.b on		# Hardware monitor
+								io 0x60 = 0xa10
+								# TODO: IRQ?
+							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
+					end
+					# TODO: Check if the stuff below is correct / needed.
+					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 off end		# SATA 2 (N/A on this board)
+					device pci 6.0 on end			# PCI
+					device pci 6.1 on end			# AZA (HD Audio)
+					device pci 8.0 on end			# NIC
+					device pci 9.0 off end		# NIC (N/A on this board)
+					device pci a.0 off end		# PCI E 5 (N/A on this board?)
+					device pci b.0 on end			# PCI E 4
+					device pci c.0 on 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"
+					# TODO: Check the two lines below.
+					# 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 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/msi/ms9185/devicetree.cb b/src/mainboard/msi/ms9185/devicetree.cb
index 013bba3..3a38e10 100644
--- a/src/mainboard/msi/ms9185/devicetree.cb
+++ b/src/mainboard/msi/ms9185/devicetree.cb
@@ -9,79 +9,77 @@ chip northbridge/amd/amdk8/root_complex
 		chip northbridge/amd/amdk8
 			device pci 18.0 on end
 			device pci 18.0 on end
-			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 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
+						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 d.0 on end # PPBX 0x0104
-						device pci e.0 on end # SATA 0x024a
-						device pci e.1 on end # SATA 0x024a bx_a001
-						device pci e.2 on end # SATA 0x024a bx_a001
-						device pci e.3 on end # SATA 0x024a bx_a001
+				chip southbridge/broadcom/bcm5785	# HT1000
+					device pci 0.0 on		# HT PXB 0x0036
+						device pci d.0 on end	# PPBX 0x0104
+						device pci e.0 on end	# SATA 0x024a
+						device pci e.1 on end	# SATA 0x024a bx_a001
+						device pci e.2 on end	# SATA 0x024a bx_a001
+						device pci e.3 on end	# SATA 0x024a bx_a001
 					end
-					device pci 1.0 on # Legacy  pci main  0x0205
+					device pci 1.0 on # Legacy pci main 0x0205
 					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.5 on end # XIOAPIC1
-					device pci 1.6 on end # XIOAPIC2
-					device pci 2.0 on end # USB	 0x0223
-					device pci 2.1 on end # USB
-					device pci 2.2 on end # USB
-					device pci 3.0 on end # it is in bcm5785_0 bus
+					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.1 on end	# USB
+					device pci 2.2 on end	# USB
+					device pci 3.0 on end	# it is in bcm5785_0 bus
 				end
-			end #  device pci 18.0
+			end # device pci 18.0
 			device pci 18.1 on end
 			device pci 18.2 on end
 			device pci 18.3 on end
 		end # amdk8
 	end #domain
 end
-
-
diff --git a/src/mainboard/msi/ms9652_fam10/devicetree.cb b/src/mainboard/msi/ms9652_fam10/devicetree.cb
index a6d5206..b5947fe 100644
--- a/src/mainboard/msi/ms9652_fam10/devicetree.cb
+++ b/src/mainboard/msi/ms9652_fam10/devicetree.cb
@@ -22,148 +22,148 @@
 ##
 
 chip northbridge/amd/amdfam10/root_complex	# Root complex
-  device cpu_cluster 0 on			# (L)APIC cluster
-    chip cpu/amd/socket_F_1207			# CPU socket
-      device lapic 0 on end			# Local APIC of the CPU
-    end
-  end
-  device domain 0 on			# PCI domain
-    subsystemid 0x1462 0x9652 inherit
-    chip northbridge/amd/amdfam10		# Northbridge / RAM controller
-      device pci 18.0 on			# Link 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 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
-              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.106 off		# Serial flash interface (SFI)
-                io 0x60 = 0x100
-              end
-              device pnp 2e.007 off		# GPIO 1
-              end
-              device pnp 2e.107 on		# Game port
-                io 0x60 = 0x220
-              end
-              device pnp 2e.207 on		# MIDI
-                io 0x62 = 0x330
-                irq 0x70 = 0xa
-              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.1 on end			# AZA
-          device pci 8.0 on end			# NIC
-          device pci 9.0 on end			# NIC
-          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			# HT 1.0
-      device pci 18.0 on end			# HT 2.0
-      device pci 18.1 on end
-      device pci 18.2 on end
-      device pci 18.3 on end
-      device pci 18.4 on end
-    end
-  end
+	device cpu_cluster 0 on			# (L)APIC cluster
+		chip cpu/amd/socket_F_1207			# CPU socket
+			device lapic 0 on end			# Local APIC of the CPU
+		end
+	end
+	device domain 0 on			# PCI domain
+		subsystemid 0x1462 0x9652 inherit
+		chip northbridge/amd/amdfam10		# Northbridge / RAM controller
+			device pci 18.0 on			# Link 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 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
+							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.106 off		# Serial flash interface (SFI)
+								io 0x60 = 0x100
+							end
+							device pnp 2e.007 off		# GPIO 1
+							end
+							device pnp 2e.107 on		# Game port
+								io 0x60 = 0x220
+							end
+							device pnp 2e.207 on		# MIDI
+								io 0x62 = 0x330
+								irq 0x70 = 0xa
+							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.1 on end			# AZA
+					device pci 8.0 on end			# NIC
+					device pci 9.0 on end			# NIC
+					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			# HT 1.0
+			device pci 18.0 on end			# HT 2.0
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+			device pci 18.4 on end
+		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/newisys/khepri/devicetree.cb b/src/mainboard/newisys/khepri/devicetree.cb
index bd00d28..d8aa650 100644
--- a/src/mainboard/newisys/khepri/devicetree.cb
+++ b/src/mainboard/newisys/khepri/devicetree.cb
@@ -8,8 +8,8 @@ chip northbridge/amd/amdk8/root_complex
 	device domain 0 on
 		subsystemid 0x17c2 0x0010 inherit
 		chip northbridge/amd/amdk8
-			device pci 18.0 on end # LDT 0
-			device pci 18.0 on     # LDT 1
+			device pci 18.0 on end	# LDT 0
+			device pci 18.0 on	# LDT 1
 				chip southbridge/amd/amd8131
 					device pci 0.0 on end
 					device pci 0.1 on end
@@ -25,44 +25,44 @@ chip northbridge/amd/amdk8/root_complex
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
-							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 on #  Com2
-                	                 			io 0x60 = 0x2f8
-                	                			irq 0x70 = 3
+							device pnp 2e.3 on	# 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 #  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
- 					 			io 0x60 = 0x290
+							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
+							end
 						end
 					end
 					device pci 1.1 on end
@@ -79,4 +79,3 @@ chip northbridge/amd/amdk8/root_complex
 		end
 	end
 end
-
diff --git a/src/mainboard/nokia/ip530/devicetree.cb b/src/mainboard/nokia/ip530/devicetree.cb
index 181155a..60bf77f 100644
--- a/src/mainboard/nokia/ip530/devicetree.cb
+++ b/src/mainboard/nokia/ip530/devicetree.cb
@@ -19,98 +19,98 @@
 ##
 
 chip northbridge/intel/i440bx		# Northbridge
-  device cpu_cluster 0 on		# (L)APIC cluster
-    chip cpu/intel/socket_PGA370	# CPU socket
-      device lapic 0 on end		# Local APIC of the CPU
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 1.0 on end		# PCI/AGP bridge
-    chip southbridge/intel/i82371eb	# Southbridge
-      device pci f.0 on
-        chip southbridge/ti/pci1x2x
-	     device pci 00.0 on
-			subsystemid 0x13b8 0x0000
-	     end
-	     register "scr" = "0x08449060"
-	     register "mrr" = "0x00007522"
+	device cpu_cluster 0 on		# (L)APIC cluster
+		chip cpu/intel/socket_PGA370	# CPU socket
+			device lapic 0 on end		# Local APIC of the CPU
+		end
 	end
-      end
-      device pci 7.0 on			# ISA bridge
-        chip superio/smsc/smscsuperio	# Super I/O (SMSC FDC37B787)
-          device pnp 3f0.0 off end	# Floppy (No connector)
-          device pnp 3f0.3 off end	# Parallel port (No connector)
-          device pnp 3f0.4 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 3f0.5 on		# COM2 / IR
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 3f0.6 on		# RTC
-            irq 0x63 = 0x72
-          end
-          device pnp 3f0.7 off 		# PS/2 keyboard / mouse (No connector)
-          end
-          device pnp 3f0.8 on		# AUX I/O
-            irq 0x24 = 0x84		# OSC
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 1.0 on end		# PCI/AGP bridge
+		chip southbridge/intel/i82371eb	# Southbridge
+			device pci f.0 on
+				chip southbridge/ti/pci1x2x
+					device pci 00.0 on
+						subsystemid 0x13b8 0x0000
+					end
+					register "scr" = "0x08449060"
+					register "mrr" = "0x00007522"
+				end
+			end
+			device pci 7.0 on			# ISA bridge
+				chip superio/smsc/smscsuperio	# Super I/O (SMSC FDC37B787)
+					device pnp 3f0.0 off end	# Floppy (No connector)
+					device pnp 3f0.3 off end	# Parallel port (No connector)
+					device pnp 3f0.4 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 3f0.5 on		# COM2 / IR
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 3f0.6 on		# RTC
+						irq 0x63 = 0x72
+					end
+					device pnp 3f0.7 off		# PS/2 keyboard / mouse (No connector)
+					end
+					device pnp 3f0.8 on		# AUX I/O
+						irq 0x24 = 0x84		# OSC
 
-            irq 0xB2 = 0x0C		# Soft power status 1
-            irq 0xB3 = 0x05		# Soft power status 2
-            irq 0xC0 = 0x03		# IRQ MUX control
+						irq 0xB2 = 0x0C		# Soft power status 1
+						irq 0xB3 = 0x05		# Soft power status 2
+						irq 0xC0 = 0x03		# IRQ MUX control
 
-            irq 0xC8 = 0x10		# GP50 = (I/O) output = Flashrom enable
-            irq 0xCA = 0x09		# GP52 = IRQ8 (output)
-            irq 0xCB = 0x01		# GP53 = nROMCS (output)
-            irq 0xCC = 0x11		# GP54 = (I/O) input
-            irq 0xF9 = 0x00             # read/write GP5x lines (0x1C)
+						irq 0xC8 = 0x10		# GP50 = (I/O) output = Flashrom enable
+						irq 0xCA = 0x09		# GP52 = IRQ8 (output)
+						irq 0xCB = 0x01		# GP53 = nROMCS (output)
+						irq 0xCC = 0x11		# GP54 = (I/O) input
+						irq 0xF9 = 0x00						 # read/write GP5x lines (0x1C)
 
-            irq 0xD0 = 0x08		# GP60 = IRQ1
-            irq 0xD1 = 0x08		# GP61 = IRQ3
-            irq 0xD2 = 0x08		# GP62 = IRQ4
-            irq 0xD3 = 0x11		# GP63 = (I/O) input = JP901 on board
-            irq 0xD4 = 0x11		# GP64 = (I/O) input
-            irq 0xD5 = 0x11		# GP65 = (I/O) input
-            irq 0xD6 = 0x08		# GP66 = IRQ8
-            irq 0xD7 = 0x11		# GP67 = (I/O) input
-            irq 0xFA = 0x00		# read/write GP6x lines (0x88)
+						irq 0xD0 = 0x08		# GP60 = IRQ1
+						irq 0xD1 = 0x08		# GP61 = IRQ3
+						irq 0xD2 = 0x08		# GP62 = IRQ4
+						irq 0xD3 = 0x11		# GP63 = (I/O) input = JP901 on board
+						irq 0xD4 = 0x11		# GP64 = (I/O) input
+						irq 0xD5 = 0x11		# GP65 = (I/O) input
+						irq 0xD6 = 0x08		# GP66 = IRQ8
+						irq 0xD7 = 0x11		# GP67 = (I/O) input
+						irq 0xFA = 0x00		# read/write GP6x lines (0x88)
 
-            irq 0xE0 = 0x00		# GP10 (I/O) = output
-            irq 0xE1 = 0x01		# GP11 (I/O) = input
-            irq 0xE2 = 0x08		# GP12 = P17
-            irq 0xE3 = 0x00		# GP13 (I/O) = output = LED fault on front, active low
-            irq 0xE4 = 0x00		# GP14 (I/O) = output
-            irq 0xE5 = 0x00		# GP15 (I/O) = output
-            irq 0xE6 = 0x01		# GP16 (I/O) = input = JP900 on board, low on short, high on open
-            irq 0xE7 = 0x00 		# GP17 (I/O) = output = LED alert on front, active low
-            irq 0xF6 = 0xFF		# read/write GP1x lines (0xCA)
+						irq 0xE0 = 0x00		# GP10 (I/O) = output
+						irq 0xE1 = 0x01		# GP11 (I/O) = input
+						irq 0xE2 = 0x08		# GP12 = P17
+						irq 0xE3 = 0x00		# GP13 (I/O) = output = LED fault on front, active low
+						irq 0xE4 = 0x00		# GP14 (I/O) = output
+						irq 0xE5 = 0x00		# GP15 (I/O) = output
+						irq 0xE6 = 0x01		# GP16 (I/O) = input = JP900 on board, low on short, high on open
+						irq 0xE7 = 0x00		# GP17 (I/O) = output = LED alert on front, active low
+						irq 0xF6 = 0xFF		# read/write GP1x lines (0xCA)
 
-            irq 0xEF = 0x00		# GP_INT2 disable
-            irq 0xF0 = 0x00		# GP_INT1 disable
-            irq 0xF1 = 0x00		# WDT_UNITS
-            irq 0xF2 = 0x00		# WDT_VAL
-            irq 0xF3 = 0x00		# WDT_CFG
-            irq 0xF4 = 0x20		# WDT_CTRL (stop-cnt)
-          end
-          device pnp 3f0.a off 		# ACPI (No support yet)
-            # irq 0x60 = 0x0C
-            # irq 0x61 = 0x80
-          end
-        end
-      end
-      device pci 7.1 on end		# IDE
-      device pci 7.2 off end		# USB (No connector)
-      device pci 7.3 off end		# ACPI (No support yet)
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      register "ide_legacy_enable" = "1"
-      # Disable UDMA/33 for lower speed if your IDE device(s) don't support it.
-      register "ide0_drive0_udma33_enable" = "1"
-      register "ide0_drive1_udma33_enable" = "1"
-      register "ide1_drive0_udma33_enable" = "1"
-      register "ide1_drive1_udma33_enable" = "1"
-    end
-  end
+						irq 0xEF = 0x00		# GP_INT2 disable
+						irq 0xF0 = 0x00		# GP_INT1 disable
+						irq 0xF1 = 0x00		# WDT_UNITS
+						irq 0xF2 = 0x00		# WDT_VAL
+						irq 0xF3 = 0x00		# WDT_CFG
+						irq 0xF4 = 0x20		# WDT_CTRL (stop-cnt)
+					end
+					device pnp 3f0.a off		# ACPI (No support yet)
+						# irq 0x60 = 0x0C
+						# irq 0x61 = 0x80
+					end
+				end
+			end
+			device pci 7.1 on end		# IDE
+			device pci 7.2 off end		# USB (No connector)
+			device pci 7.3 off end		# ACPI (No support yet)
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			register "ide_legacy_enable" = "1"
+			# Disable UDMA/33 for lower speed if your IDE device(s) don't support it.
+			register "ide0_drive0_udma33_enable" = "1"
+			register "ide0_drive1_udma33_enable" = "1"
+			register "ide1_drive0_udma33_enable" = "1"
+			register "ide1_drive1_udma33_enable" = "1"
+		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/packardbell/ms2290/devicetree.cb b/src/mainboard/packardbell/ms2290/devicetree.cb
index a57a2c1..0db1211 100644
--- a/src/mainboard/packardbell/ms2290/devicetree.cb
+++ b/src/mainboard/packardbell/ms2290/devicetree.cb
@@ -64,9 +64,9 @@ chip northbridge/intel/nehalem
 			register "pirqh_routing" = "0x0b"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
 			register "gpi7_routing" = "2"
 			register "gpi8_routing" = "2"
 
diff --git a/src/mainboard/pcengines/alix1c/devicetree.cb b/src/mainboard/pcengines/alix1c/devicetree.cb
index 85e967a..37ac531 100644
--- a/src/mainboard/pcengines/alix1c/devicetree.cb
+++ b/src/mainboard/pcengines/alix1c/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 on #  Parallel Port
+					device pnp 2e.1 on	# 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 on end #  GPIO2
-					device pnp 2e.9 on end #  GPIO3
-					device pnp 2e.a on end #  ACPI
-					device pnp 2e.b on #  HW Monitor
+					device pnp 2e.8 on end	# GPIO2
+					device pnp 2e.9 on end	# GPIO3
+					device pnp 2e.a on 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.
@@ -83,4 +83,3 @@ chip northbridge/amd/lx
 	end
 
 end
-
diff --git a/src/mainboard/pcengines/alix2d/devicetree.cb b/src/mainboard/pcengines/alix2d/devicetree.cb
index d8aa3bc..ee0c92f 100644
--- a/src/mainboard/pcengines/alix2d/devicetree.cb
+++ b/src/mainboard/pcengines/alix2d/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:
@@ -21,18 +21,18 @@ chip northbridge/amd/lx
 			register "com1_enable" = "1"
 			register "com1_address" = "0x3F8"
 			register "com1_irq" = "4"
-			register "com2_enable" = "1"                # Wired on Alix.2D13 only
+			register "com2_enable" = "1"		# Wired on Alix.2D13 only
 			register "com2_address" = "0x2F8"
 			register "com2_irq" = "3"
 			register "unwanted_vpci[0]" = "0x80000900"	# Disable VGA controller (not wired)
 			register "unwanted_vpci[1]" = "0x80007B00"	# Disable AC97 controller (not wired)
-			register "unwanted_vpci[2]" = "0"	        # End of list has a zero
+			register "unwanted_vpci[2]" = "0"		# End of list has a zero
 			device pci f.0 on end	# ISA Bridge
 			device pci f.1 on end	# Flash controller
 			device pci f.2 on end	# IDE controller
 			device pci f.4 on end	# OHCI
 			device pci f.5 on end	# EHCI
-      		end
+		end
 	end
 
 	# APIC cluster is late CPU init.
@@ -43,4 +43,3 @@ chip northbridge/amd/lx
 	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/roda/rk886ex/devicetree.cb b/src/mainboard/roda/rk886ex/devicetree.cb
index 7b9d7a1..23c9a5f 100644
--- a/src/mainboard/roda/rk886ex/devicetree.cb
+++ b/src/mainboard/roda/rk886ex/devicetree.cb
@@ -21,21 +21,21 @@
 
 chip northbridge/intel/i945
 
-        device cpu_cluster 0 on
-                chip cpu/intel/socket_mFCPGA478
-                        device lapic 0 on end
-                end
-        end
+	device cpu_cluster 0 on
+		chip cpu/intel/socket_mFCPGA478
+			device lapic 0 on end
+		end
+	end
 
-        device domain 0 on
-                subsystemid 0x4352 0x6886 inherit
-                device pci 00.0 on end # host bridge
+	device domain 0 on
+		subsystemid 0x4352 0x6886 inherit
+		device pci 00.0 on end # host bridge
 		# auto detection:
 		#device pci 01.0 off end # i945 PCIe root port
 		device pci 02.0 on end # vga controller
 		device pci 02.1 on end # display controller
 
-                chip southbridge/intel/i82801gx
+		chip southbridge/intel/i82801gx
 			register "pirqa_routing" = "0x0b"
 			register "pirqb_routing" = "0x0b"
 			register "pirqc_routing" = "0x0b"
@@ -46,75 +46,74 @@ chip northbridge/intel/i945
 			register "pirqh_routing" = "0x0b"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
 			register "gpi13_routing" = "2"
-			register "gpi8_routing"  = "1"
-			register "gpi7_routing"  = "2"
+			register "gpi8_routing" = "1"
+			register "gpi7_routing" = "2"
 			register "gpe0_en" = "0x20800007"
 
-                        register "ide_legacy_combined" = "0x1"
-                        register "ide_enable_primary" = "0x1"
-                        register "ide_enable_secondary" = "0x0"
-                        register "sata_ahci" = "0x0"
+			register "ide_legacy_combined" = "0x1"
+			register "ide_enable_primary" = "0x1"
+			register "ide_enable_secondary" = "0x0"
+			register "sata_ahci" = "0x0"
 
-                	device pci 1b.0 on end # High Definition Audio
-                	device pci 1c.0 on end # PCIe
-                	device pci 1c.1 on end # PCIe
-                	device pci 1c.2 on end # PCIe
+			device pci 1b.0 on end # High Definition Audio
+			device pci 1c.0 on end # PCIe
+			device pci 1c.1 on end # PCIe
+			device pci 1c.2 on end # PCIe
 			#device pci 1c.3 off end # PCIe port 4
 			#device pci 1c.4 off end # PCIe port 5
 			#device pci 1c.5 off end # PCIe port 6
-                	device pci 1d.0 on end # USB UHCI
-                	device pci 1d.1 on end # USB UHCI
-                	device pci 1d.2 on end # USB UHCI
-                	device pci 1d.3 on end # USB UHCI
-                	device pci 1d.7 on end # USB2 EHCI
-                	device pci 1e.0 on
+			device pci 1d.0 on end # USB UHCI
+			device pci 1d.1 on end # USB UHCI
+			device pci 1d.2 on end # USB UHCI
+			device pci 1d.3 on end # USB UHCI
+			device pci 1d.7 on end # USB2 EHCI
+			device pci 1e.0 on
 				chip southbridge/ti/pci7420
-                        		register "smartcard_enabled" = "0x0"
+					register "smartcard_enabled" = "0x0"
 					device pci 3.0 on end
 					device pci 3.1 on end
 					device pci 3.2 on end
-					device pci 3.3 off end  # smartcard
+					device pci 3.3 off end # smartcard
 				end
 			end # PCI bridge
 			#device pci 1e.2 off end # AC'97 Audio
 			#device pci 1e.3 off end # AC'97 Modem
-                        device pci 1f.0 on # LPC bridge
-                                chip superio/smsc/lpc47n227
+			device pci 1f.0 on # LPC bridge
+				chip superio/smsc/lpc47n227
 					device pnp 2e.1 on # Parallel port
-						 io 0x60 = 0x378
+						io 0x60 = 0x378
 						irq 0x70 = 5
 					end
 					device pnp 2e.2 on # COM1
-                                                 io 0x60 = 0x3f8
-                                                irq 0x70 = 4
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
 					end
 					device pnp 2e.3 on # COM2
-                                                 io 0x60 = 0x2f8
-                                                irq 0x70 = 3
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
 					end
 					device pnp 2e.5 off # Keyboard+Mouse
-					#	 io 0x60 = 0x60
-					#	 io 0x62 = 0x64
+					#	io 0x60 = 0x60
+					#	io 0x62 = 0x64
 					#	irq 0x70 = 1
 					#	irq 0x72 = 12
 					end
-                                end
+				end
 				chip superio/renesas/m3885x
 					device pnp ff.1 on # dummy address
 					end
 				end
 				chip ec/acpi
 				end
-
-                        end
+			end
 			#device pci 1f.1 off end # IDE
-                        device pci 1f.2 on end  # SATA
-                        device pci 1f.3 on end  # SMBus
+			device pci 1f.2 on end	# SATA
+			device pci 1f.3 on end	# SMBus
 			#device pci 1f.4 off end # Realtek ID Codec
-                end
-        end
+		end
+	end
 end
diff --git a/src/mainboard/roda/rk9/devicetree.cb b/src/mainboard/roda/rk9/devicetree.cb
index 5989278..65e8ff1 100644
--- a/src/mainboard/roda/rk9/devicetree.cb
+++ b/src/mainboard/roda/rk9/devicetree.cb
@@ -37,10 +37,10 @@ chip northbridge/intel/gm45
 			register "pirqg_routing" = "0x80"
 			register "pirqh_routing" = "0x80"
 
-			register "gpi8_routing"  = "2"
-			register "gpi7_routing"  = "2"
+			register "gpi8_routing"	= "2"
+			register "gpi7_routing"	= "2"
 			register "gpe0_en" = "0x01800042"
-			register "gpi1_routing"  = "1"
+			register "gpi1_routing"	= "1"
 			register "alt_gp_smi_en" = "0x0002"
 
 			# Set AHCI mode, enable ports 1 and 2.
@@ -124,15 +124,15 @@ chip northbridge/intel/gm45
 			device pci 1f.0 on # LPC bridge
 				chip superio/smsc/lpc47n227
 					device pnp 2e.1 on # Parallel port
-						 io 0x60 = 0x378
+						io 0x60 = 0x378
 						irq 0x70 = 5
 					end
 					device pnp 2e.2 on # COM1
-						 io 0x60 = 0x3f8
+						io 0x60 = 0x3f8
 						irq 0x70 = 4
 					end
 					device pnp 2e.3 on # COM2
-						 io 0x60 = 0x2f8
+						io 0x60 = 0x2f8
 						irq 0x70 = 3
 					end
 					device pnp 2e.5 off # Keyboard+Mouse
diff --git a/src/mainboard/samsung/lumpy/devicetree.cb b/src/mainboard/samsung/lumpy/devicetree.cb
index 69729d7..dc1b03f 100644
--- a/src/mainboard/samsung/lumpy/devicetree.cb
+++ b/src/mainboard/samsung/lumpy/devicetree.cb
@@ -52,9 +52,9 @@ chip northbridge/intel/sandybridge
 			register "pirqh_routing" = "0x80"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
 			register "alt_gp_smi_en" = "0x0002"
 			register "gpi1_routing" = "1"
 			register "gpi7_routing" = "2"
@@ -115,11 +115,11 @@ chip northbridge/intel/sandybridge
 				end
 
 				chip drivers/generic/ioapic
-				     register "have_isa_interrupts" = "1"
-				     register "irq_on_fsb" = "1"
-				     register "enable_virtual_wire" = "1"
-				     register "base" = "0xfec00000"
-				     device ioapic 4 on end
+					register "have_isa_interrupts" = "1"
+					register "irq_on_fsb" = "1"
+					register "enable_virtual_wire" = "1"
+					register "base" = "0xfec00000"
+					device ioapic 4 on end
 				end
 			end
 			device pci 1f.2 on # SATA Controller 1
diff --git a/src/mainboard/samsung/stumpy/devicetree.cb b/src/mainboard/samsung/stumpy/devicetree.cb
index ab03c79..16e2b26 100644
--- a/src/mainboard/samsung/stumpy/devicetree.cb
+++ b/src/mainboard/samsung/stumpy/devicetree.cb
@@ -43,9 +43,9 @@ chip northbridge/intel/sandybridge
 			register "pirqh_routing" = "0x80"
 
 			# GPI routing
-			#  0 No effect (default)
-			#  1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
-			#  2 SCI (if corresponding GPIO_EN bit is also set)
+			#	0 No effect (default)
+			#	1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set)
+			#	2 SCI (if corresponding GPIO_EN bit is also set)
 			register "gpi1_routing" = "0"
 			register "gpi14_routing" = "2"
 
@@ -54,24 +54,24 @@ chip northbridge/intel/sandybridge
 			# SuperIO range is 0x700-0x73f
 			register "gen2_dec" = "0x003c0701"
 
-			device pci 16.0 on end # Management Engine Interface 1
-			device pci 16.1 off end # Management Engine Interface 2
-			device pci 16.2 off end # Management Engine IDE-R
-			device pci 16.3 off end # Management Engine KT
-			device pci 19.0 off end # Intel Gigabit Ethernet
-			device pci 1a.0 on end # USB2 EHCI #2
-			device pci 1b.0 on end # High Definition Audio
-			device pci 1c.0 on end # PCIe Port #1 (WLAN)
-			device pci 1c.1 off end # PCIe Port #2
-			device pci 1c.2 on end # PCIe Port #3 (Debug)
-			device pci 1c.3 on end # PCIe Port #4 (LAN)
-			device pci 1c.4 off end # PCIe Port #5
-			device pci 1c.5 off end # PCIe Port #6
-			device pci 1c.6 off end # PCIe Port #7
-			device pci 1c.7 off end # PCIe Port #8
-			device pci 1d.0 on end # USB2 EHCI #1
-			device pci 1e.0 off end # PCI bridge
-			device pci 1f.0 on # LPC bridge
+			device pci 16.0 on end	# Management Engine Interface 1
+			device pci 16.1 off end	# Management Engine Interface 2
+			device pci 16.2 off end	# Management Engine IDE-R
+			device pci 16.3 off end	# Management Engine KT
+			device pci 19.0 off end	# Intel Gigabit Ethernet
+			device pci 1a.0 on end	# USB2 EHCI #2
+			device pci 1b.0 on end	# High Definition Audio
+			device pci 1c.0 on end	# PCIe Port #1 (WLAN)
+			device pci 1c.1 off end	# PCIe Port #2
+			device pci 1c.2 on end	# PCIe Port #3 (Debug)
+			device pci 1c.3 on end	# PCIe Port #4 (LAN)
+			device pci 1c.4 off end	# PCIe Port #5
+			device pci 1c.5 off end	# PCIe Port #6
+			device pci 1c.6 off end	# PCIe Port #7
+			device pci 1c.7 off end	# PCIe Port #8
+			device pci 1d.0 on end	# USB2 EHCI #1
+			device pci 1e.0 off end	# PCI bridge
+			device pci 1f.0 on	# LPC bridge
 				chip superio/ite/it8772f
 					# Enable GPIO10 as USBPWRON12#
 					# Enable GPIO12 as USBPWRON13#
@@ -116,10 +116,10 @@ chip northbridge/intel/sandybridge
 					device pnp 2e.a off end # IR
 				end
 			end
-			device pci 1f.2 on end # SATA Controller 1
-			device pci 1f.3 on end # SMBus
-			device pci 1f.5 off end # SATA Controller 2
-			device pci 1f.6 on end # Thermal
+			device pci 1f.2 on end	# SATA Controller 1
+			device pci 1f.3 on end	# SMBus
+			device pci 1f.5 off end	# SATA Controller 2
+			device pci 1f.6 on end	# Thermal
 		end
 	end
 end
diff --git a/src/mainboard/siemens/sitemp_g1p1/devicetree.cb b/src/mainboard/siemens/sitemp_g1p1/devicetree.cb
index 1d83f10..b6dab1b 100644
--- a/src/mainboard/siemens/sitemp_g1p1/devicetree.cb
+++ b/src/mainboard/siemens/sitemp_g1p1/devicetree.cb
@@ -17,29 +17,29 @@ chip northbridge/amd/amdk8/root_complex
 	device domain 0 on
 		subsystemid 0x110a 0x4076 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  # Northbridge configuration space (0x7910)
+					device pci 0.0 on	# Northbridge configuration space (0x7910)
 					end
-					device pci 1.0 on  # Internal Graphics P2P bridge 0x7912
+					device pci 1.0 on	# Internal Graphics P2P bridge 0x7912
 						device pci 5.0 on # Internal Graphics 0x791F
 						end
 						device pci 5.2 on #
 						end
 					end
-					device pci 2.0 on  #  PCIE P2P bridge 0x7913  (external GFX-port0)
+					device pci 2.0 on	# PCIE P2P bridge 0x7913 (external GFX-port0)
 					end
-					device pci 3.0 off  # PCIE P2P bridge 0x791b (external GFX-port1)
+					device pci 3.0 off	# PCIE P2P bridge 0x791b (external GFX-port1)
 					end
-					device pci 4.0 on  #  PCIE P2P bridge port 0 (0x7914)
+					device pci 4.0 on	# PCIE P2P bridge port 0 (0x7914)
 					end
-					device pci 5.0 on  #  PCIE P2P bridge port 1  (0x7915)
+					device pci 5.0 on	# PCIE P2P bridge port 1 (0x7915)
 					end
-					device pci 6.0 on  #  PCIE P2P bridge port 2  (0x7916)
+					device pci 6.0 on	# PCIE P2P bridge port 2 (0x7916)
 					end
-					device pci 7.0 on  #  PCIE P2P bridge port 3  (0x7917)
+					device pci 7.0 on	# PCIE P2P bridge port 3 (0x7917)
 					end
-					device pci 8.0 off  # NB/SB Link P2P bridge
+					device pci 8.0 off	# NB/SB Link P2P bridge
 					end
 					register "gpp_configuration" = "4"
 					register "port_enable" = "0xfc"
@@ -52,14 +52,14 @@ chip northbridge/amd/amdk8/root_complex
 					register "gfx_link_width" = "0" # 4 (0x8) if PLX installed
 				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
+					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
@@ -73,46 +73,46 @@ chip northbridge/amd/amdk8/root_complex
 							device i2c 53 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/ite/it8712f
-							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 on #  Com1
+							device pnp 2e.1 on	# Com1
 								io 0x60 = 0x3f8
 								irq 0x70 = 4
 							end
-							device pnp 2e.2 on #  Com2
+							device pnp 2e.2 on	# Com2
 								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 2e.3 off #  Parallel Port
+							device pnp 2e.3 off	# Parallel Port
 								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 2e.4 off end #  EC
-							device pnp 2e.5 on #  Keyboard
+							device pnp 2e.4 off end	# EC
+							device pnp 2e.5 on	# Keyboard
 								io 0x60 = 0x60
 								io 0x62 = 0x64
 								irq 0x70 = 1
 							end
-							device pnp 2e.6 on #  Mouse
+							device pnp 2e.6 on	# Mouse
 								irq 0x70 = 12
 							end
-							device pnp 2e.7 off #  GPIO, must be closed for unresolved reason.
+							device pnp 2e.7 off	# GPIO, must be closed for unresolved reason.
 							end
-							device pnp 2e.8 off #  MIDI
+							device pnp 2e.8 off	# MIDI
 								io 0x60 = 0x300
 								irq 0x70 = 9
 							end
-							device pnp 2e.9 off #  GAME
+							device pnp 2e.9 off	# GAME
 								io 0x60 = 0x220
 							end
-							device pnp 2e.a off end #  CIR
+							device pnp 2e.a off end	# CIR
 						end	#superio/ite/it8712f
 					end		#LPC
 					device pci 14.4 on end # PCI 0x4384
@@ -122,7 +122,7 @@ chip northbridge/amd/amdk8/root_complex
 #						register "sata0_enable" = "1"
 						register "hda_viddid" = "0x10ec0882"
 				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
@@ -132,4 +132,3 @@ chip northbridge/amd/amdk8/root_complex
 		end		#northbridge/amd/amdk8
 	end #domain
 end		#northbridge/amd/amdk8/root_complex
-
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb b/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb
index c7c9ec3..e4f8fe9 100644
--- a/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb
@@ -19,55 +19,55 @@
 ##
 
 chip northbridge/intel/i440bx		# Northbridge
-  device cpu_cluster 0 on		# APIC cluster
-    chip cpu/intel/slot_1		# CPU
-      device lapic 0 on end		# APIC
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 1.0 on end		# PCI/AGP bridge
-    chip southbridge/intel/i82371eb	# Southbridge
-      device pci 7.0 on			# ISA bridge
-        chip superio/ite/it8671f	# Super I/O
-          device pnp 370.0 on		# Floppy
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          end
-          device pnp 370.1 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 370.2 on		# COM2
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 370.3 on		# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-          end
-          device pnp 370.5 on		# PS/2 keyboard
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1
-          end
-          device pnp 370.6 on           # PS/2 mouse
-            irq 0x70 = 12
-          end
-        end
-      end
-      device pci 7.1 on	end		# IDE
-      device pci 7.2 on	end		# USB
-      device pci 7.3 on end		# ACPI
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      register "ide_legacy_enable" = "1"
-      # Enable UDMA/33 for higher speed if your IDE device(s) support it.
-      register "ide0_drive0_udma33_enable" = "0"
-      register "ide0_drive1_udma33_enable" = "0"
-      register "ide1_drive0_udma33_enable" = "0"
-      register "ide1_drive1_udma33_enable" = "0"
-    end
-  end
+	device cpu_cluster 0 on		# APIC cluster
+		chip cpu/intel/slot_1		# CPU
+			device lapic 0 on end		# APIC
+		end
+	end
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 1.0 on end		# PCI/AGP bridge
+		chip southbridge/intel/i82371eb	# Southbridge
+			device pci 7.0 on			# ISA bridge
+				chip superio/ite/it8671f	# Super I/O
+					device pnp 370.0 on		# Floppy
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					end
+					device pnp 370.1 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 370.2 on		# COM2
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 370.3 on		# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+					end
+					device pnp 370.5 on		# PS/2 keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1
+					end
+					device pnp 370.6 on		# PS/2 mouse
+						irq 0x70 = 12
+					end
+				end
+			end
+			device pci 7.1 on end		# IDE
+			device pci 7.2 on end		# USB
+			device pci 7.3 on end		# ACPI
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			register "ide_legacy_enable" = "1"
+			# Enable UDMA/33 for higher speed if your IDE device(s) support it.
+			register "ide0_drive0_udma33_enable" = "0"
+			register "ide0_drive1_udma33_enable" = "0"
+			register "ide1_drive0_udma33_enable" = "0"
+			register "ide1_drive1_udma33_enable" = "0"
+		end
+	end
 end
diff --git a/src/mainboard/sunw/ultra40/devicetree.cb b/src/mainboard/sunw/ultra40/devicetree.cb
index 9f9bb67..f1eba44 100644
--- a/src/mainboard/sunw/ultra40/devicetree.cb
+++ b/src/mainboard/sunw/ultra40/devicetree.cb
@@ -1,151 +1,151 @@
 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 0x108e 0x0040 inherit
-    chip northbridge/amd/amdk8			# Northbridge / RAM controller
-      device pci 18.0 on end
-      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/smsc/lpc47m10x		# Super I/O
-              device pnp 2e.0 off		# Floppy
-                io 0x60 = 0x3f0
-                irq 0x70 = 6
-                drq 0x74 = 2
-              end
-              device pnp 2e.3 off		# Parallel port
-                io 0x60 = 0x378
-                irq 0x70 = 7
-              end
-              device pnp 2e.4 on		# Com1
-                io 0x60 = 0x3f8
-                irq 0x70 = 4
-              end
-              device pnp 2e.5 off		# Com2
-                io 0x60 = 0x2f8
-                irq 0x70 = 3
-              end
-              device pnp 2e.7 off		# PS/2 keyboard
-                io 0x60 = 0x60
-                io 0x62 = 0x64
-                irq 0x70 = 1
-                irq 0x72 = 12
-              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 CK804 PCI-E
-            #   device i2c 54 on end
-            # end
-            # chip drivers/generic/generic	# Slave CK804 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			# 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 end			# PCI
-          device pci a.0 on end			# NIC
-          device pci b.0 off end		# PCI E 3
-          device pci c.0 off end		# PCI E 2
-          device pci d.0 off end		# PCI E 1
-          device pci e.0 on end			# PCI E 0
-          register "ide0_enable" = "1"
-          register "ide1_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 2
-      device pci 18.1 on end
-      device pci 18.2 on end
-      device pci 18.3 on end
-    end
-    chip northbridge/amd/amdk8			# Northbridge / RAM controller
-      device pci 19.0 on end			# Link 0
-      device pci 19.0 on			# Link 1 == LDT 1
-        chip southbridge/nvidia/ck804		# Southbridge
-          device pci 0.0 on end			# HT
-          device pci 1.0 on end			# LPC
-          device pci 1.1 off end		# SM
-          device pci 2.0 off end		# USB 1.1
-          device pci 2.1 off end		# USB 2
-          device pci 4.0 off end		# ACI
-          device pci 4.1 off end		# MCI
-          device pci 6.0 off end		# IDE
-          device pci 7.0 off end		# SATA 1
-          device pci 8.0 off end		# SATA 0
-          device pci 9.0 off end		# PCI
-          device pci a.0 on end			# NIC
-          device pci b.0 off end		# PCI E 3
-          device pci c.0 off end		# PCI E 2
-          device pci d.0 off end		# PCI E 1
-          device pci e.0 on end			# PCI E 0
-          # 1: SMBus under 2e.8, 2: SM0 3: SM1
-          register "mac_eeprom_smbus" = "3"
-          register "mac_eeprom_addr" = "0x51"
-        end
-      end
-      device pci 19.0 on end
-      device pci 19.1 on end
-      device pci 19.2 on end
-      device pci 19.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 0x108e 0x0040 inherit
+		chip northbridge/amd/amdk8			# Northbridge / RAM controller
+			device pci 18.0 on end
+			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/smsc/lpc47m10x		# Super I/O
+							device pnp 2e.0 off		# Floppy
+								io 0x60 = 0x3f0
+								irq 0x70 = 6
+								drq 0x74 = 2
+							end
+							device pnp 2e.3 off		# Parallel port
+								io 0x60 = 0x378
+								irq 0x70 = 7
+							end
+							device pnp 2e.4 on		# Com1
+								io 0x60 = 0x3f8
+								irq 0x70 = 4
+							end
+							device pnp 2e.5 off		# Com2
+								io 0x60 = 0x2f8
+								irq 0x70 = 3
+							end
+							device pnp 2e.7 off		# PS/2 keyboard
+								io 0x60 = 0x60
+								io 0x62 = 0x64
+								irq 0x70 = 1
+								irq 0x72 = 12
+							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 CK804 PCI-E
+						#	 device i2c 54 on end
+						# end
+						# chip drivers/generic/generic	# Slave CK804 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			# 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 end			# PCI
+					device pci a.0 on end			# NIC
+					device pci b.0 off end		# PCI E 3
+					device pci c.0 off end		# PCI E 2
+					device pci d.0 off end		# PCI E 1
+					device pci e.0 on end			# PCI E 0
+					register "ide0_enable" = "1"
+					register "ide1_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 2
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
+		chip northbridge/amd/amdk8			# Northbridge / RAM controller
+			device pci 19.0 on end			# Link 0
+			device pci 19.0 on			# Link 1 == LDT 1
+				chip southbridge/nvidia/ck804		# Southbridge
+					device pci 0.0 on end			# HT
+					device pci 1.0 on end			# LPC
+					device pci 1.1 off end		# SM
+					device pci 2.0 off end		# USB 1.1
+					device pci 2.1 off end		# USB 2
+					device pci 4.0 off end		# ACI
+					device pci 4.1 off end		# MCI
+					device pci 6.0 off end		# IDE
+					device pci 7.0 off end		# SATA 1
+					device pci 8.0 off end		# SATA 0
+					device pci 9.0 off end		# PCI
+					device pci a.0 on end			# NIC
+					device pci b.0 off end		# PCI E 3
+					device pci c.0 off end		# PCI E 2
+					device pci d.0 off end		# PCI E 1
+					device pci e.0 on end			# PCI E 0
+					# 1: SMBus under 2e.8, 2: SM0 3: SM1
+					register "mac_eeprom_smbus" = "3"
+					register "mac_eeprom_addr" = "0x51"
+				end
+			end
+			device pci 19.0 on end
+			device pci 19.1 on end
+			device pci 19.2 on end
+			device pci 19.3 on end
+		end
+	end
 end
diff --git a/src/mainboard/supermicro/h8dme/devicetree.cb b/src/mainboard/supermicro/h8dme/devicetree.cb
index 754e316..99995a3 100644
--- a/src/mainboard/supermicro/h8dme/devicetree.cb
+++ b/src/mainboard/supermicro/h8dme/devicetree.cb
@@ -1,126 +1,126 @@
 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 0x15d9 0x1511 inherit
-    chip northbridge/amd/amdk8			# Northbridge / RAM controller
-      device pci 18.0 on end
-      device pci 18.0 on end
-      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/w83627hf	# 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
-                io 0x60 = 0x60
-                io 0x62 = 0x64
-                irq 0x70 = 1
-                irq 0x72 = 12
-              end
-              device pnp 2e.6 off		# SFI
-                io 0x62 = 0x100
-              end
-              device pnp 2e.7 off		# GPIO, game port, MIDI
-                io 0x60 = 0x220
-                io 0x62 = 0x300
-                irq 0x70 = 9
-              end
-              device pnp 2e.8 off end		# WDTO PLED
-              device pnp 2e.9 off end		# GPIO SUSLED
-              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/i2c/i2cmux2
-              device i2c 48 off end
-              device i2c 49 off 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			# PCI
-            device pci 6.0 on end
-          end
-          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			# PCI E 5
-            device pci 0.0 on end		# NEC PCI-X
-            device pci 0.1 on			# NEC PCI-X
-              device pci 4.0 on end		# SCSI
-              device pci 4.1 on end		# SCSI
-            end
-          end
-          device pci b.0 on end			# PCI E 4
-          device pci c.0 on 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 0x15d9 0x1511 inherit
+		chip northbridge/amd/amdk8			# Northbridge / RAM controller
+			device pci 18.0 on end
+			device pci 18.0 on end
+			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/w83627hf	# 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
+								io 0x60 = 0x60
+								io 0x62 = 0x64
+								irq 0x70 = 1
+								irq 0x72 = 12
+							end
+							device pnp 2e.6 off		# SFI
+								io 0x62 = 0x100
+							end
+							device pnp 2e.7 off		# GPIO, game port, MIDI
+								io 0x60 = 0x220
+								io 0x62 = 0x300
+								irq 0x70 = 9
+							end
+							device pnp 2e.8 off end		# WDTO PLED
+							device pnp 2e.9 off end		# GPIO SUSLED
+							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/i2c/i2cmux2
+							device i2c 48 off end
+							device i2c 49 off 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			# PCI
+						device pci 6.0 on end
+					end
+					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			# PCI E 5
+						device pci 0.0 on end		# NEC PCI-X
+						device pci 0.1 on			# NEC PCI-X
+							device pci 4.0 on end		# SCSI
+							device pci 4.1 on end		# SCSI
+						end
+					end
+					device pci b.0 on end			# PCI E 4
+					device pci c.0 on 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/supermicro/h8dmr/devicetree.cb b/src/mainboard/supermicro/h8dmr/devicetree.cb
index b363674..95e972b 100644
--- a/src/mainboard/supermicro/h8dmr/devicetree.cb
+++ b/src/mainboard/supermicro/h8dmr/devicetree.cb
@@ -1,146 +1,146 @@
 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 0x15d9 0x1511 inherit
-    chip northbridge/amd/amdk8			# Northbridge / RAM controller
-      device pci 18.0 on end
-      device pci 18.0 on end
-      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/w83627hf	# 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
-                io 0x60 = 0x60
-                io 0x62 = 0x64
-                irq 0x70 = 1
-                irq 0x72 = 12
-              end
-              device pnp 2e.6 off		# SFI
-                io 0x62 = 0x100
-              end
-              device pnp 2e.7 off		# GPIO, game port, MIDI
-                io 0x60 = 0x220
-                io 0x62 = 0x300
-                irq 0x70 = 9
-              end
-              device pnp 2e.8 off end		# WDTO PLED
-              device pnp 2e.9 off end		# GPIO SUSLED
-              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			# PCI
-            device pci 6.0 on end
-          end
-          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			# PCI E 5
-            device pci 0.0 on end		# NEC PCI-X
-            device pci 0.1 on			# NEC PCI-X
-              device pci 4.0 on end		# SCSI
-              device pci 4.1 on end		# SCSI
-            end
-          end
-          device pci b.0 on end			# PCI E 4
-          device pci c.0 on 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 0x15d9 0x1511 inherit
+		chip northbridge/amd/amdk8			# Northbridge / RAM controller
+			device pci 18.0 on end
+			device pci 18.0 on end
+			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/w83627hf	# 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
+								io 0x60 = 0x60
+								io 0x62 = 0x64
+								irq 0x70 = 1
+								irq 0x72 = 12
+							end
+							device pnp 2e.6 off		# SFI
+								io 0x62 = 0x100
+							end
+							device pnp 2e.7 off		# GPIO, game port, MIDI
+								io 0x60 = 0x220
+								io 0x62 = 0x300
+								irq 0x70 = 9
+							end
+							device pnp 2e.8 off end		# WDTO PLED
+							device pnp 2e.9 off end		# GPIO SUSLED
+							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			# PCI
+						device pci 6.0 on end
+					end
+					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			# PCI E 5
+						device pci 0.0 on end		# NEC PCI-X
+						device pci 0.1 on		# NEC PCI-X
+							device pci 4.0 on end		# SCSI
+							device pci 4.1 on end		# SCSI
+						end
+					end
+					device pci b.0 on end			# PCI E 4
+					device pci c.0 on 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/supermicro/h8dmr_fam10/devicetree.cb b/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
index 9e52d07..eae3a2d 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
+++ b/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
@@ -1,152 +1,152 @@
 chip northbridge/amd/amdfam10/root_complex	# Root complex
-  device cpu_cluster 0 on			# (L)APIC cluster
-    chip cpu/amd/socket_F_1207			# CPU socket
-      device lapic 0 on end			# Local APIC of the CPU
-    end
-  end
-  device domain 0 on			# PCI domain
-    subsystemid 0x15d9 0x1511 inherit
-    chip northbridge/amd/amdfam10		# Northbridge / RAM controller
-      device pci 18.0 on end
-      device pci 18.0 on end
-      device pci 18.0 on			# SB on link 2.0
-        chip southbridge/nvidia/mcp55		# Southbridge
-          device pci 0.0 on end			# HT
-          device pci 1.0 on			# LPC
-            chip superio/winbond/w83627hf	# 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
-                io 0x60 = 0x60
-                io 0x62 = 0x64
-                irq 0x70 = 1
-                irq 0x72 = 12
-              end
-              device pnp 2e.6 off		# SFI
-                io 0x62 = 0x100
-              end
-              device pnp 2e.7 off		# GPIO, game port, MIDI
-                io 0x60 = 0x220
-                io 0x62 = 0x300
-                irq 0x70 = 9
-              end
-              device pnp 2e.8 off end		# WDTO PLED
-              device pnp 2e.9 off end		# GPIO SUSLED
-              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			# PCI
-            device pci 6.0 on end
-          end
-          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			# PCI E 5
-            device pci 0.0 on end		# NEC PCI-X
-            device pci 0.1 on			# NEC PCI-X
-              device pci 4.0 on end		# SCSI
-              device pci 4.1 on end		# SCSI
-            end
-          end
-          device pci b.0 on end			# PCI E 4
-          device pci c.0 on 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
-      device pci 18.4 on end
-      device pci 19.0 on end
-      device pci 19.1 on end
-      device pci 19.2 on end
-      device pci 19.3 on end
-      device pci 19.4 on end
-    end
-  end
+	device cpu_cluster 0 on			# (L)APIC cluster
+		chip cpu/amd/socket_F_1207			# CPU socket
+			device lapic 0 on end			# Local APIC of the CPU
+		end
+	end
+	device domain 0 on			# PCI domain
+		subsystemid 0x15d9 0x1511 inherit
+		chip northbridge/amd/amdfam10		# Northbridge / RAM controller
+			device pci 18.0 on end
+			device pci 18.0 on end
+			device pci 18.0 on			# SB on link 2.0
+				chip southbridge/nvidia/mcp55		# Southbridge
+					device pci 0.0 on end			# HT
+					device pci 1.0 on			# LPC
+						chip superio/winbond/w83627hf	# 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
+								io 0x60 = 0x60
+								io 0x62 = 0x64
+								irq 0x70 = 1
+								irq 0x72 = 12
+							end
+							device pnp 2e.6 off		# SFI
+								io 0x62 = 0x100
+							end
+							device pnp 2e.7 off		# GPIO, game port, MIDI
+								io 0x60 = 0x220
+								io 0x62 = 0x300
+								irq 0x70 = 9
+							end
+							device pnp 2e.8 off end		# WDTO PLED
+							device pnp 2e.9 off end		# GPIO SUSLED
+							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			# PCI
+						device pci 6.0 on end
+					end
+					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			# PCI E 5
+						device pci 0.0 on end		# NEC PCI-X
+						device pci 0.1 on			# NEC PCI-X
+							device pci 4.0 on end		# SCSI
+							device pci 4.1 on end		# SCSI
+						end
+					end
+					device pci b.0 on end			# PCI E 4
+					device pci c.0 on 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
+			device pci 18.4 on end
+			device pci 19.0 on end
+			device pci 19.1 on end
+			device pci 19.2 on end
+			device pci 19.3 on end
+			device pci 19.4 on end
+		end
+	end
 end
diff --git a/src/mainboard/supermicro/h8qgi/devicetree.cb b/src/mainboard/supermicro/h8qgi/devicetree.cb
index d99a6ba..6b6e65e 100644
--- a/src/mainboard/supermicro/h8qgi/devicetree.cb
+++ b/src/mainboard/supermicro/h8qgi/devicetree.cb
@@ -26,96 +26,96 @@ chip northbridge/amd/agesa/family15/root_complex
 	device domain 0 on
 		subsystemid 0x15d9 0xab11 inherit #SuperMicro
 		chip northbridge/amd/agesa/family15 # CPU side of HT root complex
-			device pci 18.0 on     # Put IO-HUB at link_num 0, Instead of HT Link topology
+			device pci 18.0 on	# Put IO-HUB at link_num 0, Instead of HT Link topology
 				chip northbridge/amd/cimx/rd890 # Southbridge PCI side of HT Root complex
-					device pci 0.0 on  end # HT Root Complex 0x9600
-					device pci 0.1 off end # CLKCONFIG
-					device pci 2.0 on  end # GPP1 Port0  x16 SLOT4, 0x5A16
-					device pci 3.0 off end # GPP1 Port1
-					device pci 4.0 off end # GPP3a Port0  x4 SAS
-					device pci 5.0 off end # GPP3a Port1
-					device pci 6.0 off end # GPP3a Port2
-					device pci 7.0 off end # GPP3a Port3
-					device pci 8.0 off end # NB/SB Link P2P bridge, should be hidden at boot time
-					device pci 9.0 off end # GPP3a Port4  x1 NC
-					device pci a.0 off end # GPP3a Port5  x1 NC
-					device pci b.0 off end # GPP2 Port0 (Not for sr5650)
-					device pci c.0 off end # GPP2 Port1 (Not for sr5650/sr5670)
-					device pci d.0 on  end # GPP3b Port0 (Not for sr5650/sr5670) 0x5A1E, Intel 82576
-					register "gpp1_configuration" = "0"   # Configuration 16:0 default
-					register "gpp2_configuration" = "1"   # Configuration 8:8
-					register "gpp3a_configuration" = "2"   # 2 Configuration 4:1:1:0:0:0, 11 Configuration 1:1:1:1:1:1
+					device pci 0.0 on end	# HT Root Complex 0x9600
+					device pci 0.1 off end	# CLKCONFIG
+					device pci 2.0 on end	# GPP1 Port0	x16 SLOT4, 0x5A16
+					device pci 3.0 off end	# GPP1 Port1
+					device pci 4.0 off end	# GPP3a Port0	x4 SAS
+					device pci 5.0 off end	# GPP3a Port1
+					device pci 6.0 off end	# GPP3a Port2
+					device pci 7.0 off end	# GPP3a Port3
+					device pci 8.0 off end	# NB/SB Link P2P bridge, should be hidden at boot time
+					device pci 9.0 off end	# GPP3a Port4	x1 NC
+					device pci a.0 off end	# GPP3a Port5	x1 NC
+					device pci b.0 off end	# GPP2 Port0 (Not for sr5650)
+					device pci c.0 off end	# GPP2 Port1 (Not for sr5650/sr5670)
+					device pci d.0 on end	# GPP3b Port0 (Not for sr5650/sr5670) 0x5A1E, Intel 82576
+					register "gpp1_configuration" = "0"	# Configuration 16:0 default
+					register "gpp2_configuration" = "1"	# Configuration 8:8
+					register "gpp3a_configuration" = "2"	# 2 Configuration 4:1:1:0:0:0, 11 Configuration 1:1:1:1:1:1
 					register "port_enable" = "0x2104"
 				end #northbridge/amd/cimx/rd890
 				chip southbridge/amd/cimx/sb700 # 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 # USB1
-					device pci 12.1 on end # USB1
-					device pci 12.2 on end # USB1
-					device pci 13.0 on end # USB2
-					device pci 13.1 on end # USB2
-					device pci 13.2 on end # USB2
-					device pci 14.0 on end # SM
-					device pci 14.1 off end # IDE  0x439c
-					device pci 14.2 off end # HDA  0x4383, h8qgi not have codec.
-					device pci 14.3 on # LPC  0x439d
+					device pci 11.0 on end	# SATA
+					device pci 12.0 on end	# USB1
+					device pci 12.1 on end	# USB1
+					device pci 12.2 on end	# USB1
+					device pci 13.0 on end	# USB2
+					device pci 13.1 on end	# USB2
+					device pci 13.2 on end	# USB2
+					device pci 14.0 on end	# SM
+					device pci 14.1 off end	# IDE	0x439c
+					device pci 14.2 off end	# HDA	0x4383, h8qgi not have codec.
+					device pci 14.3 on	# LPC	0x439d
 						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
 							## though UARTs are on the NUVOTON BMC, superio only used to support PS2 KB/MS##
-							device pnp 2e.5 on #  PS/2 keyboard & mouse
+							device pnp 2e.5 on	# PS/2 keyboard & mouse
 								io 0x60 = 0x60
 								io 0x62 = 0x64
-								irq 0x70 = 0x01 #keyboard
-								irq 0x72 = 0x0C #mouse
+								irq 0x70 = 0x01	#keyboard
+								irq 0x72 = 0x0C	#mouse
 							end
-							device pnp 2e.6 off #  SPI
+							device pnp 2e.6 off	# SPI
 							end
-							device pnp 2e.307 off #  GPIO6
+							device pnp 2e.307 off	# GPIO6
 							end
-							device pnp 2e.8 off #  WDTO#, PLED
+							device pnp 2e.8 off	# 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 off # HWM
+							device pnp 2e.b off	# HWM
 								io 0x60 = 0x290
 							end
-							device pnp 2e.c off # PECI, SST
+							device pnp 2e.c off	# PECI, SST
 							end
 						end #superio/winbond/w83627dhg
 						chip drivers/i2c/w83795
-							device pnp 5e on #hwm
+							device pnp 5e on	#hwm
 							end
 						end #drivers/i2c/w83795
 					end # LPC
 					device pci 14.4 on
-						device pci 4.0 on end # onboard VGA
+						device pci 4.0 on end	# onboard VGA
 					end # PCI 0x4384
-					device pci 14.5 on end # USB 3
-					register "boot_switch_sata_ide" = "0"   # 0: boot from SATA. 1: IDE
+					device pci 14.5 on end	# USB 3
+					register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				end # southbridge/amd/cimx/sb700
 			end # device pci 18.0
 
@@ -135,4 +135,3 @@ chip northbridge/amd/agesa/family15/root_complex
 		end #chip northbridge/amd/agesa/family15 # CPU side of HT root complex
 	end #domain
 end #northbridge/amd/agesa/family15/root_complex
-
diff --git a/src/mainboard/supermicro/h8qme_fam10/devicetree.cb b/src/mainboard/supermicro/h8qme_fam10/devicetree.cb
index 6956b45..87d0c8d 100644
--- a/src/mainboard/supermicro/h8qme_fam10/devicetree.cb
+++ b/src/mainboard/supermicro/h8qme_fam10/devicetree.cb
@@ -1,115 +1,115 @@
 chip northbridge/amd/amdfam10/root_complex	# Root complex
-  device cpu_cluster 0 on			# (L)APIC cluster
-    chip cpu/amd/socket_F_1207			# CPU socket
-      device lapic 0 on end			# Local APIC of the CPU
-    end
-  end
-  device domain 0 on			# PCI domain
-    subsystemid 0x15d9 0x1511 inherit
-    chip northbridge/amd/amdfam10		# Northbridge / RAM controller
-      device pci 18.0 on end
-      device pci 18.0 on end
-      device pci 18.0 on			# SB on link 2
-        chip southbridge/nvidia/mcp55		# Southbridge
-          device pci 0.0 on end			# HT
-          device pci 1.0 on			# LPC
-            chip superio/winbond/w83627hf	# 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
-                io 0x60 = 0x60
-                io 0x62 = 0x64
-                irq 0x70 = 1
-                irq 0x72 = 12
-              end
-              device pnp 2e.6 off		# SFI
-                io 0x62 = 0x100
-              end
-              device pnp 2e.7 off		# GPIO, game port, MIDI
-                io 0x60 = 0x220
-                io 0x62 = 0x300
-                irq 0x70 = 9
-              end
-              device pnp 2e.8 off end		# WDTO PLED
-              device pnp 2e.9 off end		# GPIO SUSLED
-              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 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	# 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.1 off end		# AZA
-          device pci 7.0 on
-              device pci 1.0 on end
-          end
-          device pci 8.0 off end
-          device pci 9.0 off end
-          device pci a.0 on end			# PCI E 5
-          device pci b.0 on end			# PCI E 4
-          device pci c.0 on 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
-      device pci 18.4 on end
-      device pci 19.0 on end
-      device pci 19.0 on end
-      device pci 19.0 on
-        chip southbridge/amd/amd8132
-          device pci 0.0 on end
-          device pci 0.1 on end
-          device pci 1.0 on
-            device pci 3.0 on end
-            device pci 3.1 on end
-          end
-          device pci 1.1 on end
-        end
-      end
-      device pci 19.1 on end
-      device pci 19.2 on end
-      device pci 19.3 on end
-      device pci 19.4 on end
-    end
-  end
+	device cpu_cluster 0 on			# (L)APIC cluster
+		chip cpu/amd/socket_F_1207			# CPU socket
+			device lapic 0 on end			# Local APIC of the CPU
+		end
+	end
+	device domain 0 on			# PCI domain
+		subsystemid 0x15d9 0x1511 inherit
+		chip northbridge/amd/amdfam10		# Northbridge / RAM controller
+			device pci 18.0 on end
+			device pci 18.0 on end
+			device pci 18.0 on			# SB on link 2
+				chip southbridge/nvidia/mcp55		# Southbridge
+					device pci 0.0 on end			# HT
+					device pci 1.0 on			# LPC
+						chip superio/winbond/w83627hf	# 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
+								io 0x60 = 0x60
+								io 0x62 = 0x64
+								irq 0x70 = 1
+								irq 0x72 = 12
+							end
+							device pnp 2e.6 off		# SFI
+								io 0x62 = 0x100
+							end
+							device pnp 2e.7 off		# GPIO, game port, MIDI
+								io 0x60 = 0x220
+								io 0x62 = 0x300
+								irq 0x70 = 9
+							end
+							device pnp 2e.8 off end		# WDTO PLED
+							device pnp 2e.9 off end		# GPIO SUSLED
+							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 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	# 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.1 off end		# AZA
+					device pci 7.0 on
+							device pci 1.0 on end
+					end
+					device pci 8.0 off end
+					device pci 9.0 off end
+					device pci a.0 on end			# PCI E 5
+					device pci b.0 on end			# PCI E 4
+					device pci c.0 on 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
+			device pci 18.4 on end
+			device pci 19.0 on end
+			device pci 19.0 on end
+			device pci 19.0 on
+				chip southbridge/amd/amd8132
+					device pci 0.0 on end
+					device pci 0.1 on end
+					device pci 1.0 on
+						device pci 3.0 on end
+						device pci 3.1 on end
+					end
+					device pci 1.1 on end
+				end
+			end
+			device pci 19.1 on end
+			device pci 19.2 on end
+			device pci 19.3 on end
+			device pci 19.4 on end
+		end
+	end
 end
diff --git a/src/mainboard/supermicro/h8scm/devicetree.cb b/src/mainboard/supermicro/h8scm/devicetree.cb
index a4e6c97..3cf338b 100644
--- a/src/mainboard/supermicro/h8scm/devicetree.cb
+++ b/src/mainboard/supermicro/h8scm/devicetree.cb
@@ -23,96 +23,96 @@ chip northbridge/amd/agesa/family15/root_complex
 		end
 	end
 	device domain 0 on
-		subsystemid 0x15d9 0xab11 inherit #Supermicro
-		chip northbridge/amd/agesa/family15 # CPU side of HT root complex
-			device pci 18.0 on     # Put IO-HUB at link_num 0, Instead of HT Link topology
-				chip northbridge/amd/cimx/rd890 # Southbridge PCI side of HT Root complex
-					device pci 0.0 on  end # HT Root Complex 0x9600
-					device pci 0.1 on end # CLKCONFIG
-					device pci 2.0 on  end # GPP1 Port0  x16 SLOT4, 0x5A16
-					device pci 3.0 on end # GPP1 Port1
-					device pci 4.0 on end # GPP3a Port0  x4 SAS
-					device pci 5.0 off end # GPP3a Port1
-					device pci 6.0 off end # GPP3a Port2
-					device pci 7.0 off end # GPP3a Port3
-					device pci 8.0 off end # NB/SB Link P2P bridge, should be hidden at boot time
-					device pci 9.0 on end # GPP3a Port4  x1 NC
-					device pci a.0 on end # GPP3a Port5  x1 NC
-					device pci b.0 off end # GPP2 Port0 (Not for sr5650)
-					device pci c.0 off end # GPP2 Port1 (Not for sr5650/sr5670)
-					device pci d.0 off  end # GPP3b Port0 (Not for sr5650/sr5670) 0x5A1E, Intel 82576
-					register "gpp1_configuration" = "1"   # Configuration 16:0 default
-					#register "gpp2_configuration" = "0"   # Configuration 8:8
-					register "gpp3a_configuration" = "2"   # 2 Configuration 4:1:1:0:0:0, 11 Configuration 1:1:1:1:1:1
+		subsystemid 0x15d9 0xab11 inherit	#Supermicro
+		chip northbridge/amd/agesa/family15	# CPU side of HT root complex
+			device pci 18.0 on	# Put IO-HUB at link_num 0, Instead of HT Link topology
+				chip northbridge/amd/cimx/rd890	# Southbridge PCI side of HT Root complex
+					device pci 0.0 on end	# HT Root Complex 0x9600
+					device pci 0.1 on end	# CLKCONFIG
+					device pci 2.0 on end	# GPP1 Port0	x16 SLOT4, 0x5A16
+					device pci 3.0 on end	# GPP1 Port1
+					device pci 4.0 on end	# GPP3a Port0	x4 SAS
+					device pci 5.0 off end	# GPP3a Port1
+					device pci 6.0 off end	# GPP3a Port2
+					device pci 7.0 off end	# GPP3a Port3
+					device pci 8.0 off end	# NB/SB Link P2P bridge, should be hidden at boot time
+					device pci 9.0 on end	# GPP3a Port4	x1 NC
+					device pci a.0 on end	# GPP3a Port5	x1 NC
+					device pci b.0 off end	# GPP2 Port0 (Not for sr5650)
+					device pci c.0 off end	# GPP2 Port1 (Not for sr5650/sr5670)
+					device pci d.0 off end	# GPP3b Port0 (Not for sr5650/sr5670) 0x5A1E, Intel 82576
+					register "gpp1_configuration" = "1"	# Configuration 16:0 default
+					#register "gpp2_configuration" = "0"	# Configuration 8:8
+					register "gpp3a_configuration" = "2"	# 2 Configuration 4:1:1:0:0:0, 11 Configuration 1:1:1:1:1:1
 					register "port_enable" = "0x61f"
 				end #northbridge/amd/cimx/rd890
 				chip southbridge/amd/cimx/sb700 # 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 # USB1
-					device pci 12.1 on end # USB1
-					device pci 12.2 on end # USB1
-					device pci 13.0 on end # USB2
-					device pci 13.1 on end # USB2
-					device pci 13.2 on end # USB2
-					device pci 14.0 on end # SM
-					device pci 14.1 off end # IDE  0x439c
-					device pci 14.2 off end # HDA  0x4383, h8scm not have codec.
-					device pci 14.3 on # LPC  0x439d
+					device pci 11.0 on end	# SATA
+					device pci 12.0 on end	# USB1
+					device pci 12.1 on end	# USB1
+					device pci 12.2 on end	# USB1
+					device pci 13.0 on end	# USB2
+					device pci 13.1 on end	# USB2
+					device pci 13.2 on end	# USB2
+					device pci 14.0 on end	# SM
+					device pci 14.1 off end	# IDE	0x439c
+					device pci 14.2 off end	# HDA	0x4383, h8scm not have codec.
+					device pci 14.3 on	# LPC	0x439d
 						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
 							## though UARTs are on the NUVOTON BMC, superio only used to support PS2 KB/MS##
-							device pnp 2e.5 on #  PS/2 keyboard & mouse
+							device pnp 2e.5 on	# PS/2 keyboard & mouse
 								io 0x60 = 0x60
 								io 0x62 = 0x64
-								irq 0x70 = 0x01 #keyboard
-								irq 0x72 = 0x0C #mouse
+								irq 0x70 = 0x01	# keyboard
+								irq 0x72 = 0x0C	# mouse
 							end
-							device pnp 2e.6 off #  SPI
+							device pnp 2e.6 off	# SPI
 							end
-							device pnp 2e.307 off #  GPIO6
+							device pnp 2e.307 off	# GPIO6
 							end
-							device pnp 2e.8 off #  WDTO#, PLED
+							device pnp 2e.8 off	# 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 off # HWM
+							device pnp 2e.b off	# HWM
 								io 0x60 = 0x290
 							end
-							device pnp 2e.c off # PECI, SST
+							device pnp 2e.c off	# PECI, SST
 							end
 						end #superio/winbond/w83627dhg
 						chip drivers/i2c/w83795
-							device pnp 5e on #hwm
+							device pnp 5e on	#hwm
 							end
 						end #drivers/i2c/w83795
 					end # LPC
-					device pci 14.4 on end # PCI 0x4384
-					device pci 14.5 on end # USB 3
-					register "boot_switch_sata_ide" = "0"   # 0: boot from SATA. 1: IDE
+					device pci 14.4 on end	# PCI 0x4384
+					device pci 14.5 on end	# USB 3
+					register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				end # southbridge/amd/cimx/sb700
 			end # device pci 18.0
 
@@ -130,4 +130,3 @@ chip northbridge/amd/agesa/family15/root_complex
 		end #chip northbridge/amd/agesa/family15 # CPU side of HT root complex
 	end #domain
 end #northbridge/amd/agesa/family15/root_complex
-
diff --git a/src/mainboard/supermicro/h8scm_fam10/devicetree.cb b/src/mainboard/supermicro/h8scm_fam10/devicetree.cb
index 9dda5d8..1f0b7a3 100644
--- a/src/mainboard/supermicro/h8scm_fam10/devicetree.cb
+++ b/src/mainboard/supermicro/h8scm_fam10/devicetree.cb
@@ -1,11 +1,11 @@
-# GPP1 (dev2,3)   --> slot 7
-# GPP2 (dev12) --> slot 6
-# GPP3A (dev9,A) --> Lan1, Lan2
+# GPP1 (dev2,3)		--> slot 7
+# GPP2 (dev12)		--> slot 6
+# GPP3A (dev9,A)	--> Lan1, Lan2
 
 # sample config for supermicro/h8scm_fam10
 chip northbridge/amd/amdfam10/root_complex
 	device cpu_cluster 0 on
-		chip cpu/amd/socket_C32  #L1 and DDR3
+		chip cpu/amd/socket_C32	#L1 and DDR3
 			 device lapic 0 on end
 		end
 	end
@@ -14,86 +14,86 @@ chip northbridge/amd/amdfam10/root_complex
 		chip northbridge/amd/amdfam10
 			##device pci 18.0 on end
 			##device pci 18.0 on end
-			device pci 18.0 on #  northbridge
+			device pci 18.0 on	# northbridge
 				chip southbridge/amd/sr5650
-					device pci 0.0 on end # HT  	0x9600
-					device pci 0.1 on end # CLKCONFIG
-					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x9603
-					device pci 3.0 off end # PCIE P2P bridge	0x960b
-					device pci 4.0 off end # PCIE P2P bridge 0x9604
-					device pci 5.0 off end # PCIE P2P bridge 0x9605
-					device pci 6.0 on  end # PCIE P2P bridge 0x9606
-					device pci 7.0 on  end # PCIE P2P bridge 0x9607
-					device pci 8.0 on  end # NB/SB Link P2P bridge
-					device pci 9.0 on  end #
-					device pci a.0 on  end #
-					device pci b.0 on  end #
-					device pci c.0 on  end #
-					device pci d.0 on  end #
-					register "gpp1_configuration" = "0"   # Configuration 16:0 default
-					register "gpp2_configuration" = "1"   # Configuration 8:8
-					#register "gpp3a_configuration" = "2"   # Configuration 4:1:1:0:0:0
-					register "gpp3a_configuration" = "11"   # Configuration 1:1:1:1:1:1
+					device pci 0.0 on end	# HT	0x9600
+					device pci 0.1 on end	# CLKCONFIG
+					device pci 2.0 on end	# PCIE P2P bridge (external graphics) 0x9603
+					device pci 3.0 off end	# PCIE P2P bridge	0x960b
+					device pci 4.0 off end	# PCIE P2P bridge 0x9604
+					device pci 5.0 off end	# PCIE P2P bridge 0x9605
+					device pci 6.0 on end	# PCIE P2P bridge 0x9606
+					device pci 7.0 on end	# PCIE P2P bridge 0x9607
+					device pci 8.0 on end	# NB/SB Link P2P bridge
+					device pci 9.0 on end	#
+					device pci a.0 on end	#
+					device pci b.0 on end	#
+					device pci c.0 on end	#
+					device pci d.0 on end	#
+					register "gpp1_configuration" = "0"	# Configuration 16:0 default
+					register "gpp2_configuration" = "1"	# Configuration 8:8
+					#register "gpp3a_configuration" = "2"	# Configuration 4:1:1:0:0:0
+					register "gpp3a_configuration" = "11"	# Configuration 1:1:1:1:1:1
 					register "port_enable" = "0x1ffc"
 				end
 				chip southbridge/amd/sb700 # (model:sp5100) it is under NB/SB Link, but on the same pri bus
-					device pci 11.0 on end # SATA
-					device pci 12.0 on end # USB
-					device pci 12.1 on end # USB
-					device pci 12.2 on end # USB
-					device pci 13.0 on end # USB
-					device pci 13.1 on end # USB
-					device pci 13.2 on end # USB
-	 				device pci 14.0 on end # SM
-					device pci 14.1 on end # IDE    0x439c
-					device pci 14.2 off end # HDA    0x4383, h8scm doesnt have codec.
-					device pci 14.3 on # LPC	0x439d
+					device pci 11.0 on end	# SATA
+					device pci 12.0 on end	# USB
+					device pci 12.1 on end	# USB
+					device pci 12.2 on end	# USB
+					device pci 13.0 on end	# USB
+					device pci 13.1 on end	# USB
+					device pci 13.2 on end	# USB
+					device pci 14.0 on end	# SM
+					device pci 14.1 on end	# IDE	0x439c
+					device pci 14.2 off end	# HDA	0x4383, h8scm doesnt have codec.
+					device pci 14.3 on	# LPC	0x439d
 						chip superio/winbond/w83627hf
-							device pnp 2e.0 off #  Floppy
-                	                 			io 0x60 = 0x3f0
-                	                			irq 0x70 = 6
-                	                			drq 0x74 = 2
+							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
+							device pnp 2e.1 off	# Parallel Port
+								io 0x60 = 0x378
+								irq 0x70 = 7
 							end
-                	        			device pnp 2e.2 off #  Com1
-                	                 			io 0x60 = 0x3f8
-                	                			irq 0x70 = 4
+							device pnp 2e.2 off	# 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  # SFI
-                	                 			io 0x62 = 0x100
+							device pnp 2e.6 off	# SFI
+								io 0x62 = 0x100
 							end
-                	        			device pnp 2e.7 off #  GPIO_GAME_MIDI
+							device pnp 2e.7 off	# GPIO_GAME_MIDI
 								io 0x60 = 0x220
 								io 0x62 = 0x300
 								irq 0x70 = 9
 							end
-                	        			device pnp 2e.8 off end #  WDTO_PLED
-                	        			device pnp 2e.9 off end #  GPIO_SUSLED
-                	        			device pnp 2e.a off end #  ACPI
-                	        			device pnp 2e.b on #  HW Monitor
- 					 			io 0x60 = 0x290
+							device pnp 2e.8 off end	# WDTO_PLED
+							device pnp 2e.9 off end	# GPIO_SUSLED
+							device pnp 2e.a off end	# ACPI
+							device pnp 2e.b on	# HW Monitor
+								io 0x60 = 0x290
 								irq 0x70 = 5
-                					end
+							end
 						end	#superio/winbond/w83627hf
 					end		#LPC
 					device pci 14.4 on end # PCI 0x4384
 					device pci 14.5 on end # USB 2
-					register "boot_switch_sata_ide" = "0"   # 0: boot from SATA. 1: IDE
+					register "boot_switch_sata_ide" = "0"	# 0: boot from SATA. 1: IDE
 				end	#southbridge/amd/sb700
-			end #  device pci 18.0
+			end # device pci 18.0
 			device pci 18.1 on end
 			device pci 18.2 on end
 			device pci 18.3 on end
@@ -108,18 +108,16 @@ chip northbridge/amd/amdfam10/root_complex
 	#for node 32 to node 63
 #	device domain 0 on
 #		chip northbridge/amd/amdfam10
-#			  device pci 00.0 on end#  northbridge
-#			  device pci 00.0 on end
-#			  device pci 00.0 on end
-#			  device pci 00.0 on end
-#			  device pci 00.1 on end
-#			  device pci 00.2 on end
-#			  device pci 00.3 on end
-#			  device pci 00.4 on end
-#			 device pci 00.5 on end
+#			device pci 00.0 on end# northbridge
+#			device pci 00.0 on end
+#			device pci 00.0 on end
+#			device pci 00.0 on end
+#			device pci 00.1 on end
+#			device pci 00.2 on end
+#			device pci 00.3 on end
+#			device pci 00.4 on end
+#			device pci 00.5 on end
 #		end
 #	end #domain
 
 end
-
-
diff --git a/src/mainboard/supermicro/x6dai_g/devicetree.cb b/src/mainboard/supermicro/x6dai_g/devicetree.cb
index 60508a3..2db7276 100644
--- a/src/mainboard/supermicro/x6dai_g/devicetree.cb
+++ b/src/mainboard/supermicro/x6dai_g/devicetree.cb
@@ -1,7 +1,7 @@
 chip northbridge/intel/e7525 # mch
 	device domain 0 on
 		subsystemid 0x15d9 0x6780 inherit
-		chip southbridge/intel/esb6300  # esb6300
+		chip southbridge/intel/esb6300	# esb6300
 			register "pirq_a_d" = "0x0b0a0a05"
 			register "pirq_e_h" = "0x0a0b0c80"
 
@@ -20,11 +20,11 @@ chip northbridge/intel/e7525 # mch
 					device pnp 2e.0 off end
 					device pnp 2e.1 off end
 					device pnp 2e.2 on
-						 io 0x60 = 0x3f8
+						io 0x60 = 0x3f8
 						irq 0x70 = 4
 					end
 					device pnp 2e.3 on
-						 io 0x60 = 0x2f8
+						io 0x60 = 0x2f8
 						irq 0x70 = 3
 					end
 					device pnp 2e.4 off end
@@ -32,7 +32,7 @@ chip northbridge/intel/e7525 # mch
 					device pnp 2e.6 off end
 					device pnp 2e.7 off end
 					device pnp 2e.9 off end
-					device pnp 2e.a on  end
+					device pnp 2e.a on end
 					device pnp 2e.b off end
 					device pnp 2e.f off end
 					device pnp 2e.10 off end
@@ -62,4 +62,3 @@ chip northbridge/intel/e7525 # mch
 		end
 	end
 end
-
diff --git a/src/mainboard/supermicro/x6dhe_g/devicetree.cb b/src/mainboard/supermicro/x6dhe_g/devicetree.cb
index 322860b..0b79d60 100644
--- a/src/mainboard/supermicro/x6dhe_g/devicetree.cb
+++ b/src/mainboard/supermicro/x6dhe_g/devicetree.cb
@@ -1,4 +1,4 @@
-chip northbridge/intel/e7520  # MCH
+chip northbridge/intel/e7520	# MCH
 	device domain 0 on
 		subsystemid 0x15d9 0x6080 inherit
 		chip southbridge/intel/esb6300	# ESB6300
@@ -8,7 +8,7 @@ chip northbridge/intel/e7520  # MCH
 			device pci 1c.0 on
 				chip drivers/generic/generic
 					device pci 01.0 on end	# onboard gige1
-					device pci 02.0 on end 	# onboard gige2
+					device pci 02.0 on end	# onboard gige2
 				end
 			end
 
@@ -27,7 +27,7 @@ chip northbridge/intel/e7520  # MCH
 			end
 
 
-			device pci 1f.0 on 	# ISA bridge
+			device pci 1f.0 on	# ISA bridge
 				chip superio/winbond/w83627hf
 					device pnp 2e.0 off end
 					device pnp 2e.2 on
@@ -55,26 +55,26 @@ chip northbridge/intel/e7520  # MCH
 		end
 
 		device pci 00.0	on end	# Northbridge
-		device pci 00.1	on end  # Northbridge Error reporting
+		device pci 00.1	on end	# Northbridge Error reporting
 		device pci 01.0 on end
 		device pci 02.0 on
 			chip southbridge/intel/pxhd	# PXHD 6700
-				device pci 00.0 on end   # bridge
-				device pci 00.1 on end   # I/O apic
-				device pci 00.2 on end   # bridge
-				device pci 00.3 on end   # I/O apic
+				device pci 00.0 on end	# bridge
+				device pci 00.1 on end	# I/O apic
+				device pci 00.2 on end	# bridge
+				device pci 00.3 on end	# I/O apic
 			end
 		end
-#	 	device register "intrline" = "0x00070105"
-		device 	pci 04.0 on end
-		device 	pci 06.0 on end
+#		device register "intrline" = "0x00070105"
+		device pci 04.0 on end
+		device pci 06.0 on end
 	end
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_mPGA604  	# CPU 0
+		chip cpu/intel/socket_mPGA604	# CPU 0
 			device lapic 0 on end
 		end
-		chip cpu/intel/socket_mPGA604 	# CPU 1
+		chip cpu/intel/socket_mPGA604	# CPU 1
 			device lapic 6 on end
 		end
 	end
diff --git a/src/mainboard/supermicro/x6dhe_g2/devicetree.cb b/src/mainboard/supermicro/x6dhe_g2/devicetree.cb
index 984814e..9968c86 100644
--- a/src/mainboard/supermicro/x6dhe_g2/devicetree.cb
+++ b/src/mainboard/supermicro/x6dhe_g2/devicetree.cb
@@ -1,4 +1,4 @@
-chip northbridge/intel/e7520  # MCH
+chip northbridge/intel/e7520	# MCH
 	device domain 0 on
 		subsystemid 0x15d9 0x6080 inherit
 		chip southbridge/intel/i82801ex	# ICH5R
@@ -8,7 +8,7 @@ chip northbridge/intel/e7520  # MCH
 			device pci 1c.0 on
 				chip drivers/generic/generic
 					device pci 01.0 on end	# onboard gige1
-					device pci 02.0 on end 	# onboard gige2
+					device pci 02.0 on end	# onboard gige2
 				end
 			end
 
@@ -27,7 +27,7 @@ chip northbridge/intel/e7520  # MCH
 			end
 
 
-			device pci 1f.0 on 	# ISA bridge
+			device pci 1f.0 on	# ISA bridge
 				chip superio/nsc/pc87427
 					device pnp 2e.0 off end
 					device pnp 2e.2 on
@@ -55,26 +55,26 @@ chip northbridge/intel/e7520  # MCH
 		end
 
 		device pci 00.0	on end	# Northbridge
-		device pci 00.1	on end  # Northbridge Error reporting
+		device pci 00.1	on end	# Northbridge Error reporting
 		device pci 01.0 on end
 		device pci 02.0 on
 			chip southbridge/intel/pxhd	# PXHD 6700
-				device pci 00.0 on end   # bridge
-				device pci 00.1 on end   # I/O apic
-				device pci 00.2 on end   # bridge
-				device pci 00.3 on end   # I/O apic
+				device pci 00.0 on end	# bridge
+				device pci 00.1 on end	# I/O apic
+				device pci 00.2 on end	# bridge
+				device pci 00.3 on end	# I/O apic
 			end
 		end
-#	 	device register "intrline" = "0x00070105"
-		device 	pci 04.0 on end
-		device 	pci 06.0 on end
+#		device register "intrline" = "0x00070105"
+		device pci 04.0 on end
+		device pci 06.0 on end
 	end
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_mPGA604  	# CPU 0
+		chip cpu/intel/socket_mPGA604	# CPU 0
 			device lapic 0 on end
 		end
-		chip cpu/intel/socket_mPGA604 	# CPU 1
+		chip cpu/intel/socket_mPGA604	# CPU 1
 			device lapic 6 on end
 		end
 	end
diff --git a/src/mainboard/supermicro/x6dhr_ig/devicetree.cb b/src/mainboard/supermicro/x6dhr_ig/devicetree.cb
index 3a037fb..becaa2f 100644
--- a/src/mainboard/supermicro/x6dhr_ig/devicetree.cb
+++ b/src/mainboard/supermicro/x6dhr_ig/devicetree.cb
@@ -29,7 +29,7 @@ chip northbridge/intel/e7520 # mch
 					device pnp 2e.6 off end
 					device pnp 2e.7 off end
 					device pnp 2e.9 off end
-					device pnp 2e.a on  end
+					device pnp 2e.a on end
 					device pnp 2e.b off end
 				end
 			end
@@ -41,7 +41,7 @@ chip northbridge/intel/e7520 # mch
 			register "pirq_e_h" = "0x0a808080"
 		end
 		device pci 00.0 on end
-		device pci 00.1  on end
+		device pci 00.1 on end
 		device pci 01.0 on end
 		device pci 02.0 on end
 		device pci 03.0 on
@@ -52,9 +52,9 @@ chip northbridge/intel/e7520 # mch
 				device pci 0.2 on
 				# On board gig e1000
 					chip drivers/generic/generic
-        		        	        device pci 02.0 on end
-        		        	        device pci 02.1 on end
-        		        	end
+						device pci 02.0 on end
+						device pci 02.1 on end
+					end
 				end
 				device pci 0.3 on end
 			end
@@ -63,7 +63,7 @@ chip northbridge/intel/e7520 # mch
 			chip southbridge/intel/pxhd # pxhd2
 				# Bus bridges and ioapics usually bus 5
 				device pci 0.0 on end
-				# Slot 6  is usually 6:2.0
+				# Slot 6 is usually 6:2.0
 				device pci 0.1 on end
 				device pci 0.2 on end
 				# Slot 7 is usually 7:2.0
@@ -82,4 +82,3 @@ chip northbridge/intel/e7520 # mch
 	end
 	register "intrline" = "0x00070105"
 end
-
diff --git a/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb b/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb
index ca8650b..1e230fb 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb
+++ b/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb
@@ -29,7 +29,7 @@ chip northbridge/intel/e7520 # mch
 					device pnp 2e.6 off end
 					device pnp 2e.7 off end
 					device pnp 2e.9 off end
-					device pnp 2e.a on  end
+					device pnp 2e.a on end
 					device pnp 2e.b off end
 				end
 			end
@@ -51,9 +51,9 @@ chip northbridge/intel/e7520 # mch
 				device pci 0.0 on
 				# On board gig e1000
 					chip drivers/generic/generic
-        		        	        device pci 03.0 on end
-        		        	        device pci 03.1 on end
-        		        	end
+						device pci 03.0 on end
+						device pci 03.1 on end
+					end
 				end
 				device pci 0.1 on end
 				device pci 0.2 on end
@@ -73,4 +73,3 @@ chip northbridge/intel/e7520 # mch
 	end
 	register "intrline" = "0x00070105"
 end
-
diff --git a/src/mainboard/supermicro/x7db8/devicetree.cb b/src/mainboard/supermicro/x7db8/devicetree.cb
index e09619f..e53a9a4 100644
--- a/src/mainboard/supermicro/x7db8/devicetree.cb
+++ b/src/mainboard/supermicro/x7db8/devicetree.cb
@@ -41,10 +41,10 @@ chip northbridge/intel/i5000
 			device pci 00.0 on # PCI Express Upstream Port
 				device pci 00.0 on # PCI Express Downstream Port E1
 					device pci 00.0 on # 6700PXH PCI Express-to-PCI Bridge A
-					       ioapic_irq 8 INTA 0x11
-					       ioapic_irq 8 INTB 0x10
-					       ioapic_irq 8 INTC 0x11
-					       ioapic_irq 8 INTD 0x10
+						ioapic_irq 8 INTA 0x11
+						ioapic_irq 8 INTB 0x10
+						ioapic_irq 8 INTC 0x11
+						ioapic_irq 8 INTD 0x10
 						# PCI slot
 						device pci 00.2 on # 6700PXH PCI Express-to-PCI Bridge B
 							# PCI slot
@@ -67,10 +67,10 @@ chip northbridge/intel/i5000
 		device pci 06.0 on end
 		device pci 07.0 on end
 			device pci 00.3 on # PCI Express to PCI-X Bridge
-			       ioapic_irq 9 INTA 3
-			       ioapic_irq 9 INTB 0
-			       ioapic_irq 9 INTC 1
-			       ioapic_irq 9 INTD 2
+				ioapic_irq 9 INTA 3
+				ioapic_irq 9 INTB 0
+				ioapic_irq 9 INTC 1
+				ioapic_irq 9 INTD 2
 				# PCI-X Slot
 			end
 		end
@@ -131,30 +131,30 @@ chip northbridge/intel/i5000
 				ioapic_irq 8 INTA 0x11
 				subsystemid 0x15d9 0x2009
 				chip superio/winbond/w83627hf
-					device pnp 2e.0 off end # FDC
-					device pnp 2e.1 on # Parallel Port
+					device pnp 2e.0 off end	# FDC
+					device pnp 2e.1 on	# Parallel Port
 						io 0x60 = 0x378
 						irq 0x70 = 7
 					end
-					device pnp 2e.2 on # Serial Port 1
+					device pnp 2e.2 on	# Serial Port 1
 						io 0x60 = 0x3f8
 						irq 0x70 = 4
 					end
 
 					device pnp 2e.3 off end
-					device pnp 2e.5 on # KBC
-					       io 0x60 = 0x60
-					       io 0x62 = 0x64
-					       irq 0x70 = 1
-					       irq 0x72 = 12
+					device pnp 2e.5 on	# KBC
+						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 port / MIDI
-					device pnp 2e.8 off end # GPIO2
-					device pnp 2e.9 on end # GPIO3
-					device pnp 2e.a on end # ACPI
-					device pnp 2e.b off end # HWMON
+					device pnp 2e.6 off end	# CIR
+					device pnp 2e.7 off end	# Game port / MIDI
+					device pnp 2e.8 off end	# GPIO2
+					device pnp 2e.9 on end	# GPIO3
+					device pnp 2e.a on end	# ACPI
+					device pnp 2e.b off end	# HWMON
 				end
 			end
 			device pci 1f.1 off end # IDE
diff --git a/src/mainboard/technexion/tim5690/devicetree.cb b/src/mainboard/technexion/tim5690/devicetree.cb
index 23b9741..5486fc1 100644
--- a/src/mainboard/technexion/tim5690/devicetree.cb
+++ b/src/mainboard/technexion/tim5690/devicetree.cb
@@ -17,19 +17,19 @@ chip northbridge/amd/amdk8/root_complex
 	device domain 0 on
 		subsystemid 0x1022 0x3050 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"
@@ -41,66 +41,66 @@ chip northbridge/amd/amdk8/root_complex
 					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
+					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
 					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/ite/it8712f
-							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 on #  Com1
+							device pnp 2e.1 on	# Com1
 								io 0x60 = 0x3f8
 								irq 0x70 = 4
 							end
-							device pnp 2e.2 on #  Com2
+							device pnp 2e.2 on	# Com2
 								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 2e.3 on #  Parallel Port
+							device pnp 2e.3 on	# Parallel Port
 								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 2e.4 off end #  EC
-							device pnp 2e.5 on #  Keyboard
+							device pnp 2e.4 off end	# EC
+							device pnp 2e.5 on	# Keyboard
 								io 0x60 = 0x60
 								io 0x62 = 0x64
 								irq 0x70 = 1
 							end
-							device pnp 2e.6 on #  Mouse
+							device pnp 2e.6 on	# Mouse
 								irq 0x70 = 12
 							end
-							device pnp 2e.7 off #  GPIO, must be closed for unresolved reason.
+							device pnp 2e.7 off	# GPIO, must be closed for unresolved reason.
 							end
-							device pnp 2e.8 off #  MIDI
+							device pnp 2e.8 off	# MIDI
 								io 0x60 = 0x300
 								irq 0x70 = 9
 							end
-							device pnp 2e.9 off #  GAME
+							device pnp 2e.9 off	# GAME
 								io 0x60 = 0x220
 							end
-							device pnp 2e.a off end #  CIR
+							device pnp 2e.a off end	# CIR
 						end	#superio/ite/it8712f
 					end		#LPC
-					device pci 14.4 on end # PCI 0x4384
-					device pci 14.5 on end # ACI 0x4382
-					device pci 14.6 on end # MCI 0x438e
+					device pci 14.4 on end	# PCI 0x4384
+					device pci 14.5 on end	# ACI 0x4382
+					device pci 14.6 on end	# MCI 0x438e
 					register "hda_viddid" = "0x10ec0882"
 				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
@@ -110,4 +110,3 @@ chip northbridge/amd/amdk8/root_complex
 		end		#northbridge/amd/amdk8
 	end #domain
 end		#northbridge/amd/amdk8/root_complex
-
diff --git a/src/mainboard/technexion/tim8690/devicetree.cb b/src/mainboard/technexion/tim8690/devicetree.cb
index ff14075..52334f4 100644
--- a/src/mainboard/technexion/tim8690/devicetree.cb
+++ b/src/mainboard/technexion/tim8690/devicetree.cb
@@ -17,19 +17,19 @@ chip northbridge/amd/amdk8/root_complex
 	device domain 0 on
 		subsystemid 0x1022 0x3050 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"
@@ -41,14 +41,14 @@ chip northbridge/amd/amdk8/root_complex
 					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
+					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,54 +56,54 @@ 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/ite/it8712f
-							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 on #  Com1
+							device pnp 2e.1 on	# Com1
 								io 0x60 = 0x3f8
 								irq 0x70 = 4
 							end
-							device pnp 2e.2 off #  Com2
+							device pnp 2e.2 off	# Com2
 								io 0x60 = 0x2f8
 								irq 0x70 = 3
 							end
-							device pnp 2e.3 off #  Parallel Port
+							device pnp 2e.3 off	# Parallel Port
 								io 0x60 = 0x378
 								irq 0x70 = 7
 							end
-							device pnp 2e.4 off end #  EC
-							device pnp 2e.5 on #  Keyboard
+							device pnp 2e.4 off end	# EC
+							device pnp 2e.5 on	# Keyboard
 								io 0x60 = 0x60
 								io 0x62 = 0x64
 								irq 0x70 = 1
 							end
-							device pnp 2e.6 on #  Mouse
+							device pnp 2e.6 on	# Mouse
 								irq 0x70 = 12
 							end
-							device pnp 2e.7 off #  GPIO, must be closed for unresolved reason.
+							device pnp 2e.7 off	# GPIO, must be closed for unresolved reason.
 							end
-							device pnp 2e.8 off #  MIDI
+							device pnp 2e.8 off	# MIDI
 								io 0x60 = 0x300
 								irq 0x70 = 9
 							end
-							device pnp 2e.9 off #  GAME
+							device pnp 2e.9 off	# GAME
 								io 0x60 = 0x220
 							end
-							device pnp 2e.a off end #  CIR
+							device pnp 2e.a off end	# CIR
 						end	#superio/ite/it8712f
 					end		#LPC
-					device pci 14.4 on end # PCI 0x4384
-					device pci 14.5 on end # ACI 0x4382
-					device pci 14.6 on end # MCI 0x438e
+					device pci 14.4 on end	# PCI 0x4384
+					device pci 14.5 on end	# ACI 0x4382
+					device pci 14.6 on end	# MCI 0x438e
 					register "hda_viddid" = "0x10ec0882"
 				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
@@ -113,4 +113,3 @@ chip northbridge/amd/amdk8/root_complex
 		end		#northbridge/amd/amdk8
 	end #domain
 end		#northbridge/amd/amdk8/root_complex
-
diff --git a/src/mainboard/televideo/tc7020/devicetree.cb b/src/mainboard/televideo/tc7020/devicetree.cb
index d1fa6bd..41efad2 100644
--- a/src/mainboard/televideo/tc7020/devicetree.cb
+++ b/src/mainboard/televideo/tc7020/devicetree.cb
@@ -1,57 +1,57 @@
 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 12.0 on		# ISA bridge
-        chip superio/nsc/pc97317	# Super I/O
-          device pnp 2e.0 on		# PS/2 keyboard
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1
-          end
-          device pnp 2e.1 on		# PS/2 mouse
-            irq 0x70 = 12
-          end
-          device pnp 2e.2 on		# RTC, Advanced power control (APC)
-            io 0x60 = 0x70
-            irq 0x70 = 8
-          end
-          device pnp 2e.3 off		# Floppy (N/A on this board)
-            io 0x60 = 0x3f0
-            irq 0x70 = 6
-            drq 0x74 = 2
-          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 = 0xe8
-          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
-      device pci 14.0 on end		# MiniPCI slot
-      device pci 15.0 on end		# Ethernet (onboard)
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "0"	# Not available/needed 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 12.0 on		# ISA bridge
+				chip superio/nsc/pc97317	# Super I/O
+					device pnp 2e.0 on		# PS/2 keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1
+					end
+					device pnp 2e.1 on		# PS/2 mouse
+						irq 0x70 = 12
+					end
+					device pnp 2e.2 on		# RTC, Advanced power control (APC)
+						io 0x60 = 0x70
+						irq 0x70 = 8
+					end
+					device pnp 2e.3 off		# Floppy (N/A on this board)
+						io 0x60 = 0x3f0
+						irq 0x70 = 6
+						drq 0x74 = 2
+					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 = 0xe8
+					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
+			device pci 14.0 on end		# MiniPCI slot
+			device pci 15.0 on end		# Ethernet (onboard)
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "0"	# Not available/needed on this board
+		end
+	end
+	chip cpu/amd/geode_gx1		# CPU
+	end
 end
diff --git a/src/mainboard/traverse/geos/devicetree.cb b/src/mainboard/traverse/geos/devicetree.cb
index 4a2674e..632a9b5 100644
--- a/src/mainboard/traverse/geos/devicetree.cb
+++ b/src/mainboard/traverse/geos/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 IRQs. OK
 			register "lpc_serirq_enable" = "0x00001002"
diff --git a/src/mainboard/tyan/s1846/devicetree.cb b/src/mainboard/tyan/s1846/devicetree.cb
index f774d4f..74d496f 100644
--- a/src/mainboard/tyan/s1846/devicetree.cb
+++ b/src/mainboard/tyan/s1846/devicetree.cb
@@ -1,55 +1,55 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device cpu_cluster 0 on		# APIC cluster
-    chip cpu/intel/slot_1		# CPU
-      device lapic 0 on end		# APIC
-    end
-  end
-  device domain 0 on		# PCI domain
-    device pci 0.0 on end		# Host bridge
-    device pci 1.0 on end		# PCI/AGP bridge
-    chip southbridge/intel/i82371eb	# Southbridge
-      device pci 7.0 on			# ISA bridge
-        chip superio/nsc/pc87309	# Super I/O
-          device pnp 2e.0 on		# 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 / IR
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 2e.3 on		# COM1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 2e.4 on		# Power management
-          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
-        end
-      end
-      device pci 7.1 on	end		# IDE
-      device pci 7.2 on	end		# USB
-      device pci 7.3 on end		# ACPI
-      register "ide0_enable" = "1"
-      register "ide1_enable" = "1"
-      register "ide_legacy_enable" = "1"
-      # Enable UDMA/33 for higher speed if your IDE device(s) support it.
-      register "ide0_drive0_udma33_enable" = "0"
-      register "ide0_drive1_udma33_enable" = "0"
-      register "ide1_drive0_udma33_enable" = "0"
-      register "ide1_drive1_udma33_enable" = "0"
-    end
-  end
+	device cpu_cluster 0 on		# APIC cluster
+		chip cpu/intel/slot_1		# CPU
+			device lapic 0 on end		# APIC
+		end
+	end
+	device domain 0 on		# PCI domain
+		device pci 0.0 on end		# Host bridge
+		device pci 1.0 on end		# PCI/AGP bridge
+		chip southbridge/intel/i82371eb	# Southbridge
+			device pci 7.0 on			# ISA bridge
+				chip superio/nsc/pc87309	# Super I/O
+					device pnp 2e.0 on		# 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 / IR
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 2e.3 on		# COM1
+						io 0x60 = 0x3f8
+						irq 0x70 = 4
+					end
+					device pnp 2e.4 on		# Power management
+					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
+				end
+			end
+			device pci 7.1 on end		# IDE
+			device pci 7.2 on end		# USB
+			device pci 7.3 on end		# ACPI
+			register "ide0_enable" = "1"
+			register "ide1_enable" = "1"
+			register "ide_legacy_enable" = "1"
+			# Enable UDMA/33 for higher speed if your IDE device(s) support it.
+			register "ide0_drive0_udma33_enable" = "0"
+			register "ide0_drive1_udma33_enable" = "0"
+			register "ide1_drive0_udma33_enable" = "0"
+			register "ide1_drive1_udma33_enable" = "0"
+		end
+	end
 end
diff --git a/src/mainboard/tyan/s2735/devicetree.cb b/src/mainboard/tyan/s2735/devicetree.cb
index d3b6b1e..4767ba3 100644
--- a/src/mainboard/tyan/s2735/devicetree.cb
+++ b/src/mainboard/tyan/s2735/devicetree.cb
@@ -1,86 +1,85 @@
 chip northbridge/intel/e7501
-        device domain 0 on
+	device domain 0 on
 		subsystemid 0x10f1 0x2735 inherit
 		device pci 0.0 on end
-        	device pci 0.1 on end
-        	device pci 2.0 on
-        		chip southbridge/intel/i82870
-        	        	device pci 1c.0 on end
-		                device pci 1d.0 on
-                                     	 device pci 1.0 on end # intel lan
-                                        device pci 1.1 on end
+		device pci 0.1 on end
+		device pci 2.0 on
+			chip southbridge/intel/i82870
+				device pci 1c.0 on end
+				device pci 1d.0 on
+					device pci 1.0 on end # intel lan
+					device pci 1.1 on end
 				end
-        	                device pci 1e.0 on end
-        	                device pci 1f.0 on end
-        		end
+				device pci 1e.0 on end
+				device pci 1f.0 on end
+			end
 		end
-        	device pci 6.0 on end
-        	chip southbridge/intel/i82801ex
-        		device pci 1d.0 on end
-		        device pci 1d.1 on end
-        	        device pci 1d.2 on end
-        	        device pci 1d.3 on end
-		        device pci 1d.7 on end
-		        device pci 1e.0 on
-                             	device pci 1.0 on end # intel lan 10/100
-                                device pci 2.0 on end # ati
+		device pci 6.0 on end
+		chip southbridge/intel/i82801ex
+			device pci 1d.0 on end
+			device pci 1d.1 on end
+			device pci 1d.2 on end
+			device pci 1d.3 on end
+			device pci 1d.7 on end
+			device pci 1e.0 on
+				device pci 1.0 on end # intel lan 10/100
+				device pci 2.0 on end # ati
 			end
-		        device pci 1f.0 on
+			device pci 1f.0 on
 				chip superio/winbond/w83627hf
-                                	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
-                                        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 #  Keyboard
-                                                io 0x60 = 0x60
-                                                io 0x62 = 0x64
-                                                irq 0x70 = 1
-                                                irq 0x72 = 12
-                                        end
-                                        device pnp 2e.6 off #  CIR
-                                                io 0x60 = 0x100
-                                        end
-                                        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
-                                                io 0x60 = 0x290
-                                                irq 0x70 = 5
-                                        end
+					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
+					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	# Keyboard
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1
+						irq 0x72 = 12
+					end
+					device pnp 2e.6 off	# CIR
+						io 0x60 = 0x100
+					end
+					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
+						io 0x60 = 0x290
+						irq 0x70 = 5
+					end
 				end
-		        end
-		        device pci 1f.1 off end
-        	        device pci 1f.2 on end
-        	        device pci 1f.3 on end
-        		device pci 1f.5 off end
-		        device pci 1f.6 off end
+			end
+			device pci 1f.1 off end
+			device pci 1f.2 on end
+			device pci 1f.3 on end
+			device pci 1f.5 off end
+			device pci 1f.6 off end
 		end # SB
-        end # PCI domain
-        device cpu_cluster 0 on
-                chip cpu/intel/socket_mPGA604
-                        device lapic 0 on end
-                end
-                chip cpu/intel/socket_mPGA604
-                        device lapic 6 on end
-                end
-        end
+	end # PCI domain
+	device cpu_cluster 0 on
+		chip cpu/intel/socket_mPGA604
+			device lapic 0 on end
+		end
+		chip cpu/intel/socket_mPGA604
+			device lapic 6 on end
+		end
+	end
 end
-
diff --git a/src/mainboard/tyan/s2850/devicetree.cb b/src/mainboard/tyan/s2850/devicetree.cb
index 85c6384..af9e959 100644
--- a/src/mainboard/tyan/s2850/devicetree.cb
+++ b/src/mainboard/tyan/s2850/devicetree.cb
@@ -1,14 +1,14 @@
 chip northbridge/amd/amdk8/root_complex
-        device cpu_cluster 0 on
-                chip cpu/amd/socket_940
-                        device lapic 0 on end
-                end
-        end
+	device cpu_cluster 0 on
+		chip cpu/amd/socket_940
+			device lapic 0 on end
+		end
+	end
 	device domain 0 on
 		subsystemid 0x10f1 0x2850 inherit
 		chip northbridge/amd/amdk8
 			device pci 18.0 on # LDT0
-				#  devices on link 2, link 2 == LDT 2
+				# devices on link 2, link 2 == LDT 2
 				chip southbridge/amd/amd8111
 					# this "device pci 0.0" is the parent the next one
 					# PCI bridge
@@ -17,80 +17,78 @@ chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                #chip drivers/ati/ragexl
-                                                device pci b.0 on end
+						#chip drivers/ati/ragexl
+						device pci b.0 on end
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
-							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 #  CIR
-                	                                        io 0x60 = 0x100
-                	                                end
-                	                                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
-                	                                        io 0x60 = 0x290
-                	                                        irq 0x70 = 5
-                	                                end
+							device pnp 2e.6 off	# CIR
+								io 0x60 = 0x100
+							end
+							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
+								io 0x60 = 0x290
+								irq 0x70 = 5
+							end
 						end
 					end
 					device pci 1.1 on end
 					device pci 1.2 on end
 					device pci 1.3 on
-                                                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 0-0-0
+							device i2c 50 on end
+						end
+						chip drivers/generic/generic #dimm 0-0-1
+							device i2c 51 on end
+						end
+						chip drivers/generic/generic #dimm 0-1-0
+							device i2c 52 on end
+						end
+						chip drivers/generic/generic #dimm 0-1-1
+							device i2c 53 on end
+						end
 					end
 					device pci 1.5 on end
 					device pci 1.6 off end
-                                        register "ide0_enable" = "1"
-                                        register "ide1_enable" = "1"
+					register "ide0_enable" = "1"
+					register "ide1_enable" = "1"
 				end
-			end #  device pci 18.0
-                	device pci 18.0 on end
-                	device pci 18.0 on end
-
+			end # device pci 18.0
+			device pci 18.0 on end
+			device pci 18.0 on end
 			device pci 18.1 on end
 			device pci 18.2 on end
 			device pci 18.3 on end
 		end
 	end
 end
-
diff --git a/src/mainboard/tyan/s2875/devicetree.cb b/src/mainboard/tyan/s2875/devicetree.cb
index 39eb8b2..16c028f 100644
--- a/src/mainboard/tyan/s2875/devicetree.cb
+++ b/src/mainboard/tyan/s2875/devicetree.cb
@@ -1,14 +1,14 @@
 chip northbridge/amd/amdk8/root_complex
-        device cpu_cluster 0 on
-                chip cpu/amd/socket_940
-                        device lapic 0 on end
-                end
-        end
+	device cpu_cluster 0 on
+		chip cpu/amd/socket_940
+			device lapic 0 on end
+		end
+	end
 	device domain 0 on
 		subsystemid 0x10f1 0x2875 inherit
 		chip northbridge/amd/amdk8
-			device pci 18.0 on #  northbridge
-				#  devices on link 0, link 0 == LDT 0
+			device pci 18.0 on # northbridge
+				# devices on link 0, link 0 == LDT 0
 				chip southbridge/amd/amd8151
 					# the on/off keyword is mandatory
 					device pci 0.0 on end
@@ -22,45 +22,45 @@ chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                device pci 5.0 on end
+						device pci 5.0 on end
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
-							device pnp 2e.0 on #  Floppy
+							device pnp 2e.0 on	# 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 off #  Com2
+							device pnp 2e.3 off	# 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
@@ -71,18 +71,15 @@ chip northbridge/amd/amdk8/root_complex
 					device pci 1.3 on end
 					device pci 1.5 on end
 					device pci 1.6 off end
-                                        register "ide0_enable" = "1"
-                                        register "ide1_enable" = "1"
+					register "ide0_enable" = "1"
+					register "ide1_enable" = "1"
 				end
-			end #  device pci 18.0
-
+			end # device pci 18.0
 			device pci 18.0 on end
 			device pci 18.0 on end
-
 			device pci 18.1 on end
 			device pci 18.2 on end
 			device pci 18.3 on end
 		end
 	end
 end
-
diff --git a/src/mainboard/tyan/s2880/devicetree.cb b/src/mainboard/tyan/s2880/devicetree.cb
index f9f4856..2cf649a 100644
--- a/src/mainboard/tyan/s2880/devicetree.cb
+++ b/src/mainboard/tyan/s2880/devicetree.cb
@@ -1,24 +1,24 @@
 chip northbridge/amd/amdk8/root_complex
-        device cpu_cluster 0 on
-                chip cpu/amd/socket_940
-                        device lapic 0 on end
-                end
-        end
+	device cpu_cluster 0 on
+		chip cpu/amd/socket_940
+			device lapic 0 on end
+		end
+	end
 	device domain 0 on
 		subsystemid 0x10f1 0x2880 inherit
 		chip northbridge/amd/amdk8
-			device pci 18.0 on #  northbridge
-				#  devices on link 0, link 0 == LDT 0
+			device pci 18.0 on # northbridge
+				# devices on link 0, link 0 == LDT 0
 				chip southbridge/amd/amd8131
 					# the on/off keyword is mandatory
 					device pci 0.0 on
-                                                device pci 9.0 on end #broadcom
+						device pci 9.0 on end #broadcom
 						device pci 9.1 on end
-#                                                chip drivers/lsi/53c1030
-#                                                        device pci a.0 on end
-#                                                        device pci a.1 on end
-#                                                        register "fw_address" = "0xfff8c000"
-#                                                end
+#						chip drivers/lsi/53c1030
+#							device pci a.0 on end
+#							device pci a.1 on end
+#							register "fw_address" = "0xfff8c000"
+#						end
 					end
 					device pci 0.1 on end
 					device pci 1.0 on end
@@ -32,49 +32,49 @@ chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                device pci 5.0 on end #some sata
-                                                device pci 6.0 on end #adti
+						device pci 5.0 on end #some sata
+						device pci 6.0 on end #adti
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
-							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 #  CIR
-                	                                        io 0x60 = 0x100
-                	                                end
-                	                                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
-                	                                        io 0x60 = 0x290
-                	                                        irq 0x70 = 5
-                	                                end
+							device pnp 2e.6 off	# CIR
+								io 0x60 = 0x100
+							end
+							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
+								io 0x60 = 0x290
+								irq 0x70 = 5
+							end
 						end
 					end
 					device pci 1.1 on end
@@ -82,18 +82,16 @@ chip northbridge/amd/amdk8/root_complex
 					device pci 1.3 on end
 					device pci 1.5 off end
 					device pci 1.6 off end
-                                        register "ide0_enable" = "1"
-                                        register "ide1_enable" = "1"
+					register "ide0_enable" = "1"
+					register "ide1_enable" = "1"
 				end
-			end #  device pci 18.0
-
-                	device pci 18.0 on end
-                	device pci 18.0 on end
+			end # device pci 18.0
 
+			device pci 18.0 on end
+			device pci 18.0 on end
 			device pci 18.1 on end
 			device pci 18.2 on end
 			device pci 18.3 on end
 		end
 	end
 end
-
diff --git a/src/mainboard/tyan/s2881/devicetree.cb b/src/mainboard/tyan/s2881/devicetree.cb
index aab75a3..46ee680 100644
--- a/src/mainboard/tyan/s2881/devicetree.cb
+++ b/src/mainboard/tyan/s2881/devicetree.cb
@@ -1,130 +1,129 @@
 chip northbridge/amd/amdk8/root_complex
-  device cpu_cluster 0 on
-    chip cpu/amd/socket_940
-      device lapic 0 on end
-    end
-  end
-  device domain 0 on
-    subsystemid 0x10f1 0x2881 inherit
-    chip northbridge/amd/amdk8
-      device pci 18.0 on end # link 0
-      device pci 18.0 on end # link 1
-      device pci 18.0 on     # link 2
-        chip southbridge/amd/amd8131
-          # the on/off keyword is mandatory
-          device pci 0.0 on
-            device pci 9.0 on end # Broadcom 5704
-            device pci 9.1 on end
-            device pci a.0 on end # Adaptic
-            device pci a.1 on end
-          end
-          device pci 0.1 on end
-          device pci 1.0 on end
-          device pci 1.1 on end
-        end
-        chip southbridge/amd/amd8111
-          # this "device pci 0.0" is the parent the next one
-          # PCI bridge
-          device pci 0.0 on
-            device pci 0.0 on end
-            device pci 0.1 on end
-            device pci 0.2 off end
-            device pci 1.0 off end
-            device pci 5.0 on end # SiI
-            device pci 6.0 on end
-          end
-          device pci 1.0 on
-            chip superio/winbond/w83627hf
-              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
-              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  # Keyboard
-                io  0x60 = 0x60
-                io  0x62 = 0x64
-                irq 0x70 = 1
-                irq 0x72 = 12
-              end
-              device pnp 2e.6 off # CIR
-                io  0x60 = 0x100
-              end
-              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
-                io  0x60 = 0x290
-                irq 0x70 = 5
-              end
-            end
-          end
-          device pci 1.1 on end
-          device pci 1.2 on end
-          device pci 1.3 on
-            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
-            chip drivers/i2c/adt7463 # CPU0/1 temp, CPU1 vid, SYS FAN 1/2/3
-              device i2c 2d on end
-            end
-            chip drivers/generic/generic # Winbond HWM 0x54 CPU0/1 VRM temp, SYSFAN 4,CPU0 vid, CPU0/1 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 # acpi
-          device pci 1.5 off end
-          device pci 1.6 off end
-          register "ide0_enable" = "1"
-          register "ide1_enable" = "1"
-        end
-      end #  device pci 18.0
-      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
+		chip cpu/amd/socket_940
+			device lapic 0 on end
+		end
+	end
+	device domain 0 on
+		subsystemid 0x10f1 0x2881 inherit
+		chip northbridge/amd/amdk8
+			device pci 18.0 on end	# link 0
+			device pci 18.0 on end	# link 1
+			device pci 18.0 on	# link 2
+				chip southbridge/amd/amd8131
+					# the on/off keyword is mandatory
+					device pci 0.0 on
+						device pci 9.0 on end # Broadcom 5704
+						device pci 9.1 on end
+						device pci a.0 on end # Adaptic
+						device pci a.1 on end
+					end
+					device pci 0.1 on end
+					device pci 1.0 on end
+					device pci 1.1 on end
+				end
+				chip southbridge/amd/amd8111
+					# this "device pci 0.0" is the parent the next one
+					# PCI bridge
+					device pci 0.0 on
+						device pci 0.0 on end
+						device pci 0.1 on end
+						device pci 0.2 off end
+						device pci 1.0 off end
+						device pci 5.0 on end # SiI
+						device pci 6.0 on end
+					end
+					device pci 1.0 on
+						chip superio/winbond/w83627hf
+							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
+							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		# Keyboard
+								io 0x60 = 0x60
+								io 0x62 = 0x64
+								irq 0x70 = 1
+								irq 0x72 = 12
+							end
+							device pnp 2e.6 off # CIR
+								io 0x60 = 0x100
+							end
+							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
+								io 0x60 = 0x290
+								irq 0x70 = 5
+							end
+						end
+					end
+					device pci 1.1 on end
+					device pci 1.2 on end
+					device pci 1.3 on
+						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
+						chip drivers/i2c/adt7463 # CPU0/1 temp, CPU1 vid, SYS FAN 1/2/3
+							device i2c 2d on end
+						end
+						chip drivers/generic/generic # Winbond HWM 0x54 CPU0/1 VRM temp, SYSFAN 4,CPU0 vid, CPU0/1 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 # acpi
+					device pci 1.5 off end
+					device pci 1.6 off end
+					register "ide0_enable" = "1"
+					register "ide1_enable" = "1"
+				end
+			end #	device pci 18.0
+			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/tyan/s2882/devicetree.cb b/src/mainboard/tyan/s2882/devicetree.cb
index 4074695..b557c2b 100644
--- a/src/mainboard/tyan/s2882/devicetree.cb
+++ b/src/mainboard/tyan/s2882/devicetree.cb
@@ -1,22 +1,22 @@
 chip northbridge/amd/amdk8/root_complex
-        device cpu_cluster 0 on
-                chip cpu/amd/socket_940
-                        device lapic 0 on end
-                end
-        end
+	device cpu_cluster 0 on
+		chip cpu/amd/socket_940
+			device lapic 0 on end
+		end
+	end
 
 	device domain 0 on
 		subsystemid 0x10f1 0x2882 inherit
 		chip northbridge/amd/amdk8
-			device pci 18.0 on #  northbridge
-				#  devices on link 0, link 0 == LDT 0
+			device pci 18.0 on # northbridge
+				# devices on link 0, link 0 == LDT 0
 				chip southbridge/amd/amd8131
 					# the on/off keyword is mandatory
 					device pci 0.0 on
-                                                device pci 6.0 on end # adaptec
-                                                device pci 6.1 on end
-                                                device pci 9.0 on end # broadcom 5704
-                                                device pci 9.1 on end
+						device pci 6.0 on end # adaptec
+						device pci 6.1 on end
+						device pci 9.0 on end # broadcom 5704
+						device pci 9.1 on end
 					end
 					device pci 0.1 on end
 					device pci 1.0 on end
@@ -30,97 +30,94 @@ chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                device pci 5.0 on end
-                                        #       chip drivers/ati/ragexl
-                                                device pci 6.0 on end
-                                        #       end
-                                                device pci 8.0 on end #intel 10/100
+						device pci 5.0 on end
+					#	chip drivers/ati/ragexl
+						device pci 6.0 on end
+					#	end
+						device pci 8.0 on end #intel 10/100
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
-							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 #  CIR
-                	                                        io 0x60 = 0x100
-                	                                end
-                	                                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
-                	                                        io 0x60 = 0x290
-                	                                        irq 0x70 = 5
-                	                                end
+							device pnp 2e.6 off	# CIR
+								io 0x60 = 0x100
+							end
+							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
+								io 0x60 = 0x290
+								irq 0x70 = 5
+							end
 						end
 					end
 					device pci 1.1 on end
 					device pci 1.2 on end
 					device pci 1.3 on end
 					device pci 1.3 on
-#						 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 # acpi
+#						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 # acpi
 					device pci 1.5 off end
 					device pci 1.6 off end
 					register "ide0_enable" = "1"
 					register "ide1_enable" = "1"
 				end
-			end #  device pci 18.0
-
-                	device pci 18.0 on end
-                	device pci 18.0 on end
-
+			end # device pci 18.0
+			device pci 18.0 on end
+			device pci 18.0 on end
 			device pci 18.1 on end
 			device pci 18.2 on end
 			device pci 18.3 on end
 		end # NB
 	end #domain
 end
-
diff --git a/src/mainboard/tyan/s2885/devicetree.cb b/src/mainboard/tyan/s2885/devicetree.cb
index 7191e52..d57f981 100644
--- a/src/mainboard/tyan/s2885/devicetree.cb
+++ b/src/mainboard/tyan/s2885/devicetree.cb
@@ -1,9 +1,9 @@
 chip northbridge/amd/amdk8/root_complex
-        device cpu_cluster 0 on
-                chip cpu/amd/socket_940
-                        device lapic 0 on end
-                end
-        end
+	device cpu_cluster 0 on
+		chip cpu/amd/socket_940
+			device lapic 0 on end
+		end
+	end
 	device domain 0 on
 		subsystemid 0x10f1 0x2885 inherit
 		chip northbridge/amd/amdk8
@@ -14,13 +14,13 @@ chip northbridge/amd/amdk8/root_complex
 					device pci 1.0 on end
 				end
 			end
-			device pci 18.0 on end # LDT1
-			device pci 18.0 on #  northbridge
-				#  devices on link 2, link 2 == LDT 2
+			device pci 18.0 on end	# LDT1
+			device pci 18.0 on	# northbridge
+				# devices on link 2, link 2 == LDT 2
 				chip southbridge/amd/amd8131
 					# the on/off keyword is mandatory
 					device pci 0.0 on
-                                                device pci 9.0 on end # broadcom 5703
+						device pci 9.0 on end # broadcom 5703
 					end
 					device pci 0.1 on end
 					device pci 1.0 on end
@@ -34,90 +34,87 @@ chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                device pci b.0 on end # SiI 3114
+						device pci b.0 on end # SiI 3114
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
-							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 on #  Com2
-                	                 			io 0x60 = 0x2f8
-                	                			irq 0x70 = 3
+							device pnp 2e.3 on	# 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 #  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
- 					 			io 0x60 = 0x290
+							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
+							end
 						end
 					end
 					device pci 1.1 on end
 					device pci 1.2 on end
 					device pci 1.3 on
-                                                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
+						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 # acpi
 					device pci 1.5 on end
 					device pci 1.6 off end
-                	                register "ide0_enable" = "1"
-                	                register "ide1_enable" = "1"
+					register "ide0_enable" = "1"
+					register "ide1_enable" = "1"
 				end
-			end #  device pci 18.0
-
+			end # device pci 18.0
 			device pci 18.1 on end
 			device pci 18.2 on end
 			device pci 18.3 on end
 		end
-
 	end #domain
 end
-
diff --git a/src/mainboard/tyan/s2891/devicetree.cb b/src/mainboard/tyan/s2891/devicetree.cb
index 8442ec8..b25c08c 100644
--- a/src/mainboard/tyan/s2891/devicetree.cb
+++ b/src/mainboard/tyan/s2891/devicetree.cb
@@ -1,137 +1,137 @@
 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 0x10f1 0x2891 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/w83627hf	# 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.6 off		# Consumer IR
-                io 0x60 = 0x100
-              end
-              device pnp 2e.7 off		# Game port, MIDI, GPIO1
-                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 off		# 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
-          #   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 off 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
-          #  chip drivers/ati/ragexl
-            device pci 7.0 on end
-          end
-          device pci a.0 off end		# NIC
-          device pci b.0 off end		# PCI E 3
-          device pci c.0 off 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" = "1"
-          register "sata0_enable" = "1"
-          register "sata1_enable" = "1"
-        end
-      end
-      device pci 18.0 on end			# Link 1
-      device pci 18.0 on			# Link 2 == LDT 2
-        chip southbridge/amd/amd8131		# Southbridge
-          device pci 0.0 on end
-          device pci 0.1 on end
-          device pci 1.0 on
-            device pci 9.0 on end
-            device pci 9.1 on end
-          end
-          device pci 1.1 on end
-        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_940		# CPU socket
+			device lapic 0 on end	# Local APIC of the CPU
+		end
+	end
+	device domain 0 on			# PCI domain
+		subsystemid 0x10f1 0x2891 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/w83627hf	# 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.6 off		# Consumer IR
+								io 0x60 = 0x100
+							end
+							device pnp 2e.7 off		# Game port, MIDI, GPIO1
+								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 off		# 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
+					#	 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 off 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
+					#	chip drivers/ati/ragexl
+						device pci 7.0 on end
+					end
+					device pci a.0 off end		# NIC
+					device pci b.0 off end		# PCI E 3
+					device pci c.0 off 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" = "1"
+					register "sata0_enable" = "1"
+					register "sata1_enable" = "1"
+				end
+			end
+			device pci 18.0 on end			# Link 1
+			device pci 18.0 on			# Link 2 == LDT 2
+				chip southbridge/amd/amd8131		# Southbridge
+					device pci 0.0 on end
+					device pci 0.1 on end
+					device pci 1.0 on
+						device pci 9.0 on end
+						device pci 9.1 on end
+					end
+					device pci 1.1 on end
+				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/tyan/s2892/devicetree.cb b/src/mainboard/tyan/s2892/devicetree.cb
index 3edc156..3fc7e97 100644
--- a/src/mainboard/tyan/s2892/devicetree.cb
+++ b/src/mainboard/tyan/s2892/devicetree.cb
@@ -1,140 +1,140 @@
 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 0x10f1 0x2892 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/w83627hf	# Super I/O
-              device pnp 2e.0 on		# 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 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.6 off		# Consumer IR
-                io 0x60 = 0x100
-              end
-              device pnp 2e.7 off		# Game port, MIDI, GPIO1
-                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		# 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
-            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 off 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
-          #  chip drivers/ati/ragexl
-            device pci 6.0 on end
-          #  end
-            device pci 8.0 on end
-          end
-          device pci a.0 off end		# NIC
-          device pci b.0 off end		# PCI E 3
-          device pci c.0 off 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" = "1"
-          register "sata0_enable" = "1"
-          register "sata1_enable" = "1"
-        end
-      end
-      device pci 18.0 on end			# Link 1
-      device pci 18.0 on			# Link 2 == LDT 2
-        chip southbridge/amd/amd8131		# Southbridge
-          device pci 0.0 on end
-          device pci 0.1 on end
-          device pci 1.0 on
-            device pci 9.0 on end		# Broadcom 5704
-            device pci 9.1 on end
-          end
-          device pci 1.1 on end
-        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_940			# CPU socket
+			device lapic 0 on end			# Local APIC of the CPU
+		end
+	end
+	device domain 0 on			# PCI domain
+		subsystemid 0x10f1 0x2892 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/w83627hf	# Super I/O
+							device pnp 2e.0 on		# 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 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.6 off		# Consumer IR
+								io 0x60 = 0x100
+							end
+							device pnp 2e.7 off		# Game port, MIDI, GPIO1
+								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		# 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
+						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 off 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
+					#	chip drivers/ati/ragexl
+						device pci 6.0 on end
+					#	end
+						device pci 8.0 on end
+					end
+					device pci a.0 off end		# NIC
+					device pci b.0 off end		# PCI E 3
+					device pci c.0 off 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" = "1"
+					register "sata0_enable" = "1"
+					register "sata1_enable" = "1"
+				end
+			end
+			device pci 18.0 on end			# Link 1
+			device pci 18.0 on			# Link 2 == LDT 2
+				chip southbridge/amd/amd8131		# Southbridge
+					device pci 0.0 on end
+					device pci 0.1 on end
+					device pci 1.0 on
+						device pci 9.0 on end		# Broadcom 5704
+						device pci 9.1 on end
+					end
+					device pci 1.1 on end
+				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/tyan/s2895/devicetree.cb b/src/mainboard/tyan/s2895/devicetree.cb
index 4250160..8d13580 100644
--- a/src/mainboard/tyan/s2895/devicetree.cb
+++ b/src/mainboard/tyan/s2895/devicetree.cb
@@ -1,153 +1,153 @@
 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 0x10f1 0x2895 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/smsc/lpc47b397		# Super I/O
-              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 = 4
-              end
-              device pnp 2e.4 on		# Com1
-                io 0x60 = 0x3f8
-                irq 0x70 = 4
-              end
-              device pnp 2e.5 off		# Com2
-                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
-                irq 0x72 = 12
-              end
-              device pnp 2e.8 on		# Hardware monitor
-                io 0x60 = 0x480
-                chip drivers/generic/generic	# LM95221 CPU temp
-                  device i2c 2b on end
-                end
-                chip drivers/generic/generic	# EMCT03
-                  device i2c 54 on end
-                end
-              end
-              device pnp 2e.a on		# RT
-                io 0x60 = 0x400
-              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/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			# 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 end			# PCI
-          device pci a.0 on end			# NIC
-          device pci b.0 off end		# PCI E 3
-          device pci c.0 off end		# PCI E 2
-          device pci d.0 off end		# PCI E 1
-          device pci e.0 on end			# PCI E 0
-          register "ide0_enable" = "1"
-          register "ide1_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/amd/amd8131		# Southbridge
-          device pci 0.0 on end
-          device pci 0.1 on end
-          device pci 1.0 on
-            device pci 6.0 on end		# LSI SCSI
-            device pci 6.1 on end
-          end
-          device pci 1.1 on end
-        end
-      end
-      device pci 18.1 on end
-      device pci 18.2 on end
-      device pci 18.3 on end
-    end
-    chip northbridge/amd/amdk8			# Northbridge / RAM controller
-      device pci 19.0 on			# Link 0 == LDT 0
-        chip southbridge/nvidia/ck804		# Southbridge
-          device pci 0.0 on end			# HT
-          device pci 1.0 on end			# LPC
-          device pci 1.1 off end		# SM
-          device pci 2.0 off end		# USB 1.1
-          device pci 2.1 off end		# USB 2
-          device pci 4.0 off end		# ACI
-          device pci 4.1 off end		# MCI
-          device pci 6.0 off end		# IDE
-          device pci 7.0 off end		# SATA 1
-          device pci 8.0 off end		# SATA 0
-          device pci 9.0 off end		# PCI
-          device pci a.0 on end			# NIC
-          device pci b.0 off end		# PCI E 3
-          device pci c.0 off end		# PCI E 2
-          device pci d.0 off end		# PCI E 1
-          device pci e.0 on end			# PCI E 0
-          # 1: SMBus under 2e.8, 2: SM0 3: SM1
-          register "mac_eeprom_smbus" = "3"
-          register "mac_eeprom_addr" = "0x51"
-        end
-      end
-      device pci 19.0 on end
-      device pci 19.0 on end
-      device pci 19.1 on end
-      device pci 19.2 on end
-      device pci 19.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 0x10f1 0x2895 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/smsc/lpc47b397		# Super I/O
+							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 = 4
+							end
+							device pnp 2e.4 on		# Com1
+								io 0x60 = 0x3f8
+								irq 0x70 = 4
+							end
+							device pnp 2e.5 off		# Com2
+								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
+								irq 0x72 = 12
+							end
+							device pnp 2e.8 on		# Hardware monitor
+								io 0x60 = 0x480
+								chip drivers/generic/generic	# LM95221 CPU temp
+									device i2c 2b on end
+								end
+								chip drivers/generic/generic	# EMCT03
+									device i2c 54 on end
+								end
+							end
+							device pnp 2e.a on		# RT
+								io 0x60 = 0x400
+							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/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			# 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 end			# PCI
+					device pci a.0 on end			# NIC
+					device pci b.0 off end		# PCI E 3
+					device pci c.0 off end		# PCI E 2
+					device pci d.0 off end		# PCI E 1
+					device pci e.0 on end			# PCI E 0
+					register "ide0_enable" = "1"
+					register "ide1_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/amd/amd8131		# Southbridge
+					device pci 0.0 on end
+					device pci 0.1 on end
+					device pci 1.0 on
+						device pci 6.0 on end		# LSI SCSI
+						device pci 6.1 on end
+					end
+					device pci 1.1 on end
+				end
+			end
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
+		chip northbridge/amd/amdk8			# Northbridge / RAM controller
+			device pci 19.0 on			# Link 0 == LDT 0
+				chip southbridge/nvidia/ck804		# Southbridge
+					device pci 0.0 on end			# HT
+					device pci 1.0 on end			# LPC
+					device pci 1.1 off end		# SM
+					device pci 2.0 off end		# USB 1.1
+					device pci 2.1 off end		# USB 2
+					device pci 4.0 off end		# ACI
+					device pci 4.1 off end		# MCI
+					device pci 6.0 off end		# IDE
+					device pci 7.0 off end		# SATA 1
+					device pci 8.0 off end		# SATA 0
+					device pci 9.0 off end		# PCI
+					device pci a.0 on end			# NIC
+					device pci b.0 off end		# PCI E 3
+					device pci c.0 off end		# PCI E 2
+					device pci d.0 off end		# PCI E 1
+					device pci e.0 on end			# PCI E 0
+					# 1: SMBus under 2e.8, 2: SM0 3: SM1
+					register "mac_eeprom_smbus" = "3"
+					register "mac_eeprom_addr" = "0x51"
+				end
+			end
+			device pci 19.0 on end
+			device pci 19.0 on end
+			device pci 19.1 on end
+			device pci 19.2 on end
+			device pci 19.3 on end
+		end
+	end
 end
diff --git a/src/mainboard/tyan/s2912/devicetree.cb b/src/mainboard/tyan/s2912/devicetree.cb
index 42f764a..cdb72e0 100644
--- a/src/mainboard/tyan/s2912/devicetree.cb
+++ b/src/mainboard/tyan/s2912/devicetree.cb
@@ -1,138 +1,138 @@
 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 0x10f1 0x2912 inherit
-    chip northbridge/amd/amdk8			# Northbridge / RAM controller
-      device pci 18.0 on end
-      device pci 18.0 on end
-      device pci 18.0 on
-        chip southbridge/nvidia/mcp55		# Southbridge
-          device pci 0.0 on end			# HT
-          device pci 1.0 on			# LPC
-            chip superio/winbond/w83627hf	# 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
-                io 0x60 = 0x60
-                io 0x62 = 0x64
-                irq 0x70 = 1
-                irq 0x72 = 12
-              end
-              device pnp 2e.6 off		# SFI
-                io 0x62 = 0x100
-              end
-              device pnp 2e.7 off		# GPIO, game port, MIDI
-                io 0x60 = 0x220
-                io 0x62 = 0x300
-                irq 0x70 = 9
-              end
-              device pnp 2e.8 off end		# WDTO PLED
-              device pnp 2e.9 off end		# GPIO SUSLED
-              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 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 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.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 0x10f1 0x2912 inherit
+		chip northbridge/amd/amdk8			# Northbridge / RAM controller
+			device pci 18.0 on end
+			device pci 18.0 on end
+			device pci 18.0 on
+				chip southbridge/nvidia/mcp55		# Southbridge
+					device pci 0.0 on end			# HT
+					device pci 1.0 on			# LPC
+						chip superio/winbond/w83627hf	# 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
+								io 0x60 = 0x60
+								io 0x62 = 0x64
+								irq 0x70 = 1
+								irq 0x72 = 12
+							end
+							device pnp 2e.6 off		# SFI
+								io 0x62 = 0x100
+							end
+							device pnp 2e.7 off		# GPIO, game port, MIDI
+								io 0x60 = 0x220
+								io 0x62 = 0x300
+								irq 0x70 = 9
+							end
+							device pnp 2e.8 off end		# WDTO PLED
+							device pnp 2e.9 off end		# GPIO SUSLED
+							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 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 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.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
+	end
 end
diff --git a/src/mainboard/tyan/s2912_fam10/devicetree.cb b/src/mainboard/tyan/s2912_fam10/devicetree.cb
index 485c7e0..66c1aa9 100644
--- a/src/mainboard/tyan/s2912_fam10/devicetree.cb
+++ b/src/mainboard/tyan/s2912_fam10/devicetree.cb
@@ -1,141 +1,141 @@
 chip northbridge/amd/amdfam10/root_complex	# Root complex
-  device cpu_cluster 0 on			# (L)APIC cluster
-    chip cpu/amd/socket_F_1207			# CPU socket
-      device lapic 0 on end			# Local APIC of the CPU
-    end
-  end
-  device domain 0 on			# PCI domain
-    subsystemid 0x10f1 0x2912 inherit
-    chip northbridge/amd/amdfam10		# Northbridge / RAM controller
-      device pci 18.0 on end
-      device pci 18.0 on end
-      device pci 18.0 on			# SB on link 2
-        chip southbridge/nvidia/mcp55		# Southbridge
-          device pci 0.0 on end			# HT
-          device pci 1.0 on			# LPC
-            chip superio/winbond/w83627hf	# 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
-                io 0x60 = 0x60
-                io 0x62 = 0x64
-                irq 0x70 = 1
-                irq 0x72 = 12
-              end
-              device pnp 2e.6 off		# SFI
-                io 0x62 = 0x100
-              end
-              device pnp 2e.7 off		# GPIO, game port, MIDI
-                io 0x60 = 0x220
-                io 0x62 = 0x300
-                irq 0x70 = 9
-              end
-              device pnp 2e.8 off end		# WDTO PLED
-              device pnp 2e.9 off end		# GPIO SUSLED
-              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			# PCI
-            device pci 4.0 on end
-          end
-          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 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.1 on end
-      device pci 18.2 on end
-      device pci 18.3 on end
-      device pci 18.4 on end
-    end
-  end
+	device cpu_cluster 0 on			# (L)APIC cluster
+		chip cpu/amd/socket_F_1207			# CPU socket
+			device lapic 0 on end			# Local APIC of the CPU
+		end
+	end
+	device domain 0 on			# PCI domain
+		subsystemid 0x10f1 0x2912 inherit
+		chip northbridge/amd/amdfam10		# Northbridge / RAM controller
+			device pci 18.0 on end
+			device pci 18.0 on end
+			device pci 18.0 on			# SB on link 2
+				chip southbridge/nvidia/mcp55		# Southbridge
+					device pci 0.0 on end			# HT
+					device pci 1.0 on			# LPC
+						chip superio/winbond/w83627hf	# 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
+								io 0x60 = 0x60
+								io 0x62 = 0x64
+								irq 0x70 = 1
+								irq 0x72 = 12
+							end
+							device pnp 2e.6 off		# SFI
+								io 0x62 = 0x100
+							end
+							device pnp 2e.7 off		# GPIO, game port, MIDI
+								io 0x60 = 0x220
+								io 0x62 = 0x300
+								irq 0x70 = 9
+							end
+							device pnp 2e.8 off end		# WDTO PLED
+							device pnp 2e.9 off end		# GPIO SUSLED
+							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			# PCI
+						device pci 4.0 on end
+					end
+					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 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.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+			device pci 18.4 on end
+		end
+	end
 end
diff --git a/src/mainboard/tyan/s4880/devicetree.cb b/src/mainboard/tyan/s4880/devicetree.cb
index da59eb5..cf96c37 100644
--- a/src/mainboard/tyan/s4880/devicetree.cb
+++ b/src/mainboard/tyan/s4880/devicetree.cb
@@ -1,27 +1,27 @@
 chip northbridge/amd/amdk8/root_complex
-        device cpu_cluster 0 on
-                chip cpu/amd/socket_940
-                        device lapic 0 on end
-                end
-        end
+	device cpu_cluster 0 on
+		chip cpu/amd/socket_940
+			device lapic 0 on end
+		end
+	end
 
 	device domain 0 on
 		subsystemid 0x10f1 0x4880 inherit
 		chip northbridge/amd/amdk8
-			device pci 18.0 on end # LDT0
-			device pci 18.0 on end # LDT1
-			device pci 18.0 on #  northbridge
-				#  devices on link 2, link 2 == LDT 2
+			device pci 18.0 on end	# LDT0
+			device pci 18.0 on end	# LDT1
+			device pci 18.0 on	# northbridge
+				# devices on link 2, link 2 == LDT 2
 				chip southbridge/amd/amd8131
 					# the on/off keyword is mandatory
-                                        device pci 0.0 on
-#                                                chip drivers/lsi/53c1030
-#                                                        device pci 4.0 on end
-#                                                        device pci 4.1 on end
-#                                                        register "fw_address" = "0xfff8c000"
-#                                                end
-                                                device pci 9.0 on end
-                                                device pci 9.1 on end
+					device pci 0.0 on
+#						chip drivers/lsi/53c1030
+#							device pci 4.0 on end
+#							device pci 4.1 on end
+#							register "fw_address" = "0xfff8c000"
+#						end
+						device pci 9.0 on end
+						device pci 9.1 on end
 					end
 					device pci 0.1 on end
 					device pci 1.0 on end
@@ -35,48 +35,48 @@ chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                device pci 6.0 on end
+						device pci 6.0 on end
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
-							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 #  CIR
-                	                                        io 0x60 = 0x100
-                	                                end
-                	                                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
-                	                                        io 0x60 = 0x290
-                	                                        irq 0x70 = 5
-                	                                end
+							device pnp 2e.6 off	# CIR
+								io 0x60 = 0x100
+							end
+							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
+								io 0x60 = 0x290
+								irq 0x70 = 5
+							end
 						end
 					end
 					device pci 1.1 on end
@@ -84,16 +84,15 @@ chip northbridge/amd/amdk8/root_complex
 					device pci 1.3 on end
 					device pci 1.5 off end
 					device pci 1.6 off end
-                                        register "ide0_enable" = "1"
-                                        register "ide1_enable" = "1"
+					register "ide0_enable" = "1"
+					register "ide1_enable" = "1"
 				end
-			end #  device pci 18.0
+			end # device pci 18.0
 
 			device pci 18.1 on end
 			device pci 18.2 on end
 			device pci 18.3 on end
 		end
-
 	end #domain
 end
 
diff --git a/src/mainboard/tyan/s4882/devicetree.cb b/src/mainboard/tyan/s4882/devicetree.cb
index 44da2c2..01ba556 100644
--- a/src/mainboard/tyan/s4882/devicetree.cb
+++ b/src/mainboard/tyan/s4882/devicetree.cb
@@ -1,15 +1,15 @@
 chip northbridge/amd/amdk8/root_complex
-        device cpu_cluster 0 on
-                chip cpu/amd/socket_940
-                        device lapic 0 on end
-                end
-        end
+	device cpu_cluster 0 on
+		chip cpu/amd/socket_940
+			device lapic 0 on end
+		end
+	end
 	device domain 0 on
 		subsystemid 0x10f1 0x4882 inherit
 		chip northbridge/amd/amdk8
-			device pci 18.0 on end # LDT0
-			device pci 18.0 on #  northbridge
-				#  devices on link 1, link 1 == LDT 1
+			device pci 18.0 on end	# LDT0
+			device pci 18.0 on	# northbridge
+				# devices on link 1, link 1 == LDT 1
 				chip southbridge/amd/amd8131
 					# the on/off keyword is mandatory
 					device pci 0.0 on
@@ -18,8 +18,8 @@ chip northbridge/amd/amdk8/root_complex
 #							device pci 4.1 on end
 #							register "fw_address" = "0xfff8c000"
 #						end
-                                                device pci 9.0 on end #Broadcom
-                                                device pci 9.1 on end
+						device pci 9.0 on end #Broadcom
+						device pci 9.1 on end
 					end
 					device pci 0.1 on end
 					device pci 1.0 on end
@@ -33,164 +33,160 @@ chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                #chip drivers/ati/ragexl
-                                                device pci 6.0 on end
-                                                #end
-                                                device pci 5.0 on end #SiI
+						#chip drivers/ati/ragexl
+						device pci 6.0 on end
+						#end
+						device pci 5.0 on end #SiI
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
-							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 on #  Com2
-                	                 			io 0x60 = 0x2f8
-                	                			irq 0x70 = 3
+							device pnp 2e.3 on	# 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 #  CIR
-                	                                        io 0x60 = 0x100
-                	                                end
-                	                                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
-                	                                        io 0x60 = 0x290
-                	                                        irq 0x70 = 5
-                	                                end
+							device pnp 2e.6 off	# CIR
+								io 0x60 = 0x100
+							end
+							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
+								io 0x60 = 0x290
+								irq 0x70 = 5
+							end
 						end
 					end
 					device pci 1.1 on end
 					device pci 1.2 on end
-                                        device pci 1.3 on
-#                                                chip drivers/i2c/i2cmux # pca9556 smbus mux
-#                                                        device i2c 18 on #0 pca9516 2, 1
-#	  					                chip drivers/i2c/lm63 #cpu0 temp
-#                                                                        device i2c 4c on end
-#                                                                end
+					device pci 1.3 on
+#						chip drivers/i2c/i2cmux	# pca9556 smbus mux
+#							device i2c 18 on #0 pca9516 2, 1
+#								chip drivers/i2c/lm63 #cpu0 temp
+#									device i2c 4c on end
+#								end
 #							end
-#                                                        device i2c 18 on #1 pca9516 1, 1
-#                                                                chip drivers/generic/generic #dimm 1-0-0
-#                                                                        device i2c 50 on end
-#                                                                end
-#                                                                chip drivers/generic/generic #dimm 1-0-1
-#                                                                        device i2c 51 on end
-#                                                                end
-#                                                                chip drivers/generic/generic #dimm 1-1-0
-#                                                                        device i2c 52 on end
-#                                                                end
-#                                                                chip drivers/generic/generic #dimm 1-1-1
-#	                                                                device i2c 53 on end
-#								end
-#                                                        end
-#                                                        device i2c 18 on #2 pca9516 1, 2
-#                                                                chip drivers/generic/generic #dimm 0-0-0
-#                                                                        device i2c 50 on end
-#                                                                end
-#                                                                chip drivers/generic/generic #dimm 0-0-1
-#                                                                        device i2c 51 on end
-#                                                                end
-#                                                                chip drivers/generic/generic #dimm 0-1-0
-#                                                                        device i2c 52 on end
-#                                                                end
-#                                                                chip drivers/generic/generic #dimm 0-1-1
-#                                                                	device i2c 53 on end
-#								end
-#                                                        end
-#                                                        device i2c 18 on #3 pca9516 1, 3
-#                                                                chip drivers/generic/generic #dimm 3-0-0
-#                                                                        device i2c 50 on end
-#                                                                end
-#                                                                chip drivers/generic/generic #dimm 3-0-1
-#                                                                        device i2c 51 on end
-#                                                                end
-#                                                                chip drivers/generic/generic #dimm 3-1-0
-#                                                                        device i2c 52 on end
-#                                                                end
-#                                                                chip drivers/generic/generic #dimm 3-1-1
-#                                                                	device i2c 53 on end
-#								end
-#                                                        end
-#                                                        device i2c 18 on #4 pca9516 1, 4
-#                                                                chip drivers/generic/generic #dimm 2-0-0
-#                                                                        device i2c 50 on end
-#                                                                end
-#                                                                chip drivers/generic/generic #dimm 2-0-1
-#                                                                        device i2c 51 on end
-#                                                                end
-#                                                                chip drivers/generic/generic #dimm 2-1-0
-#                                                                        device i2c 52 on end
-#                                                                end
-#                                                                chip drivers/generic/generic #dimm 2-1-1
-#                                                                	device i2c 53 on end
-#								end
-#                                                        end
-#                                                        device i2c 18 on #5 pca9516 2, 2
-#                                                                chip drivers/i2c/lm63 #cpu1 temp
-#                                                                       device i2c 4c on end
-#                                                                end
-#                                                        end
-#                                                        device i2c 18 on #6 pca9516 2, 3
-#                                                                chip drivers/i2c/lm63 #cpu2 temp
-#                                                                        device i2c 4c on end
-#                                                                end
-#                                                        end
-#                                                        device i2c 18 on #7 pca9516 2, 4
-#                                                                chip drivers/i2c/lm63 #cpu3 temp
-#                                                                        device i2c 4c on end
-#                                                                end
-#                                                        end
-#                                                end # i2cmux
-#                                                chip drivers/i2c/adm1027 # ADM1027 CPU1 vid and System FAN...
-#                                                        device i2c 2e on end
-#                                                end
-#                                                chip drivers/generic/generic # Winbond HWM 0x54 CPU0 vid
-#                                                        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
-#                                                chip drivers/generic/generic # ??
-#                                                        device i2c 69 on end
-#                                                end
-                                        end # acpi
+#							device i2c 18 on #1 pca9516 1, 1
+#								chip drivers/generic/generic #dimm 1-0-0
+#									device i2c 50 on end
+#								end
+#								chip drivers/generic/generic #dimm 1-0-1
+#									device i2c 51 on end
+#								end
+#								chip drivers/generic/generic #dimm 1-1-0
+#									device i2c 52 on end
+#								end
+#								chip drivers/generic/generic #dimm 1-1-1
+#									device i2c 53 on end
+#								end
+#							end
+#							device i2c 18 on #2 pca9516 1, 2
+#								chip drivers/generic/generic #dimm 0-0-0
+#									device i2c 50 on end
+#								end
+#								chip drivers/generic/generic #dimm 0-0-1
+#									device i2c 51 on end
+#								end
+#								chip drivers/generic/generic #dimm 0-1-0
+#									device i2c 52 on end
+#								end
+#								chip drivers/generic/generic #dimm 0-1-1
+#									device i2c 53 on end
+#								end
+#							end
+#							device i2c 18 on #3 pca9516 1, 3
+#								chip drivers/generic/generic #dimm 3-0-0
+#									device i2c 50 on end
+#								end
+#								chip drivers/generic/generic #dimm 3-0-1
+#									device i2c 51 on end
+#								end
+#								chip drivers/generic/generic #dimm 3-1-0
+#									device i2c 52 on end
+#								end
+#								chip drivers/generic/generic #dimm 3-1-1
+#									device i2c 53 on end
+#								end
+#							end
+#							device i2c 18 on #4 pca9516 1, 4
+#								chip drivers/generic/generic #dimm 2-0-0
+#									device i2c 50 on end
+#								end
+#								chip drivers/generic/generic #dimm 2-0-1
+#									device i2c 51 on end
+#								end
+#								chip drivers/generic/generic #dimm 2-1-0
+#									device i2c 52 on end
+#								end
+#								chip drivers/generic/generic #dimm 2-1-1
+#									device i2c 53 on end
+#								end
+#							end
+#							device i2c 18 on #5 pca9516 2, 2
+#								chip drivers/i2c/lm63 #cpu1 temp
+#									device i2c 4c on end
+#								end
+#							end
+#							device i2c 18 on #6 pca9516 2, 3
+#								chip drivers/i2c/lm63 #cpu2 temp
+#									device i2c 4c on end
+#								end
+#							end
+#							device i2c 18 on #7 pca9516 2, 4
+#								chip drivers/i2c/lm63 #cpu3 temp
+#									device i2c 4c on end
+#								end
+#							end
+#						end # i2cmux
+#						chip drivers/i2c/adm1027 # ADM1027 CPU1 vid and System FAN...
+#							device i2c 2e on end
+#						end
+#						chip drivers/generic/generic # Winbond HWM 0x54 CPU0 vid
+#							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
+#						chip drivers/generic/generic # ??
+#							device i2c 69 on end
+#						end
+					end # acpi
 					device pci 1.5 off end
 					device pci 1.6 off end
 					register "ide0_enable" = "1"
-                                        register "ide1_enable" = "1"
+					register "ide1_enable" = "1"
 				end
-			end #  device pci 18.0
-
-                	device pci 18.0 on end
-
+			end # device pci 18.0
+			device pci 18.0 on 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/tyan/s8226/devicetree.cb b/src/mainboard/tyan/s8226/devicetree.cb
index f879ec5..355dd69 100644
--- a/src/mainboard/tyan/s8226/devicetree.cb
+++ b/src/mainboard/tyan/s8226/devicetree.cb
@@ -25,97 +25,96 @@ chip northbridge/amd/agesa/family15/root_complex
 	device domain 0 on
 		subsystemid 0x15d9 0xab11 inherit #Tyan
 		chip northbridge/amd/agesa/family15 # CPU side of HT root complex
-			device pci 18.0 on     # Put IO-HUB at link_num 0, Instead of HT Link topology
-				chip northbridge/amd/cimx/rd890 # Southbridge PCI side of HT Root complex
-					device pci 0.0 on  end # HT Root Complex 0x9600
-					device pci 0.1 off end # CLKCONFIG
-					device pci 2.0 on  end # GPP1 Port0  x16 SLOT4, 0x5A16
-					device pci 3.0 off end # GPP1 Port1
-					device pci 4.0 on end # GPP3a Port0  x4 SAS
-					device pci 5.0 on end # GPP3a Port1
-					device pci 6.0 on end # GPP3a Port2
-					device pci 7.0 on end # GPP3a Port3
-					device pci 8.0 off end # NB/SB Link P2P bridge, should be hidden at boot time
-					device pci 9.0 on end # GPP3a Port4  x1 NC
-					device pci a.0 on end # GPP3a Port5  x1 NC
-					device pci b.0 on end # GPP2 Port0 (Not for sr5650)
-					device pci c.0 off end # GPP2 Port1 (Not for sr5650/sr5670)
-					device pci d.0 on  end # GPP3b Port0 (Not for sr5650/sr5670) 0x5A1E, Intel 82576
-					register "gpp1_configuration" = "0"   # Configuration 16:0 default
-					register "gpp2_configuration" = "0"   # Configuration 8:8
-					register "gpp3a_configuration" = "2"   # 2 Configuration 4:1:1:0:0:0, 11 Configuration 1:1:1:1:1:1
+			device pci 18.0 on	# Put IO-HUB at link_num 0, Instead of HT Link topology
+				chip northbridge/amd/cimx/rd890	# Southbridge PCI side of HT Root complex
+					device pci 0.0 on end	# HT Root Complex 0x9600
+					device pci 0.1 off end	# CLKCONFIG
+					device pci 2.0 on end	# GPP1 Port0	x16 SLOT4, 0x5A16
+					device pci 3.0 off end	# GPP1 Port1
+					device pci 4.0 on end	# GPP3a Port0	x4 SAS
+					device pci 5.0 on end	# GPP3a Port1
+					device pci 6.0 on end	# GPP3a Port2
+					device pci 7.0 on end	# GPP3a Port3
+					device pci 8.0 off end	# NB/SB Link P2P bridge, should be hidden at boot time
+					device pci 9.0 on end	# GPP3a Port4	x1 NC
+					device pci a.0 on end	# GPP3a Port5	x1 NC
+					device pci b.0 on end	# GPP2 Port0 (Not for sr5650)
+					device pci c.0 off end	# GPP2 Port1 (Not for sr5650/sr5670)
+					device pci d.0 on end	# GPP3b Port0 (Not for sr5650/sr5670) 0x5A1E, Intel 82576
+					register "gpp1_configuration" = "0"	# Configuration 16:0 default
+					register "gpp2_configuration" = "0"	# Configuration 8:8
+					register "gpp3a_configuration" = "2"	# 2 Configuration 4:1:1:0:0:0, 11 Configuration 1:1:1:1:1:1
 					register "port_enable" = "0x3ef6"
 				end #northbridge/amd/cimx/rd890
-				chip southbridge/amd/cimx/sb700 # 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 # USB1
-					device pci 12.1 on end # USB1
-					device pci 12.2 on end # USB1
-					device pci 13.0 on end # USB2
-					device pci 13.1 on end # USB2
-					device pci 13.2 on end # USB2
-					device pci 14.0 on end # SM
-					device pci 14.1 off end # IDE  0x439c
-					device pci 14.2 off end # HDA  0x4383, s8226 not have codec.
-					device pci 14.3 on # LPC  0x439d
+				chip southbridge/amd/cimx/sb700	# 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	# USB1
+					device pci 12.1 on end	# USB1
+					device pci 12.2 on end	# USB1
+					device pci 13.0 on end	# USB2
+					device pci 13.1 on end	# USB2
+					device pci 13.2 on end	# USB2
+					device pci 14.0 on end	# SM
+					device pci 14.1 off end	# IDE	0x439c
+					device pci 14.2 off end	# HDA	0x4383, s8226 not have codec.
+					device pci 14.3 on	# LPC	0x439d
 						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
 							## though UARTs are on the NUVOTON BMC, superio only used to support PS2 KB/MS##
-							device pnp 2e.5 on #  PS/2 keyboard & mouse
+							device pnp 2e.5 on	# PS/2 keyboard & mouse
 								io 0x60 = 0x60
 								io 0x62 = 0x64
-								irq 0x70 = 0x01 #keyboard
-								irq 0x72 = 0x0C #mouse
+								irq 0x70 = 0x01	#keyboard
+								irq 0x72 = 0x0C	#mouse
 							end
-							device pnp 2e.6 off #  SPI
+							device pnp 2e.6 off	# SPI
 							end
-							device pnp 2e.307 off #  GPIO6
+							device pnp 2e.307 off	# GPIO6
 							end
-							device pnp 2e.8 off #  WDTO#, PLED
+							device pnp 2e.8 off	# 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 off # HWM
+							device pnp 2e.b off	# HWM
 								io 0x60 = 0x290
 							end
 							device pnp 2e.c off # PECI, SST
 							end
 						end #superio/winbond/w83627dhg
 						chip drivers/i2c/w83795
-							device pnp 5e on #hwm
+							device pnp 5e on	#hwm
 							end
 						end #drivers/i2c/w83795
 					end # LPC
 					device pci 14.4 on end # PCI 0x4384
 					device pci 14.5 on end # USB 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
 				end # southbridge/amd/cimx/sb700
 			end # device pci 18.0
-
 			device pci 18.1 on end
 			device pci 18.2 on end
 			device pci 18.3 on end
@@ -130,4 +129,3 @@ chip northbridge/amd/agesa/family15/root_complex
 		end #chip northbridge/amd/agesa/family15 # CPU side of HT root complex
 	end #domain
 end #northbridge/amd/agesa/family15/root_complex
-
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-m/devicetree.cb b/src/mainboard/via/epia-m/devicetree.cb
index 98f6b4f..1fb1e18 100644
--- a/src/mainboard/via/epia-m/devicetree.cb
+++ b/src/mainboard/via/epia-m/devicetree.cb
@@ -2,7 +2,7 @@ chip northbridge/via/vt8623
 
 	device cpu_cluster 0 on
 		chip cpu/via/c3
-			device lapic 0 on  end
+			device lapic 0 on end
 		end
 	end
 
@@ -18,7 +18,7 @@ chip northbridge/via/vt8623
 			device pci 10.2 on end # USB 1.1
 			device pci 10.3 on end # USB 2
 
-			device pci 11.0 on      # Southbridge
+			device pci 11.0 on	# Southbridge
 				chip superio/via/vt1211
 					device pnp 2e.0 on	# Floppy
 						io 0x60 = 0x3f0
@@ -45,11 +45,11 @@ chip northbridge/via/vt8623
 				end
 			end
 
-			device pci 11.1 on  end # IDE
+			device pci 11.1 on end	# IDE
 			# 2-4 non existant?
-			device pci 11.5 on  end # AC97 Audio
-			device pci 11.6 off end # AC97 Modem
-			device pci 12.0 on end  # Ethernet
+			device pci 11.5 on end	# AC97 Audio
+			device pci 11.6 off end	# AC97 Modem
+			device pci 12.0 on end	# Ethernet
 		end
 #		This is on the EPIA MII, not the M.
 		chip southbridge/ricoh/rl5c476
diff --git a/src/mainboard/via/epia-m700/devicetree.cb b/src/mainboard/via/epia-m700/devicetree.cb
index 2f971c2..105a13b 100644
--- a/src/mainboard/via/epia-m700/devicetree.cb
+++ b/src/mainboard/via/epia-m700/devicetree.cb
@@ -1,24 +1,24 @@
 chip northbridge/via/vx800	# Northbridge
-  device domain 0 on
-    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
-    # device pci f.0 on end	# IDE/SATA
-    # device pci f.1 on end	# IDE
-    # device pci 10.0 on end	# USB 1.1
-    # device pci 10.1 on end	# USB 1.1
-    # device pci 10.2 on end	# USB 1.1
-    # device pci 10.4 on end	# USB 2.0
-    # device pci 11.0 on	# Southbridge LPC
-    # 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
+		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
+		# device pci f.0 on end	# IDE/SATA
+		# device pci f.1 on end	# IDE
+		# device pci 10.0 on end	# USB 1.1
+		# device pci 10.1 on end	# USB 1.1
+		# device pci 10.2 on end	# USB 1.1
+		# device pci 10.4 on end	# USB 2.0
+		# device pci 11.0 on	# Southbridge LPC
+		# 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-m850/devicetree.cb b/src/mainboard/via/epia-m850/devicetree.cb
index 0c21cc8..6003ecc 100644
--- a/src/mainboard/via/epia-m850/devicetree.cb
+++ b/src/mainboard/via/epia-m850/devicetree.cb
@@ -28,12 +28,12 @@ chip northbridge/via/vx900		# Northbridge
 		end
 	end
 	device domain 0 on
-		device pci 0.0  on end		# [0410] Host controller
-		device pci 0.1  on end		# [1410] Error Reporting
-		device pci 0.2  on end		# [2410] CPU Bus Control
-		device pci 0.3  on end		# [3410] DRAM Bus Control
-		device pci 0.4  on end		# [4410] Power Management
-		device pci 0.5  on 		# [5410] APIC+Traffic Control
+		device pci 0.0 on end		# [0410] Host controller
+		device pci 0.1 on end		# [1410] Error Reporting
+		device pci 0.2 on end		# [2410] CPU Bus Control
+		device pci 0.3 on end		# [3410] DRAM Bus Control
+		device pci 0.4 on end		# [4410] Power Management
+		device pci 0.5 on		# [5410] APIC+Traffic Control
 			chip drivers/generic/ioapic
 				register "have_isa_interrupts" = "0"
 				register "irq_on_fsb" = "1"
@@ -42,23 +42,23 @@ chip northbridge/via/vx900		# Northbridge
 				device ioapic 2 on end
 			end
 		end
-		device pci 0.6  off end		# [6410] Scratch Registers
-		device pci 0.7  on end		# [7410] V4 Link Control
-		device pci 1.0  on		# [7122] VGA Chrome9 HD
+		device pci 0.6 off end		# [6410] Scratch Registers
+		device pci 0.7 on end		# [7410] V4 Link Control
+		device pci 1.0 on		# [7122] VGA Chrome9 HD
 			ioapic_irq 2 INTA 0x28
 		end
-		device pci 1.1  on		# [9170] Audio Device
+		device pci 1.1 on		# [9170] Audio Device
 			ioapic_irq 2 INTA 0x29
 		end
-		device pci 3.0  on end		# [a410] PEX1
-		device pci 3.1  on end		# [b410] PEX2
-		device pci 3.2  on end		# [c410] PEX3
-		device pci 3.3  on end		# [d410] PEX4
-		device pci 3.4  on end		# [e410] PCIE bridge
-		device pci b.0  on end		# [a409] USB Device
-		device pci c.0  off end		# [95d0] SDIO Host Controller
-		device pci d.0  off end		# [9530] Memory Card controller
-		device pci f.0  on		# [9001] SATA Controller
+		device pci 3.0 on end		# [a410] PEX1
+		device pci 3.1 on end		# [b410] PEX2
+		device pci 3.2 on end		# [c410] PEX3
+		device pci 3.3 on end		# [d410] PEX4
+		device pci 3.4 on end		# [e410] PCIE bridge
+		device pci b.0 on end		# [a409] USB Device
+		device pci c.0 off end		# [95d0] SDIO Host Controller
+		device pci d.0 off end		# [9530] Memory Card controller
+		device pci f.0 on		# [9001] SATA Controller
 			ioapic_irq 1 INTA 0x15
 		end
 		device pci 10.0 on end		# [3038] USB 1.1
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/via/epia/devicetree.cb b/src/mainboard/via/epia/devicetree.cb
index d5e16ac..5392f26 100644
--- a/src/mainboard/via/epia/devicetree.cb
+++ b/src/mainboard/via/epia/devicetree.cb
@@ -1,6 +1,6 @@
 chip northbridge/via/vt8601
 	device domain 0 on
-    		device pci 0.0 on end			# Northbridge
+		device pci 0.0 on end			# Northbridge
 #		device pci 0.1 on			# AGP bridge
 		#	device pci 0.0 on end		# Integrated VGA
 #		end
@@ -8,54 +8,54 @@ chip northbridge/via/vt8601
 			register "enable_native_ide" = "0"
 			register "enable_com_ports" = "1"
 			register "enable_keyboard" = "0"
-			device pci 11.0 on              # Southbrdge
+			device pci 11.0 on			# Southbrdge
 				chip superio/winbond/w83627hf
-					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
+						irq 0x72 = 12
 					end
-					device pnp 2e.5 on      #  Keyboard
-					   io 0x60 = 0x60
-					   io 0x62 = 0x64
-					  irq 0x70 = 1
-					  irq 0x72 = 12
-	      				end
 				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
+				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
-			device pci 11.1 on  end		# Ide
+			device pci 11.1 on end		# Ide
 			device pci 11.2 off end		# Usb port 0-1
 			device pci 11.3 off end		# Usb port 2-3
 			device pci 11.4 off end		# ACPI
 			device pci 11.5 off end		# AC97 Audio
-			device pci 11.6 on  end		# AC97 Modem
-          		device pci 12.0 on  end		# Ethernet
-        	end
+			device pci 11.6 on end		# AC97 Modem
+			device pci 12.0 on end		# Ethernet
+		end
 	end
 
-        device cpu_cluster 0 on
-                chip cpu/via/c3
-                        device lapic 0 on end
-                end
-        end
+	device cpu_cluster 0 on
+		chip cpu/via/c3
+			device lapic 0 on end
+		end
+	end
 end
diff --git a/src/mainboard/via/pc2500e/devicetree.cb b/src/mainboard/via/pc2500e/devicetree.cb
index 17bc35e..ba64c99 100644
--- a/src/mainboard/via/pc2500e/devicetree.cb
+++ b/src/mainboard/via/pc2500e/devicetree.cb
@@ -1,89 +1,89 @@
 chip northbridge/via/cn700			# Northbridge
-  device domain 0 on			# PCI domain
-    subsystemid 0x1019 0xaa51 inherit
-    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			# SATA
-      device pci f.1 on end			# IDE
-      register "fn_ctrl_lo" = "0x80"
-      register "fn_ctrl_hi" = "0x1d"
-      device pci 10.0 on end			# UHCI
-      device pci 10.1 on end			# UHCI
-      device pci 10.2 on end			# UHCI
-      device pci 10.3 on end			# UHCI
-      device pci 10.4 on end			# EHCI
-      device pci 10.5 on end			# UDCI
-      device pci 11.0 on			# Southbridge LPC
-        chip superio/ite/it8716f		# Super I/O
-          device pnp 2e.0 on			# 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 (N/A on this board)
-            io 0x60 = 0x2f8
-            irq 0x70 = 3
-          end
-          device pnp 2e.3 on			# Parallel port
-            io 0x60 = 0x378
-            irq 0x70 = 7
-            drq 0x74 = 3
-          end
-          device pnp 2e.4 on			# Environment controller
-            io 0x60 = 0x290
-            io 0x62 = 0x0000
-            irq 0x70 = 9
-          end
-          device pnp 2e.5 off			# PS/2 keyboard (not used)
-            io 0x60 = 0x60
-            io 0x62 = 0x64
-            irq 0x70 = 1
-          end
-          device pnp 2e.6 off			# PS/2 mouse (not used)
-            irq 0x70 = 12
-          end
-          device pnp 2e.7 on			# GPIO
-            io 0x60 = 0x0000
-            io 0x62 = 0x0800
-            io 0x64 = 0x0000
-          end
-          device pnp 2e.8 off			# MIDI port (N/A)
-            io 0x60 = 0x300
-            irq 0x70 = 10
-          end
-          device pnp 2e.9 off			# Game port (N/A)
-            io 0x60 = 0x201
-          end
-          device pnp 2e.a on			# Consumer IR
-            io 0x60 = 0x310
-            irq 0x70 = 11
-          end
-        end
-      end
-      device pci 11.5 on end			# AC'97 audio
-      # device pci 11.6 off end			# AC'97 modem (N/A)
-      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
+		subsystemid 0x1019 0xaa51 inherit
+		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			# SATA
+			device pci f.1 on end			# IDE
+			register "fn_ctrl_lo" = "0x80"
+			register "fn_ctrl_hi" = "0x1d"
+			device pci 10.0 on end			# UHCI
+			device pci 10.1 on end			# UHCI
+			device pci 10.2 on end			# UHCI
+			device pci 10.3 on end			# UHCI
+			device pci 10.4 on end			# EHCI
+			device pci 10.5 on end			# UDCI
+			device pci 11.0 on			# Southbridge LPC
+				chip superio/ite/it8716f		# Super I/O
+					device pnp 2e.0 on			# 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 (N/A on this board)
+						io 0x60 = 0x2f8
+						irq 0x70 = 3
+					end
+					device pnp 2e.3 on			# Parallel port
+						io 0x60 = 0x378
+						irq 0x70 = 7
+						drq 0x74 = 3
+					end
+					device pnp 2e.4 on			# Environment controller
+						io 0x60 = 0x290
+						io 0x62 = 0x0000
+						irq 0x70 = 9
+					end
+					device pnp 2e.5 off			# PS/2 keyboard (not used)
+						io 0x60 = 0x60
+						io 0x62 = 0x64
+						irq 0x70 = 1
+					end
+					device pnp 2e.6 off			# PS/2 mouse (not used)
+						irq 0x70 = 12
+					end
+					device pnp 2e.7 on			# GPIO
+						io 0x60 = 0x0000
+						io 0x62 = 0x0800
+						io 0x64 = 0x0000
+					end
+					device pnp 2e.8 off			# MIDI port (N/A)
+						io 0x60 = 0x300
+						irq 0x70 = 10
+					end
+					device pnp 2e.9 off			# Game port (N/A)
+						io 0x60 = 0x201
+					end
+					device pnp 2e.a on			# Consumer IR
+						io 0x60 = 0x310
+						irq 0x70 = 11
+					end
+				end
+			end
+			device pci 11.5 on end			# AC'97 audio
+			# device pci 11.6 off end			# AC'97 modem (N/A)
+			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/vt8454c/devicetree.cb b/src/mainboard/via/vt8454c/devicetree.cb
index 87d2ed1..d880ffe 100644
--- a/src/mainboard/via/vt8454c/devicetree.cb
+++ b/src/mainboard/via/vt8454c/devicetree.cb
@@ -5,22 +5,22 @@ chip northbridge/via/cx700
 		end
 	end
 	device domain 0 on
-		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     # PCI Bridge
+		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	# PCI Bridge
 			device pci 0.0 on end # Onboard Video
 		end # PCI Bridge
-		device pci f.0 on end # IDE/SATA
-		#device pci f.1 on end # IDE
-		device pci 10.0 on end # USB 1.1
-		device pci 10.1 on end # USB 1.1
-		device pci 10.2 on end # USB 1.1
-		device pci 10.4 on end # USB 2.0
-		device pci 11.0 on      # Southbridge LPC
+		device pci f.0 on end	# IDE/SATA
+		#device pci f.1 on end	# IDE
+		device pci 10.0 on end	# USB 1.1
+		device pci 10.1 on end	# USB 1.1
+		device pci 10.2 on end	# USB 1.1
+		device pci 10.4 on end	# USB 2.0
+		device pci 11.0 on	# Southbridge LPC
 			chip superio/via/vt1211
 				device pnp 2e.0 on	# Floppy
 					io 0x60 = 0x3f0
@@ -46,9 +46,8 @@ chip northbridge/via/cx700
 			end # superio
 		end # pci 11.0
 		# 1-4 non existant
-		#device pci 11.5 on end # AC97 Audio
-		#device pci 11.6 off end # AC97 Modem
-		#device pci 12.0 on end  # Ethernet
+		#device pci 11.5 on end		# AC97 Audio
+		#device pci 11.6 off end	# AC97 Modem
+		#device pci 12.0 on end		# Ethernet
 	end # pci domain 0
 end # cx700
-
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