HP sandy/ivy laptops: Align devicetrees

This makes it easier to spot differences.

Change-Id: I16596a661ee4e56c2cb1d0aef663067ae6159705
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38084
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>

7 files changed, 77 insertions, 83 deletions

diff --git a/src/mainboard/hp/2570p/devicetree.cb b/src/mainboard/hp/2570p/devicetree.cb
index c659be68be..aec3380c15 100644
--- a/src/mainboard/hp/2570p/devicetree.cb
+++ b/src/mainboard/hp/2570p/devicetree.cb
@@ -45,9 +45,9 @@ chip northbridge/intel/sandybridge
 	device domain 0x0 on
 		subsystemid 0x103c 0x17df inherit
 
-		device pci 00.0 on  end	# Host bridge Host bridge
+		device pci 00.0 on  end	# Host bridge
 		device pci 01.0 off end	# PCIe Bridge for discrete graphics
-		device pci 02.0 on  end	# Internal graphics VGA controller
+		device pci 02.0 on  end	# Internal graphics
 
 		chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
 			register "c2_latency" = "0x0065"
@@ -62,11 +62,11 @@ chip northbridge/intel/sandybridge
 			register "pcie_port_coalesce" = "1"
 			register "sata_interface_speed_support" = "0x3"
 			register "sata_port_map" = "0x33"
-			register "spi_lvscc" = "0x0"
 			register "spi_uvscc" = "0x2005"
+			register "spi_lvscc" = "0"
 			register "superspeed_capable_ports" = "0x0000000f"
 			register "xhci_overcurrent_mapping" = "0x00000c03"
-			register "xhci_switchable_ports" = "0x0000000f"
+			register "xhci_switchable_ports"    = "0x0000000f"
 
 			device pci 14.0 on  end	# USB 3.0 Controller
 			device pci 16.0 on  end	# Management Engine Interface 1
@@ -75,7 +75,7 @@ chip northbridge/intel/sandybridge
 			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 Audio controller
+			device pci 1b.0 on  end	# HD Audio controller
 			device pci 1c.0 on  end	# PCIe Port #1
 			device pci 1c.1 on  end	# PCIe Port #2, ExpressCard
 			device pci 1c.2 on  end	# PCIe Port #3, SD/MMC
@@ -86,14 +86,14 @@ chip northbridge/intel/sandybridge
 			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 PCI-LPC bridge
+			device pci 1f.0 on	# LPC bridge
 				chip ec/hp/kbc1126
 					register "ec_data_port" = "0x62"
-					register "ec_cmd_port" = "0x66"
-					register "ec_ctrl_reg" = "0x81"
+					register "ec_cmd_port"  = "0x66"
+					register "ec_ctrl_reg"  = "0x81"
 					register "ec_fan_ctrl_value" = "0x4d"
 					device pnp ff.1 off end
-				end # kbc1126
+				end
 			end
 			device pci 1f.2 on  end	# SATA Controller 1
 			device pci 1f.3 off end	# SMBus
diff --git a/src/mainboard/hp/2760p/devicetree.cb b/src/mainboard/hp/2760p/devicetree.cb
index f33d0160b7..c77367df92 100644
--- a/src/mainboard/hp/2760p/devicetree.cb
+++ b/src/mainboard/hp/2760p/devicetree.cb
@@ -45,9 +45,9 @@ chip northbridge/intel/sandybridge
 	device domain 0x0 on
 		subsystemid 0x103c 0x162a inherit
 
-		device pci 00.0 on  end	# Host bridge Host bridge
+		device pci 00.0 on  end	# Host bridge
 		device pci 01.0 off end	# PCIe Bridge for discrete graphics
-		device pci 02.0 on  end	# Internal graphics VGA controller
+		device pci 02.0 on  end	# Internal graphics
 
 		chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
 			register "c2_latency" = "0x0065"
@@ -71,7 +71,7 @@ chip northbridge/intel/sandybridge
 			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 Audio controller
