nb/intel/sandybridge: Add a chipset devicetree

This only moves CPU configuration to a common place. Other PCI devices
can be done in follow-ups.

Change-Id: I9c5b6f25b779e28b6719cf70455ff0f1a916ad87
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/56912
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

43 files changed, 25 insertions, 367 deletions

diff --git a/src/mainboard/apple/macbookair4_2/devicetree.cb b/src/mainboard/apple/macbookair4_2/devicetree.cb
index 6ea033ec32ec..df2f15471233 100644
--- a/src/mainboard/apple/macbookair4_2/devicetree.cb
+++ b/src/mainboard/apple/macbookair4_2/devicetree.cb
@@ -13,15 +13,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_panel_power_down_delay" = "500"
 	register "gpu_panel_power_up_delay" = "2000"
 	register "gpu_pch_backlight" = "0x13121312"
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			device lapic 0 on end
-			device lapic 0xacac off end
-		end
-	end
 
 	device domain 0 on
 		chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH
diff --git a/src/mainboard/asrock/b75pro3-m/devicetree.cb b/src/mainboard/asrock/b75pro3-m/devicetree.cb
index 0f7d0a87d574..f45418fe75fe 100644
--- a/src/mainboard/asrock/b75pro3-m/devicetree.cb
+++ b/src/mainboard/asrock/b75pro3-m/devicetree.cb
@@ -13,15 +13,7 @@ chip northbridge/intel/sandybridge
 	register "gpu_panel_power_down_delay" = "0"
 	register "gpu_panel_power_up_delay" = "0"
 	register "gpu_pch_backlight" = "0x00000000"
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			device lapic 0 on end
-			device lapic 0xacac off end
-		end
-	end
+
 	device domain 0 on
 		device pci 00.0 on
 			subsystemid 0x1849 0x0150
diff --git a/src/mainboard/asrock/h77pro4-m/devicetree.cb b/src/mainboard/asrock/h77pro4-m/devicetree.cb
index 86468c1e542a..7d94706faa41 100644
--- a/src/mainboard/asrock/h77pro4-m/devicetree.cb
+++ b/src/mainboard/asrock/h77pro4-m/devicetree.cb
@@ -1,15 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 chip northbridge/intel/sandybridge
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			device lapic 0 on end
-			device lapic 0xacac off end
-		end
-	end
 	device domain 0 on
 		device pci 00.0 on # Host bridge
 			subsystemid 0x1849 0x0100
diff --git a/src/mainboard/asus/h61-series/devicetree.cb b/src/mainboard/asus/h61-series/devicetree.cb
index 32f0cd4d5999..abed76a8d4a6 100644
--- a/src/mainboard/asus/h61-series/devicetree.cb
+++ b/src/mainboard/asus/h61-series/devicetree.cb
@@ -1,15 +1,6 @@
 ## SPDX-License-Identifier: GPL-2.0-or-later
 
 chip northbridge/intel/sandybridge
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			device lapic 0 on end
-			device lapic 0xacac off end
-		end
-	end
 	device domain 0 on
 		device pci 00.0 on end		# Host bridge
 		device pci 01.0 on end		# PEG
diff --git a/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb b/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb
index ca09d2f68566..41fc4dc38019 100644
--- a/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb
+++ b/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb
@@ -1,16 +1,6 @@
 ## SPDX-License-Identifier: GPL-2.0-or-later
 
 chip northbridge/intel/sandybridge
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			device lapic 0 on end
-			device lapic 0xacac off end
-		end
-	end
-
 	device domain 0 on
 		subsystemid 0x1043 0x844d inherit
 
diff --git a/src/mainboard/asus/p8x7x-series/devicetree.cb b/src/mainboard/asus/p8x7x-series/devicetree.cb
index 9710118ed75b..75566d125e1f 100644
--- a/src/mainboard/asus/p8x7x-series/devicetree.cb
+++ b/src/mainboard/asus/p8x7x-series/devicetree.cb
@@ -1,15 +1,6 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
 chip northbridge/intel/sandybridge
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			device lapic 0 on end
-			device lapic 0xacac off end
-		end
-	end
 	device domain 0 on
 		device pci 00.0 on  end		# Host bridge
 		device pci 01.0 on  end		# PCIEX16_1
