mb/*/*/devicetree.cb: Make sandybridge devicetree uniform

This is a merely cosmetic change.

Change-Id: If36419fbee9628b591116604bf32fe00a4f08c17
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/31030
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Tristan Corrick <tristan@corrick.kiwi>

40 files changed, 58 insertions, 94 deletions

diff --git a/src/mainboard/apple/macbookair4_2/devicetree.cb b/src/mainboard/apple/macbookair4_2/devicetree.cb
index 226ec04004..287b8c0c72 100644
--- a/src/mainboard/apple/macbookair4_2/devicetree.cb
+++ b/src/mainboard/apple/macbookair4_2/devicetree.cb
@@ -16,8 +16,7 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x13121312"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -26,8 +25,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 
diff --git a/src/mainboard/asrock/b75pro3-m/devicetree.cb b/src/mainboard/asrock/b75pro3-m/devicetree.cb
index def3d1dbd9..d209843ea0 100644
--- a/src/mainboard/asrock/b75pro3-m/devicetree.cb
+++ b/src/mainboard/asrock/b75pro3-m/devicetree.cb
@@ -32,8 +32,7 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x00000000"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -42,8 +41,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/asus/p8h61-m_pro/devicetree.cb b/src/mainboard/asus/p8h61-m_pro/devicetree.cb
index 04dc68b3e8..fb12153757 100644
--- a/src/mainboard/asus/p8h61-m_pro/devicetree.cb
+++ b/src/mainboard/asus/p8h61-m_pro/devicetree.cb
@@ -18,8 +18,7 @@ chip northbridge/intel/sandybridge
 	register "gfx.ndid" = "3"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_LGA1155
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -28,8 +27,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	register "pci_mmio_size" = "2048"
diff --git a/src/mainboard/compulab/intense_pc/devicetree.cb b/src/mainboard/compulab/intense_pc/devicetree.cb
index 6d01892d57..dfd2e69e2d 100644
--- a/src/mainboard/compulab/intense_pc/devicetree.cb
+++ b/src/mainboard/compulab/intense_pc/devicetree.cb
@@ -29,8 +29,7 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 	register "gpu_pch_backlight" = "0x00000000"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_FCBGA1023
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax # FIXME: check all registers
 			register "c1_acpower" = "1"
@@ -39,8 +38,7 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
index b0c58f9b33..2091346a17 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
@@ -15,7 +15,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_battery" = "5"
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 		end
 	end
 
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb b/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb
index d7153f4447..61c342a040 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb
@@ -14,7 +14,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_battery" = "5"
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 		end
 	end
 
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb b/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb
index 7ff7fbea09..bca7381159 100644
--- a/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb
@@ -18,8 +18,7 @@ chip northbridge/intel/sandybridge
 	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_LGA1155
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -28,8 +27,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	register "pci_mmio_size" = "2048"
diff --git a/src/mainboard/google/butterfly/devicetree.cb b/src/mainboard/google/butterfly/devicetree.cb
index 8f88c24fdb..b54ca9a785 100644
--- a/src/mainboard/google/butterfly/devicetree.cb
+++ b/src/mainboard/google/butterfly/devicetree.cb
@@ -27,7 +27,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/google/link/devicetree.cb b/src/mainboard/google/link/devicetree.cb
index 07be8e7c26..c3b93f0206 100644
--- a/src/mainboard/google/link/devicetree.cb
+++ b/src/mainboard/google/link/devicetree.cb
@@ -26,7 +26,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/google/parrot/devicetree.cb b/src/mainboard/google/parrot/devicetree.cb
index afc04a8eeb..e6c8a06da7 100644
--- a/src/mainboard/google/parrot/devicetree.cb
+++ b/src/mainboard/google/parrot/devicetree.cb
@@ -26,7 +26,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/google/stout/devicetree.cb b/src/mainboard/google/stout/devicetree.cb
index 0fdb55ebdb..31407820a1 100644
--- a/src/mainboard/google/stout/devicetree.cb
+++ b/src/mainboard/google/stout/devicetree.cb
@@ -28,7 +28,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "tcc_offset" = "5"	# TCC of 95C
 