+			device pci 1b.0 on  end	# HD Audio controller
 			device pci 1c.0 on  end	# PCIe Port #1
 			device pci 1c.1 on  end	# PCIe Port #2, ExpressCard
 			device pci 1c.2 on  end	# PCIe Port #3, SD/MMC
@@ -82,14 +82,14 @@ chip northbridge/intel/sandybridge
 			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 PCI-LPC bridge
+			device pci 1f.0 on	# LPC bridge
 				chip ec/hp/kbc1126
 					register "ec_data_port" = "0x60"
-					register "ec_cmd_port" = "0x64"
-					register "ec_ctrl_reg" = "0xca"
+					register "ec_cmd_port"  = "0x64"
+					register "ec_ctrl_reg"  = "0xca"
 					register "ec_fan_ctrl_value" = "0x4d"
 					device pnp ff.1 off end
-				end # kbc1126
+				end
 			end
 			device pci 1f.2 on  end	# SATA Controller 1
 			device pci 1f.3 off end	# SMBus
diff --git a/src/mainboard/hp/8460p/devicetree.cb b/src/mainboard/hp/8460p/devicetree.cb
index 972ee483b4..aeed664155 100644
--- a/src/mainboard/hp/8460p/devicetree.cb
+++ b/src/mainboard/hp/8460p/devicetree.cb
@@ -72,7 +72,7 @@ chip northbridge/intel/sandybridge
 			device pci 16.3 on  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 Audio controller
+			device pci 1b.0 on  end	# HD Audio controller
 			device pci 1c.0 on  end	# PCIe Port #1
 			device pci 1c.1 on  end	# PCIe Port #2, ExpressCard
 			device pci 1c.2 on  end	# PCIe Port #3, SD/MMC
@@ -83,27 +83,25 @@ chip northbridge/intel/sandybridge
 			device pci 1c.7 on  end	# PCIe Port #8, NEC USB 3.0 Host Controller
 			device pci 1d.0 on  end	# USB2 EHCI #1
 			device pci 1e.0 off end	# PCI bridge
-			device pci 1f.0 on	# LPC bridge PCI-LPC bridge
+			device pci 1f.0 on	# LPC bridge
 				chip ec/hp/kbc1126
 					register "ec_data_port" = "0x60"
-					register "ec_cmd_port" = "0x64"
-					register "ec_ctrl_reg" = "0xca"
+					register "ec_cmd_port"  = "0x64"
+					register "ec_ctrl_reg"  = "0xca"
 					register "ec_fan_ctrl_value" = "0x6b"
 					device pnp ff.1 off end
-				end # kbc1126
+				end
 				chip superio/smsc/lpc47n217
-					device pnp 4e.3 on #  Parallel
-						io 0x60 = 0x378
+					device pnp 4e.3 on	# Parallel
+						io  0x60  = 0x378
 						irq 0x70 = 7
 					end
-					device pnp 4e.4 on  #  Com1
-						io 0x60 = 0x3f8
+					device pnp 4e.4 on	# COM1
+						io  0x60  = 0x3f8
 						irq 0x70 = 4
 					end
-					device pnp 4e.5 off #  Com2
-					end
-				end	#chip superio/smsc/lpc47n217
-
+					device pnp 4e.5 off end	# COM2
+				end
 				chip drivers/pc80/tpm
 					device pnp 0c31.0 on end
 				end
diff --git a/src/mainboard/hp/8470p/devicetree.cb b/src/mainboard/hp/8470p/devicetree.cb
index afb254f4d6..ef32189c6e 100644
--- a/src/mainboard/hp/8470p/devicetree.cb
+++ b/src/mainboard/hp/8470p/devicetree.cb
@@ -47,7 +47,7 @@ chip northbridge/intel/sandybridge
 
 		device pci 00.0 on  end	# Host bridge
 		device pci 01.0 on  end	# PCIe Bridge for discrete graphics