diff --git a/src/mainboard/biostar/th61-itx/devicetree.cb b/src/mainboard/biostar/th61-itx/devicetree.cb
index 35c3ae34d38e..5999a1d97694 100644
--- a/src/mainboard/biostar/th61-itx/devicetree.cb
+++ b/src/mainboard/biostar/th61-itx/devicetree.cb
@@ -1,15 +1,6 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
 chip northbridge/intel/sandybridge
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			device lapic 0 on	end
-			device lapic 0xacac off	end
-		end
-	end
 	device domain 0 on
 		subsystemid 0x1565 0x3108 inherit
 
diff --git a/src/mainboard/compulab/intense_pc/devicetree.cb b/src/mainboard/compulab/intense_pc/devicetree.cb
index 697961595308..1ce2341732bb 100644
--- a/src/mainboard/compulab/intense_pc/devicetree.cb
+++ b/src/mainboard/compulab/intense_pc/devicetree.cb
@@ -6,15 +6,6 @@ chip northbridge/intel/sandybridge # FIXME: check gfx
 	register "gpu_dp_c_hotplug" = "4"
 	register "gpu_dp_d_hotplug" = "4"
 
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax # FIXME: check all registers
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			device lapic 0 on end
-			device lapic 0xacac off end
-		end
-	end
 	device domain 0 on
 		device pci 00.0 on	# Host bridge
 			subsystemid 0x8086 0x2010
diff --git a/src/mainboard/dell/snb_ivb_workstations/variants/baseboard/devicetree.cb b/src/mainboard/dell/snb_ivb_workstations/variants/baseboard/devicetree.cb
index e614f1e52319..8f943782af84 100644
--- a/src/mainboard/dell/snb_ivb_workstations/variants/baseboard/devicetree.cb
+++ b/src/mainboard/dell/snb_ivb_workstations/variants/baseboard/devicetree.cb
@@ -1,9 +1,6 @@
 chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
 			register "tcc_offset" = "5" # TCC of 95C
 			device lapic 0 on end
 			device lapic 0xacac off end
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
index 7ca9a8b15eea..d7263c825d81 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
@@ -1,16 +1,4 @@
 chip northbridge/intel/sandybridge
-
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			# Magic APIC ID to locate this chip
-			device lapic 0 on end
-			device lapic 0xacac off end
-		end
-	end
-
 	device domain 0 on
 		subsystemid 0x1458 0x5000 inherit
 		device pci 00.0 on	# Host bridge
diff --git a/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb b/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb
index 3f0720288249..299c134af16b 100644
--- a/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb
@@ -1,15 +1,6 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
 chip northbridge/intel/sandybridge
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			device lapic 0 on	end
-			device lapic 0xacac off	end
-		end
-	end
 	device domain 0 on
 		subsystemid 0x1458 0x5000 inherit
 
diff --git a/src/mainboard/google/butterfly/devicetree.cb b/src/mainboard/google/butterfly/devicetree.cb
index c79526e3c9b9..5ff7f9da9889 100644
--- a/src/mainboard/google/butterfly/devicetree.cb
+++ b/src/mainboard/google/butterfly/devicetree.cb
@@ -20,18 +20,6 @@ chip northbridge/intel/sandybridge
 
 	register "max_mem_clock_mhz" = "666"			# DDR3-1333
 
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			# Magic APIC ID to locate this chip
-			device lapic 0 on end
-			device lapic 0xacac off end
-
-			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
-		end
-	end
-
 	device domain 0 on
 		device pci 00.0 on end # host bridge
 		device pci 01.0 off end # PCIe Bridge for discrete graphics
