diff --git a/src/mainboard/compulab/intense_pc/devicetree.cb b/src/mainboard/compulab/intense_pc/devicetree.cb
index 1ccf7e2..93cb5d2 100644
--- a/src/mainboard/compulab/intense_pc/devicetree.cb
+++ b/src/mainboard/compulab/intense_pc/devicetree.cb
@@ -18,6 +18,7 @@
 	register "gpu_dp_b_hotplug" = "4"
 	register "gpu_dp_c_hotplug" = "4"
 	register "gpu_dp_d_hotplug" = "4"
+
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax # FIXME: check all registers
 			register "c1_acpower" = "1"
@@ -31,7 +32,21 @@
 		end
 	end
 	device domain 0x0 on
-		chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
+		device pci 00.0 on	# Host bridge
+			subsystemid 0x8086 0x2010
+		end
+		device pci 01.0 on	# PCIe Bridge for discrete graphics
+			subsystemid 0x8086 0x2010
+		end
+		device pci 01.1 on	# PCIe Bridge for discrete graphics
+			subsystemid 0x8086 0x2010
+		end
+		device pci 02.0 on	# Internal graphics VGA controller
+			subsystemid 0x8086 0x2211
+		end
+
+		subsystemid 0x8086 0x7270 inherit
+		chip southbridge/intel/bd82x6x	# Intel Series 6 Cougar Point PCH
 			register "c2_latency" = "0x0065"
 			register "docking_supported" = "1"
 			register "gen1_dec" = "0x0000164d"
@@ -58,129 +73,29 @@
 			register "spi_uvscc" = "0x2005"
 			register "spi_lvscc" = "0x2005"
 
-			# USB 3.0 Controller
-			device pci 14.0 on
-				subsystemid 0x8086 0x7270
-			end
-
-			# Management Engine Interface 1
-			device pci 16.0 off
-			end
-
-			# Management Engine Interface 2
-			device pci 16.1 off
-			end
-
-			# Management Engine IDE-R
-			device pci 16.2 off
-			end
-
-			# Management Engine KT
-			device pci 16.3 off
-			end
-
-			# Intel Gigabit Ethernet
-			device pci 19.0 on
-			end
-
-			# USB2 EHCI #2
-			device pci 1a.0 on
-				subsystemid 0x8086 0x7270
-			end
-
-			# High Definition Audio Audio controller
-			device pci 1b.0 on
-				subsystemid 0x8086 0x7270
-			end
-
-			# PCIe Port #1
-			device pci 1c.0 on
-				subsystemid 0x8086 0x7270
-			end
-
-			# PCIe Port #2
-			device pci 1c.1 on
-				subsystemid 0x8086 0x7270
-			end
-
-			# PCIe Port #3
-			device pci 1c.2 on
-				subsystemid 0x8086 0x7270
-			end
-
-			# PCIe Port #4
-			device pci 1c.3 off
-			end
-
-			# PCIe Port #5
-			device pci 1c.4 on
-				subsystemid 0x8086 0x7270
-			end
-
-			# PCIe Port #6
-			device pci 1c.5 off
-			end
-
-			# PCIe Port #7
-			device pci 1c.6 off
-			end
-
-			# PCIe Port #8
-			device pci 1c.7 off
-			end
-
-			# USB2 EHCI #1
-			device pci 1d.0 on
-				subsystemid 0x8086 0x7270
-			end
-
-			# PCI bridge
-			device pci 1e.0 off
-			end
-
-			# LPC bridge PCI-LPC bridge
-			device pci 1f.0 on
-				subsystemid 0x8086 0x7270
-			end
-
-			# SATA Controller 1
-			device pci 1f.2 on
-				subsystemid 0x8086 0x7270
-			end
-
-			# SMBus
-			device pci 1f.3 on
-				subsystemid 0x8086 0x7270
-			end
-
-			# SATA Controller 2
-			device pci 1f.5 off
-			end
-
-			# Thermal Unsupported PCI device 8086:1e24
-			device pci 1f.6 on
-				subsystemid 0x8086 0x7270
-			end
-		end
-
-		# Host bridge Host bridge
-		device pci 00.0 on
-			subsystemid 0x8086 0x2010
-		end
-
-		# PCIe Bridge for discrete graphics PCI device 8086:0151
-		device pci 01.0 on
-			subsystemid 0x8086 0x2010
-		end
-
-		# Internal graphics VGA controller
-		device pci 02.0 on
-			subsystemid 0x8086 0x2211
-		end
-
-		# Unsupported PCI device 8086:0155
-		device pci 01.1 on
-			subsystemid 0x8086 0x2010
+			device pci 14.0 on  end	# USB 3.0 Controller
+			device pci 16.0 off 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 on  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
+			device pci 1c.1 on  end	# PCIe Port #2
+			device pci 1c.2 on  end	# PCIe Port #3
+			device pci 1c.3 off end	# PCIe Port #4
+			device pci 1c.4 on  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  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
 		end
 	end
 end