-		device pci 02.0 on  end	# Internal graphics VGA controller
+		device pci 02.0 on  end	# Internal graphics
 
 		chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
 			register "c2_latency" = "0x0065"
@@ -63,11 +63,11 @@ chip northbridge/intel/sandybridge
 			register "sata_interface_speed_support" = "0x3"
 			# HDD(0), ODD(1), mSATA(2), eSATA(4)
 			register "sata_port_map" = "0x3f"
-			register "superspeed_capable_ports" = "0x0000000f"
-			register "xhci_overcurrent_mapping" = "0x00000c03"
-			register "xhci_switchable_ports" = "0x0000000f"
 			register "spi_uvscc" = "0x2005"
 			register "spi_lvscc" = "0"
+			register "superspeed_capable_ports" = "0x0000000f"
+			register "xhci_overcurrent_mapping" = "0x00000c03"
+			register "xhci_switchable_ports"    = "0x0000000f"
 
 			device pci 14.0 on  end	# USB 3.0 Controller
 			device pci 16.0 on  end	# Management Engine Interface 1
@@ -76,7 +76,7 @@ chip northbridge/intel/sandybridge
 			device pci 16.3 on  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 Audio controller
+			device pci 1b.0 on  end	# HD Audio controller
 			device pci 1c.0 on  end	# PCIe Port #1
 			device pci 1c.1 on  end	# PCIe Port #2, ExpressCard
 			device pci 1c.2 on  end	# PCIe Port #3, SD/MMC
@@ -87,26 +87,25 @@ chip northbridge/intel/sandybridge
 			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 PCI-LPC bridge
+			device pci 1f.0 on	# LPC bridge
 				chip ec/hp/kbc1126
 					register "ec_data_port" = "0x62"
-					register "ec_cmd_port" = "0x66"
-					register "ec_ctrl_reg" = "0x81"
+					register "ec_cmd_port"  = "0x66"
+					register "ec_ctrl_reg"  = "0x81"
 					register "ec_fan_ctrl_value" = "0x6b"
 					device pnp ff.1 off end
-				end # kbc1126
+				end
 				chip superio/smsc/lpc47n217
-					device pnp 4e.3 on #  Parallel
-						io 0x60 = 0x378
+					device pnp 4e.3 on	# Parallel
+						io  0x60 = 0x378
 						irq 0x70 = 7
 					end
-					device pnp 4e.4 on  #  Com1
-						io 0x60 = 0x3f8
+					device pnp 4e.4 on	# COM1
+						io  0x60 = 0x3f8
 						irq 0x70 = 4
 					end
-					device pnp 4e.5 off #  Com2
-					end
-				end	#chip superio/smsc/lpc47n217
+					device pnp 4e.5 off end	# COM2
+				end
 			end
 			device pci 1f.2 on  end	# SATA Controller 1
 			device pci 1f.3 off end	# SMBus
diff --git a/src/mainboard/hp/8770w/devicetree.cb b/src/mainboard/hp/8770w/devicetree.cb
index a9096c564a..91116c51c0 100644
--- a/src/mainboard/hp/8770w/devicetree.cb
+++ b/src/mainboard/hp/8770w/devicetree.cb
@@ -36,7 +36,7 @@ chip northbridge/intel/sandybridge
 			device pci 00.0 on  end	# GPU
 			device pci 00.1 on  end	# HDMI Audio on GPU
 		end
-		device pci 02.0 off end	# Internal graphics VGA controller
+		device pci 02.0 off end	# Internal graphics
 
 		chip southbridge/intel/bd82x6x # Intel Series 7 Panther Point PCH
 			register "c2_latency" = "0x0065"
@@ -51,11 +51,11 @@ chip northbridge/intel/sandybridge
 			register "pcie_port_coalesce" = "1"
 			register "sata_interface_speed_support" = "0x3"
 			register "sata_port_map" = "0x1f"