diff --git a/src/mainboard/google/link/devicetree.cb b/src/mainboard/google/link/devicetree.cb
index 49c34765c8de..411618826f25 100644
--- a/src/mainboard/google/link/devicetree.cb
+++ b/src/mainboard/google/link/devicetree.cb
@@ -19,18 +19,6 @@ chip northbridge/intel/sandybridge
 
 	register "max_mem_clock_mhz" = "666"
 
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			# Magic APIC ID to locate this chip
-			device lapic 0 on end
-			device lapic 0xacac off end
-
-			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
-		end
-	end
-
 	device domain 0 on
 		subsystemid 0x1ae0 0xc000 inherit
 		device pci 00.0 on end # host bridge
diff --git a/src/mainboard/google/parrot/devicetree.cb b/src/mainboard/google/parrot/devicetree.cb
index 6850cf2c6db3..7c1cc8184d06 100644
--- a/src/mainboard/google/parrot/devicetree.cb
+++ b/src/mainboard/google/parrot/devicetree.cb
@@ -19,18 +19,6 @@ chip northbridge/intel/sandybridge
 
 	register "max_mem_clock_mhz" = "666"
 
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			# Magic APIC ID to locate this chip
-			device lapic 0 on end
-			device lapic 0xacac off end
-
-			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
-		end
-	end
-
 	device domain 0 on
 		device pci 00.0 on end # host bridge
 		device pci 02.0 on end # vga controller
diff --git a/src/mainboard/google/stout/devicetree.cb b/src/mainboard/google/stout/devicetree.cb
index b38adaf14809..77f58c2cad19 100644
--- a/src/mainboard/google/stout/devicetree.cb
+++ b/src/mainboard/google/stout/devicetree.cb
@@ -26,10 +26,6 @@ chip northbridge/intel/sandybridge
 			device lapic 0xacac off end
 
 			register "tcc_offset" = "5"	# TCC of 95C
-
-			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
index 98e48efeef6f..ce100b4c94dd 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
+++ b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
@@ -6,16 +6,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_dp_c_hotplug" = "0"
 	register "gpu_dp_d_hotplug" = "0"
 
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			device lapic 0 on end
-			device lapic 0xacac off end
-		end
-	end
-
 	device domain 0 on
 		subsystemid 0x103c 0x1495 inherit
 
diff --git a/src/mainboard/hp/snb_ivb_laptops/devicetree.cb b/src/mainboard/hp/snb_ivb_laptops/devicetree.cb
index 2bfbacdc15b2..a4d723fe4e8c 100644
--- a/src/mainboard/hp/snb_ivb_laptops/devicetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/devicetree.cb
@@ -15,15 +15,7 @@ chip northbridge/intel/sandybridge
 	register "gpu_panel_power_down_delay" = "230"
 	register "gpu_panel_power_up_delay" = "300"
 	register "gpu_pch_backlight" = "0x02880288"
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			device lapic 0 on end
-			device lapic 0xacac off end
-		end
-	end
+
 	device domain 0 on
 
 		device pci 00.0 on  end	# Host bridge
diff --git a/src/mainboard/hp/z220_series/devicetree.cb b/src/mainboard/hp/z220_series/devicetree.cb
index bcacf7156e7d..6794b6284f78 100644
--- a/src/mainboard/hp/z220_series/devicetree.cb
+++ b/src/mainboard/hp/z220_series/devicetree.cb
@@ -6,16 +6,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_dp_c_hotplug" = "0"
 	register "gpu_dp_d_hotplug" = "0"
 
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			device lapic 0 on end
-			device lapic 0xacac off end
-		end
-	end
-
 	device domain 0 on
 		subsystemid 0x103c 0x1791 inherit
 
diff --git a/src/mainboard/intel/dcp847ske/devicetree.cb b/src/mainboard/intel/dcp847ske/devicetree.cb
index f7821d0e98be..5400af773dff 100644
--- a/src/mainboard/intel/dcp847ske/devicetree.cb
+++ b/src/mainboard/intel/dcp847ske/devicetree.cb
@@ -11,17 +11,6 @@ chip northbridge/intel/sandybridge
 	# Enable DVI Hotplug with 6ms pulse
 	register "gpu_dp_b_hotplug" = "0x06"
 
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			# Magic APIC ID to locate this chip
-			device lapic 0 on end
-			device lapic 0xacac off end
-
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-		end
-	end
 	device domain 0 on
 		device pci 00.0 on  end	# Host bridge
 		device pci 01.0 off end	# PCIe Bridge for discrete graphics