diff --git a/src/mainboard/hp/2570p/devicetree.cb b/src/mainboard/hp/2570p/devicetree.cb
index 753d28661f..e1f0cca01d 100644
--- a/src/mainboard/hp/2570p/devicetree.cb
+++ b/src/mainboard/hp/2570p/devicetree.cb
@@ -32,8 +32,7 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x0d9c0d9c"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -42,8 +41,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/hp/2760p/devicetree.cb b/src/mainboard/hp/2760p/devicetree.cb
index 041b5e8f42..15f8943318 100644
--- a/src/mainboard/hp/2760p/devicetree.cb
+++ b/src/mainboard/hp/2760p/devicetree.cb
@@ -32,8 +32,7 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x02880288"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -42,8 +41,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/hp/8460p/devicetree.cb b/src/mainboard/hp/8460p/devicetree.cb
index 9f9efbb627..2964cc8166 100644
--- a/src/mainboard/hp/8460p/devicetree.cb
+++ b/src/mainboard/hp/8460p/devicetree.cb
@@ -32,8 +32,7 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x02880288"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -42,8 +41,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/hp/8470p/devicetree.cb b/src/mainboard/hp/8470p/devicetree.cb
index 9d6fe3ff23..cf55d888a1 100644
--- a/src/mainboard/hp/8470p/devicetree.cb
+++ b/src/mainboard/hp/8470p/devicetree.cb
@@ -32,8 +32,7 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x0d9c0d9c"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -42,8 +41,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/hp/8770w/devicetree.cb b/src/mainboard/hp/8770w/devicetree.cb
index 0487cf36e3..eb9ae22592 100644
--- a/src/mainboard/hp/8770w/devicetree.cb
+++ b/src/mainboard/hp/8770w/devicetree.cb
@@ -18,8 +18,7 @@
 chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -28,8 +27,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
index 61bf43c2ec..9d79a08a21 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
+++ b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
@@ -25,8 +25,7 @@ chip northbridge/intel/sandybridge
 
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_LGA1155
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -35,8 +34,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 
diff --git a/src/mainboard/hp/folio_9470m/devicetree.cb b/src/mainboard/hp/folio_9470m/devicetree.cb
index 56d90d38df..fd81a0d542 100644
--- a/src/mainboard/hp/folio_9470m/devicetree.cb
+++ b/src/mainboard/hp/folio_9470m/devicetree.cb
@@ -32,8 +32,7 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 	register "gpu_pch_backlight" = "0x0d9c0d9c"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax # FIXME: check all registers
 			register "c1_acpower" = "1"
@@ -42,8 +41,7 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/hp/revolve_810_g1/devicetree.cb b/src/mainboard/hp/revolve_810_g1/devicetree.cb
index 2384e71c2e..1ee64f4176 100644
--- a/src/mainboard/hp/revolve_810_g1/devicetree.cb
+++ b/src/mainboard/hp/revolve_810_g1/devicetree.cb
@@ -32,8 +32,7 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 	register "gpu_pch_backlight" = "0x02880288"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax # FIXME: check all registers
 			register "c1_acpower" = "1"
@@ -42,8 +41,7 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/intel/dcp847ske/devicetree.cb b/src/mainboard/intel/dcp847ske/devicetree.cb
index 4ff27fdd54..342e1167d1 100644
--- a/src/mainboard/intel/dcp847ske/devicetree.cb
+++ b/src/mainboard/intel/dcp847ske/devicetree.cb
@@ -18,7 +18,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_battery" = "1"
 			register "c2_battery" = "3"
diff --git a/src/mainboard/intel/emeraldlake2/devicetree.cb b/src/mainboard/intel/emeraldlake2/devicetree.cb
index 0b3e7888d6..ebfc055eba 100644
--- a/src/mainboard/intel/emeraldlake2/devicetree.cb
+++ b/src/mainboard/intel/emeraldlake2/devicetree.cb
@@ -18,7 +18,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_battery" = "3"	# ACPI(C1) = MWAIT(C3)
 			register "c2_battery" = "4"	# ACPI(C2) = MWAIT(C6)
diff --git a/src/mainboard/kontron/ktqm77/devicetree.cb b/src/mainboard/kontron/ktqm77/devicetree.cb
index ff5d012be4..204fbd354d 100644
--- a/src/mainboard/kontron/ktqm77/devicetree.cb
+++ b/src/mainboard/kontron/ktqm77/devicetree.cb
@@ -9,7 +9,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "4"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/lenovo/l520/devicetree.cb b/src/mainboard/lenovo/l520/devicetree.cb
index 3e1f30852f..f737b181f4 100644
--- a/src/mainboard/lenovo/l520/devicetree.cb
+++ b/src/mainboard/lenovo/l520/devicetree.cb
@@ -17,8 +17,7 @@ chip northbridge/intel/sandybridge
 
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -27,8 +26,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 
diff --git a/src/mainboard/lenovo/s230u/devicetree.cb b/src/mainboard/lenovo/s230u/devicetree.cb
index 35135a91c6..1fe1f05164 100644
--- a/src/mainboard/lenovo/s230u/devicetree.cb
+++ b/src/mainboard/lenovo/s230u/devicetree.cb
@@ -16,8 +16,7 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x041e041e"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -26,8 +25,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/lenovo/t420/devicetree.cb b/src/mainboard/lenovo/t420/devicetree.cb
index bed406a3db..a69bb7e9dc 100644
--- a/src/mainboard/lenovo/t420/devicetree.cb
+++ b/src/mainboard/lenovo/t420/devicetree.cb
@@ -24,7 +24,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/lenovo/t420s/devicetree.cb b/src/mainboard/lenovo/t420s/devicetree.cb
index a090308c8c..9f557b4c8b 100644
--- a/src/mainboard/lenovo/t420s/devicetree.cb
+++ b/src/mainboard/lenovo/t420s/devicetree.cb
@@ -23,7 +23,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/lenovo/t430/devicetree.cb b/src/mainboard/lenovo/t430/devicetree.cb
index 5eb92bc861..72425f8249 100644
--- a/src/mainboard/lenovo/t430/devicetree.cb
+++ b/src/mainboard/lenovo/t430/devicetree.cb
@@ -19,8 +19,7 @@ chip northbridge/intel/sandybridge
 
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax # FIXME: check all registers
 			register "c1_acpower" = "1"