-			register "superspeed_capable_ports" = "0x0000000f"
-			register "xhci_overcurrent_mapping" = "0x00000c03"
-			register "xhci_switchable_ports" = "0x0000000f"
 			register "spi_uvscc" = "0x2005"
 			register "spi_lvscc" = "0"
+			register "superspeed_capable_ports" = "0x0000000f"
+			register "xhci_overcurrent_mapping" = "0x00000c03"
+			register "xhci_switchable_ports"    = "0x0000000f"
 
 			device pci 14.0 on  end	# USB 3.0 Controller
 			device pci 16.0 on  end	# Management Engine Interface 1
@@ -64,7 +64,7 @@ chip northbridge/intel/sandybridge
 			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 Audio controller
+			device pci 1b.0 on  end	# HD Audio controller
 			device pci 1c.0 on  end	# PCIe Port #1
 			device pci 1c.1 on  end	# PCIe Port #2
 			device pci 1c.2 on  end	# Media Card and FireWire host controller
@@ -75,26 +75,25 @@ chip northbridge/intel/sandybridge
 			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 PCI-LPC bridge
+			device pci 1f.0 on	# LPC bridge
 				chip ec/hp/kbc1126
 					register "ec_data_port" = "0x62"
-					register "ec_cmd_port" = "0x66"
-					register "ec_ctrl_reg" = "0x81"
+					register "ec_cmd_port"  = "0x66"
+					register "ec_ctrl_reg"  = "0x81"
 					register "ec_fan_ctrl_value" = "0x81"
 					device pnp ff.1 off end
-				end # kbc1126
+				end
 				chip superio/smsc/lpc47n217
-					device pnp 4e.3 on #  Parallel
-						io 0x60 = 0x378
+					device pnp 4e.3 on	# Parallel
+						io  0x60 = 0x378
 						irq 0x70 = 7
 					end
-					device pnp 4e.4 on  #  Com1
-						io 0x60 = 0x3f8
+					device pnp 4e.4 on	# COM1
+						io  0x60 = 0x3f8
 						irq 0x70 = 4
 					end
-					device pnp 4e.5 off #  Com2
-					end
-				end	#chip superio/smsc/lpc47n217
+					device pnp 4e.5 off end	# COM2
+				end
 			end
 			device pci 1f.2 on  end	# SATA Controller 1
 			device pci 1f.3 off end	# SMBus
diff --git a/src/mainboard/hp/folio_9470m/devicetree.cb b/src/mainboard/hp/folio_9470m/devicetree.cb
index b3299e843c..13a12b6f2b 100644
--- a/src/mainboard/hp/folio_9470m/devicetree.cb
+++ b/src/mainboard/hp/folio_9470m/devicetree.cb
@@ -31,7 +31,7 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 	register "gpu_panel_power_up_delay" = "300"
 	register "gpu_pch_backlight" = "0x0d9c0d9c"
 	device cpu_cluster 0x0 on
-		chip cpu/intel/model_206ax # FIXME: check all registers
+		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
@@ -45,9 +45,9 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 	device domain 0x0 on
 		subsystemid 0x103c 0x18df inherit
 
-		device pci 00.0 on  end	# Host bridge Host bridge
+		device pci 00.0 on  end	# Host bridge
 		device pci 01.0 off end	# PCIe Bridge for discrete graphics
-		device pci 02.0 on  end	# Internal graphics VGA controller
+		device pci 02.0 on  end	# Internal graphics
 
 		chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
 			register "c2_latency" = "0x0065"
@@ -62,11 +62,11 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 			register "pcie_port_coalesce" = "1"
 			register "sata_interface_speed_support" = "0x3"
 			register "sata_port_map" = "0x3"
-			register "spi_lvscc" = "0x0"
 			register "spi_uvscc" = "0x2005"
+			register "spi_lvscc" = "0"
 			register "superspeed_capable_ports" = "0x0000000f"
 			register "xhci_overcurrent_mapping" = "0x00000c03"