diff --git a/src/mainboard/intel/emeraldlake2/devicetree.cb b/src/mainboard/intel/emeraldlake2/devicetree.cb
index 170dbaad94ff..9255848b2a06 100644
--- a/src/mainboard/intel/emeraldlake2/devicetree.cb
+++ b/src/mainboard/intel/emeraldlake2/devicetree.cb
@@ -19,7 +19,6 @@ chip northbridge/intel/sandybridge
 
 			register "acpi_c1" = "3"	# ACPI(C1) = MWAIT(C3)
 			register "acpi_c2" = "4"	# ACPI(C2) = MWAIT(C6)
-			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 
diff --git a/src/mainboard/kontron/ktqm77/devicetree.cb b/src/mainboard/kontron/ktqm77/devicetree.cb
index 31bee5d21f04..1bbbbfc32d68 100644
--- a/src/mainboard/kontron/ktqm77/devicetree.cb
+++ b/src/mainboard/kontron/ktqm77/devicetree.cb
@@ -8,7 +8,6 @@ chip northbridge/intel/sandybridge
 			device lapic 0 on end
 			device lapic 0xacac off end
 
-			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "acpi_c2" = "4"	# ACPI(C2) = MWAIT(C3)
 			register "acpi_c3" = "0"	# ACPI(C3) = MWAIT(C7)
 		end
diff --git a/src/mainboard/lenovo/l520/devicetree.cb b/src/mainboard/lenovo/l520/devicetree.cb
index 6c2dabeabb79..9e56e7910ceb 100644
--- a/src/mainboard/lenovo/l520/devicetree.cb
+++ b/src/mainboard/lenovo/l520/devicetree.cb
@@ -12,16 +12,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_panel_power_up_delay" = "0"
 	register "gpu_pch_backlight" = "0x00000000"
 
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			device lapic 0 on end
-			device lapic 0xacac off end
-		end
-	end
-
 	device domain 0 on
 		subsystemid 0x17aa 0x21dd inherit
 
diff --git a/src/mainboard/lenovo/s230u/devicetree.cb b/src/mainboard/lenovo/s230u/devicetree.cb
index f7d65ca230b6..16e100496a7a 100644
--- a/src/mainboard/lenovo/s230u/devicetree.cb
+++ b/src/mainboard/lenovo/s230u/devicetree.cb
@@ -11,15 +11,7 @@ chip northbridge/intel/sandybridge
 	register "gpu_panel_power_down_delay" = "500"
 	register "gpu_panel_power_up_delay" = "600"
 	register "gpu_pch_backlight" = "0x041e041e"
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			device lapic 0 on end
-			device lapic 0xacac off end
-		end
-	end
+
 	device domain 0 on
 		subsystemid 0x17aa 0x2205 inherit
 
diff --git a/src/mainboard/lenovo/t420/devicetree.cb b/src/mainboard/lenovo/t420/devicetree.cb
index c934f5fe068a..b764a8320ba2 100644
--- a/src/mainboard/lenovo/t420/devicetree.cb
+++ b/src/mainboard/lenovo/t420/devicetree.cb
@@ -15,18 +15,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_cpu_backlight" = "0x1155"
 	register "gpu_pch_backlight" = "0x06100610"
 
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			# Magic APIC ID to locate this chip
-			device lapic 0 on end
-			device lapic 0xacac off end
-
-			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
-		end
-	end
-
 	device domain 0 on
 		subsystemid 0x17aa 0x21ce inherit
 
diff --git a/src/mainboard/lenovo/t420s/devicetree.cb b/src/mainboard/lenovo/t420s/devicetree.cb
index 1d6adaf3a8cc..92c90854d3b1 100644
--- a/src/mainboard/lenovo/t420s/devicetree.cb
+++ b/src/mainboard/lenovo/t420s/devicetree.cb
@@ -15,18 +15,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_cpu_backlight" = "0x1155"
 	register "gpu_pch_backlight" = "0x06100610"
 
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			# Magic APIC ID to locate this chip
-			device lapic 0 on end
-			device lapic 0xacac off end
-
-			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
-		end
-	end
-
 	device domain 0 on
 		subsystemid 0x17aa 0x21d2 inherit
 