@@ -29,8 +28,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 
diff --git a/src/mainboard/lenovo/t430s/devicetree.cb b/src/mainboard/lenovo/t430s/devicetree.cb
index 56e7f63e11..10c6e4adfc 100644
--- a/src/mainboard/lenovo/t430s/devicetree.cb
+++ b/src/mainboard/lenovo/t430s/devicetree.cb
@@ -23,7 +23,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/lenovo/t520/variants/t520/devicetree.cb b/src/mainboard/lenovo/t520/variants/t520/devicetree.cb
index 97350f3c27..553c14dec3 100644
--- a/src/mainboard/lenovo/t520/variants/t520/devicetree.cb
+++ b/src/mainboard/lenovo/t520/variants/t520/devicetree.cb
@@ -24,7 +24,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/lenovo/t520/variants/w520/devicetree.cb b/src/mainboard/lenovo/t520/variants/w520/devicetree.cb
index 33b9368f50..1c41b56870 100644
--- a/src/mainboard/lenovo/t520/variants/w520/devicetree.cb
+++ b/src/mainboard/lenovo/t520/variants/w520/devicetree.cb
@@ -24,7 +24,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/lenovo/t530/variants/t530/devicetree.cb b/src/mainboard/lenovo/t530/variants/t530/devicetree.cb
index 4dcdc9d9d5..4114b3848c 100644
--- a/src/mainboard/lenovo/t530/variants/t530/devicetree.cb
+++ b/src/mainboard/lenovo/t530/variants/t530/devicetree.cb
@@ -24,7 +24,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/lenovo/t530/variants/w530/devicetree.cb b/src/mainboard/lenovo/t530/variants/w530/devicetree.cb
index 7a72b26213..85add34496 100644
--- a/src/mainboard/lenovo/t530/variants/w530/devicetree.cb
+++ b/src/mainboard/lenovo/t530/variants/w530/devicetree.cb
@@ -23,8 +23,7 @@ chip northbridge/intel/sandybridge
 
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax # FIXME: check all registers
 			register "c1_acpower" = "1"
@@ -33,8 +32,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb b/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb
index cb88a7f728..75c49ad1f3 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb
+++ b/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb
@@ -21,7 +21,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/lenovo/x220/devicetree.cb b/src/mainboard/lenovo/x220/devicetree.cb
index 2a1507cd9a..74d969f80d 100644
--- a/src/mainboard/lenovo/x220/devicetree.cb
+++ b/src/mainboard/lenovo/x220/devicetree.cb
@@ -24,7 +24,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/lenovo/x230/devicetree.cb b/src/mainboard/lenovo/x230/devicetree.cb
index a31be72b16..cab0368565 100644
--- a/src/mainboard/lenovo/x230/devicetree.cb
+++ b/src/mainboard/lenovo/x230/devicetree.cb
@@ -24,7 +24,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
index 4455fdba41..d4a37c1cf7 100644
--- a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
+++ b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
@@ -36,7 +36,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "4"	# ACPI(C2) = MWAIT(C6)
diff --git a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
index b51c86efe2..d7abde8557 100644
--- a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
+++ b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
@@ -36,7 +36,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "4"	# ACPI(C2) = MWAIT(C6)
diff --git a/src/mainboard/samsung/lumpy/devicetree.cb b/src/mainboard/samsung/lumpy/devicetree.cb
index b34d024d4d..ee8df2a494 100644
--- a/src/mainboard/samsung/lumpy/devicetree.cb
+++ b/src/mainboard/samsung/lumpy/devicetree.cb
@@ -26,7 +26,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/samsung/stumpy/devicetree.cb b/src/mainboard/samsung/stumpy/devicetree.cb
index 825dfa0d2c..43a014fe75 100644
--- a/src/mainboard/samsung/stumpy/devicetree.cb
+++ b/src/mainboard/samsung/stumpy/devicetree.cb
@@ -20,7 +20,7 @@ chip northbridge/intel/sandybridge
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_battery" = "3"	# ACPI(C1) = MWAIT(C3)
 			register "c2_battery" = "4"	# ACPI(C2) = MWAIT(C6)
diff --git a/src/mainboard/sapphire/pureplatinumh61/devicetree.cb b/src/mainboard/sapphire/pureplatinumh61/devicetree.cb
index ed0d997dba..f8cd3b2118 100644
--- a/src/mainboard/sapphire/pureplatinumh61/devicetree.cb
+++ b/src/mainboard/sapphire/pureplatinumh61/devicetree.cb
@@ -32,8 +32,7 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x00000000"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_LGA1155
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -42,8 +41,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on