-			register "xhci_switchable_ports" = "0x0000000f"
+			register "xhci_switchable_ports"    = "0x0000000f"
 
 			device pci 14.0 on  end	# USB 3.0 Controller
 			device pci 16.0 off end	# Management Engine Interface 1
@@ -75,7 +75,7 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 			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 Audio controller
+			device pci 1b.0 on  end	# HD Audio controller
 			device pci 1c.0 on  end	# PCIe Port #1
 			device pci 1c.1 off end	# PCIe Port #2
 			device pci 1c.2 on  end	# PCIe Port #3 SDHCI
@@ -86,15 +86,14 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 			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 PCI-LPC bridge
+			device pci 1f.0 on	# LPC bridge
 				chip ec/hp/kbc1126
 					register "ec_data_port" = "0x62"
-					register "ec_cmd_port" = "0x66"
-					register "ec_ctrl_reg" = "0x81"
+					register "ec_cmd_port"  = "0x66"
+					register "ec_ctrl_reg"  = "0x81"
 					register "ec_fan_ctrl_value" = "0x44"
 					device pnp ff.1 off end
-				end # kbc1126
-
+				end
 				chip drivers/pc80/tpm
 					device pnp 0c31.0 on end
 				end
diff --git a/src/mainboard/hp/revolve_810_g1/devicetree.cb b/src/mainboard/hp/revolve_810_g1/devicetree.cb
index 1866a1eae0..129de70284 100644
--- a/src/mainboard/hp/revolve_810_g1/devicetree.cb
+++ b/src/mainboard/hp/revolve_810_g1/devicetree.cb
@@ -31,7 +31,7 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 	register "gpu_panel_power_up_delay" = "300"
 	register "gpu_pch_backlight" = "0x02880288"
 	device cpu_cluster 0x0 on
-		chip cpu/intel/model_206ax # FIXME: check all registers
+		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
@@ -45,9 +45,9 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 	device domain 0x0 on
 		subsystemid 0x103c 0x18f8 inherit
 
-		device pci 00.0 on  end	# Host bridge Host bridge
+		device pci 00.0 on  end	# Host bridge
 		device pci 01.0 off end	# PCIe Bridge for discrete graphics
-		device pci 02.0 on  end	# Internal graphics VGA controller
+		device pci 02.0 on  end	# Internal graphics
 
 		chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
 			register "c2_latency" = "0x0065"
@@ -62,11 +62,11 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 			register "pcie_port_coalesce" = "1"
 			register "sata_interface_speed_support" = "0x3"
 			register "sata_port_map" = "0x1"
-			register "spi_lvscc" = "0x0"
 			register "spi_uvscc" = "0x2005"
+			register "spi_lvscc" = "0"
 			register "superspeed_capable_ports" = "0x0000000f"
 			register "xhci_overcurrent_mapping" = "0x00000c03"
-			register "xhci_switchable_ports" = "0x0000000f"
+			register "xhci_switchable_ports"    = "0x0000000f"
 
 			device pci 14.0 on  end	# USB 3.0 Controller
 			device pci 16.0 off end	# Management Engine Interface 1
@@ -75,7 +75,7 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 			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 Audio controller
+			device pci 1b.0 on  end	# HD Audio controller
 			device pci 1c.0 on  end	# PCIe Port #1
 			device pci 1c.1 off end	# PCIe Port #2
 			device pci 1c.2 on  end	# PCIe Port #3
@@ -86,15 +86,14 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 			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 PCI-LPC bridge
+			device pci 1f.0 on	# LPC bridge
 				chip ec/hp/kbc1126
 					register "ec_data_port" = "0x62"
-					register "ec_cmd_port" = "0x66"
-					register "ec_ctrl_reg" = "0x81"
+					register "ec_cmd_port"  = "0x66"
+					register "ec_ctrl_reg"  = "0x81"
 					register "ec_fan_ctrl_value" = "0x70"
 					device pnp ff.1 off end
-				end # kbc1126
-
+				end
 				chip drivers/pc80/tpm
 					device pnp 0c31.0 on end
 				end