diff --git a/src/mainboard/lenovo/t430/devicetree.cb b/src/mainboard/lenovo/t430/devicetree.cb
index 141faa930c7b..8b15c84bce25 100644
--- a/src/mainboard/lenovo/t430/devicetree.cb
+++ b/src/mainboard/lenovo/t430/devicetree.cb
@@ -14,16 +14,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_cpu_backlight" = "0x1155"
 	register "gpu_pch_backlight" = "0x11551155"
 
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax # FIXME: check all registers
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			device lapic 0 on end
-			device lapic 0xacac off end
-		end
-	end
-
 	device domain 0 on
 		subsystemid 0x17aa 0x21f3 inherit
 
diff --git a/src/mainboard/lenovo/t430s/devicetree.cb b/src/mainboard/lenovo/t430s/devicetree.cb
index 739d01db1c85..9148892f36a1 100644
--- a/src/mainboard/lenovo/t430s/devicetree.cb
+++ b/src/mainboard/lenovo/t430s/devicetree.cb
@@ -14,18 +14,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_cpu_backlight" = "0x1155"
 	register "gpu_pch_backlight" = "0x11551155"
 
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			# Magic APIC ID to locate this chip
-			device lapic 0 on end
-			device lapic 0xacac off end
-
-			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
-		end
-	end
-
 	device domain 0 on
 		subsystemid 0x17aa 0x21fb inherit
 
diff --git a/src/mainboard/lenovo/t520/devicetree.cb b/src/mainboard/lenovo/t520/devicetree.cb
index 9c75231efc41..9588af27c2bb 100644
--- a/src/mainboard/lenovo/t520/devicetree.cb
+++ b/src/mainboard/lenovo/t520/devicetree.cb
@@ -15,18 +15,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_cpu_backlight" = "0x1155"
 	register "gpu_pch_backlight" = "0x06100610"
 
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			# Magic APIC ID to locate this chip
-			device lapic 0 on end
-			device lapic 0xacac off end
-
-			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
-		end
-	end
-
 	device domain 0 on
 		subsystemid 0x17aa 0x21cf inherit
 
diff --git a/src/mainboard/lenovo/t530/devicetree.cb b/src/mainboard/lenovo/t530/devicetree.cb
index 5cfa2075644c..a274a6774940 100644
--- a/src/mainboard/lenovo/t530/devicetree.cb
+++ b/src/mainboard/lenovo/t530/devicetree.cb
@@ -15,18 +15,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_cpu_backlight" = "0x1155"
 	register "gpu_pch_backlight" = "0x11551155"
 
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			# Magic APIC ID to locate this chip
-			device lapic 0 on end
-			device lapic 0xacac off end
-
-			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
-		end
-	end
-
 	device domain 0 on
 		subsystemid 0x17aa 0x21f6 inherit
 
diff --git a/src/mainboard/lenovo/x131e/devicetree.cb b/src/mainboard/lenovo/x131e/devicetree.cb
index f28212e2e4c2..a0de1631af98 100644
--- a/src/mainboard/lenovo/x131e/devicetree.cb
+++ b/src/mainboard/lenovo/x131e/devicetree.cb
@@ -14,18 +14,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_cpu_backlight" = "0x1155"
 	register "gpu_pch_backlight" = "0x11551155"
 
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			# Magic APIC ID to locate this chip
-			device lapic 0 on end
-			device lapic 0xacac off end
-
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-		end
-	end
-
 	device domain 0 on
 		subsystemid 0x17aa 0x21fe inherit
 
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb b/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb
index cbf1141aec8e..0c693532fb39 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb
+++ b/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb
@@ -12,18 +12,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_panel_power_up_delay" = "300"
 	register "gpu_pch_backlight" = "0x11551155"
 
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			# Magic APIC ID to locate this chip
-			device lapic 0 on end
-			device lapic 0xacac off end
-
-			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
-		end
-	end
-
 	device domain 0 on
 		subsystemid 0x17aa 0x21f9 inherit
 
diff --git a/src/mainboard/lenovo/x220/devicetree.cb b/src/mainboard/lenovo/x220/devicetree.cb
index 923c88bc31e8..46459c55872b 100644
--- a/src/mainboard/lenovo/x220/devicetree.cb
+++ b/src/mainboard/lenovo/x220/devicetree.cb
@@ -15,18 +15,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_cpu_backlight" = "0x1155"
 	register "gpu_pch_backlight" = "0x06100610"
 
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			# Magic APIC ID to locate this chip
-			device lapic 0 on end
-			device lapic 0xacac off end
-
-			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
-		end
-	end
-
 	device domain 0 on
 		subsystemid 0x17aa 0x21db inherit
 
diff --git a/src/mainboard/lenovo/x230/devicetree.cb b/src/mainboard/lenovo/x230/devicetree.cb
index 30a79162d4b1..5c1c124b22d0 100644
--- a/src/mainboard/lenovo/x230/devicetree.cb
+++ b/src/mainboard/lenovo/x230/devicetree.cb
@@ -15,18 +15,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_cpu_backlight" = "0x1155"
 	register "gpu_pch_backlight" = "0x11551155"
 
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			# Magic APIC ID to locate this chip
-			device lapic 0 on end
-			device lapic 0xacac off end
-
-			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
-		end
-	end
-
 	device domain 0 on
 		subsystemid 0x17aa 0x21fa inherit
 
diff --git a/src/mainboard/msi/ms7707/devicetree.cb b/src/mainboard/msi/ms7707/devicetree.cb
index 8e5df5863d4b..e0fbc1ab34e4 100644
--- a/src/mainboard/msi/ms7707/devicetree.cb
+++ b/src/mainboard/msi/ms7707/devicetree.cb
@@ -1,13 +1,4 @@
 chip northbridge/intel/sandybridge
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			device lapic 0 on end
-			device lapic 0xacac off end
-		end
-	end
 	device domain 0 on
 		subsystemid 0x1462 0x7707 inherit
 
diff --git a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
index 6cb77e3aab47..7cb6812695df 100644
--- a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
+++ b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
@@ -23,7 +23,6 @@ chip northbridge/intel/sandybridge
 			device lapic 0 on end
 			device lapic 0xacac off end
 
-			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "acpi_c2" = "4"	# ACPI(C2) = MWAIT(C6)
 			register "acpi_c3" = "0"
 		end
diff --git a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
index 2291f6141ec6..96a8ce848c08 100644
--- a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
+++ b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
@@ -23,7 +23,6 @@ chip northbridge/intel/sandybridge
 			device lapic 0 on end
 			device lapic 0xacac off end
 
-			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "acpi_c2" = "4"	# ACPI(C2) = MWAIT(C6)
 			register "acpi_c3" = "0"
 		end
diff --git a/src/mainboard/samsung/lumpy/devicetree.cb b/src/mainboard/samsung/lumpy/devicetree.cb
index ff7f362f8ea7..4049709d5249 100644
--- a/src/mainboard/samsung/lumpy/devicetree.cb
+++ b/src/mainboard/samsung/lumpy/devicetree.cb
@@ -19,18 +19,6 @@ chip northbridge/intel/sandybridge
 
 	register "max_mem_clock_mhz" = "666"
 
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			# Magic APIC ID to locate this chip
-			device lapic 0 on end
-			device lapic 0xacac off end
-
-			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
-		end
-	end
-
 	device domain 0 on
 		subsystemid 0x1ae0 0xc000 inherit
 		device pci 00.0 on end # host bridge
diff --git a/src/mainboard/samsung/stumpy/devicetree.cb b/src/mainboard/samsung/stumpy/devicetree.cb
index 90ed429ec8c1..ea164c480d76 100644
--- a/src/mainboard/samsung/stumpy/devicetree.cb
+++ b/src/mainboard/samsung/stumpy/devicetree.cb
@@ -19,7 +19,6 @@ chip northbridge/intel/sandybridge
 
 			register "acpi_c1" = "3"	# ACPI(C1) = MWAIT(C3)
 			register "acpi_c2" = "4"	# ACPI(C2) = MWAIT(C6)
-			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 
diff --git a/src/mainboard/sapphire/pureplatinumh61/devicetree.cb b/src/mainboard/sapphire/pureplatinumh61/devicetree.cb
index d5f6fda26bb8..b1beae0eafb1 100644
--- a/src/mainboard/sapphire/pureplatinumh61/devicetree.cb
+++ b/src/mainboard/sapphire/pureplatinumh61/devicetree.cb
@@ -1,15 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 chip northbridge/intel/sandybridge
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			device lapic 0 on end
-			device lapic 0xacac off end
-		end
-	end
 	device domain 0 on
 		chip southbridge/intel/bd82x6x	# Intel Series 6 Cougar Point PCH
 			register "gen1_dec" = "0x000c0291"
diff --git a/src/mainboard/supermicro/x9sae/devicetree.cb b/src/mainboard/supermicro/x9sae/devicetree.cb
index 05a187eaad51..ed011c1b8db0 100644
--- a/src/mainboard/supermicro/x9sae/devicetree.cb
+++ b/src/mainboard/supermicro/x9sae/devicetree.cb
@@ -6,15 +6,7 @@ chip northbridge/intel/sandybridge
 	register "gpu_dp_c_hotplug" = "4"
 	register "gpu_dp_d_hotplug" = "4"
 	register "gpu_panel_power_cycle_delay" = "4"
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			device lapic 0 on end
-			device lapic 0xacac off end
-		end
-	end
+
 	device domain 0 on
 		subsystemid 0x15d9 0x0644 inherit
 
diff --git a/src/mainboard/supermicro/x9scl/devicetree.cb b/src/mainboard/supermicro/x9scl/devicetree.cb
index 284d8f32041d..b0f35340333f 100644
--- a/src/mainboard/supermicro/x9scl/devicetree.cb
+++ b/src/mainboard/supermicro/x9scl/devicetree.cb
@@ -1,13 +1,4 @@
 chip northbridge/intel/sandybridge
-	device cpu_cluster 0 on
-		chip cpu/intel/model_206ax # FIXME: check all registers
-			register "acpi_c1" = "1"
-			register "acpi_c2" = "3"
-			register "acpi_c3" = "5"
-			device lapic 0 on end
-			device lapic 0xacac off end
-		end
-	end
 	device domain 0 on
 		subsystemid 0x15d9 0x0624 inherit
 		device pci 00.0 on  end # Host bridge
diff --git a/src/northbridge/intel/sandybridge/Kconfig b/src/northbridge/intel/sandybridge/Kconfig
index 551714a79fd4..bbe8ac4d697d 100644
--- a/src/northbridge/intel/sandybridge/Kconfig
+++ b/src/northbridge/intel/sandybridge/Kconfig
@@ -17,6 +17,9 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS
 	select NO_DDR2
 	select USE_DDR3
 
+config CHIPSET_DEVICETREE
+	default "northbridge/intel/sandybridge/chipset.cb"
+
 config SANDYBRIDGE_VBOOT_IN_ROMSTAGE
 	bool
 	default n
diff --git a/src/northbridge/intel/sandybridge/chipset.cb b/src/northbridge/intel/sandybridge/chipset.cb
new file mode 100644
index 000000000000..ae02a5b9276e
--- /dev/null
+++ b/src/northbridge/intel/sandybridge/chipset.cb
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+chip northbridge/intel/sandybridge
+	device cpu_cluster 0 on
+		chip cpu/intel/model_206ax
+			# Magic APIC ID to locate this chip
+			device lapic 0 on end
+			device lapic 0xacac off end
+
+			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
+			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
+			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
+		end
+	end
+
+	device domain 0 on
+	end
+end