cpu/intel/model_206ax: Unify ACPI C-state options

All mainboards use the same values for AC and battery, even desktop
boards without a battery. Use the AC values everywhere and drop the
battery values. Subsequent commits will rename the AC power options
accordingly, and will also clean up the corresponding acpigen code.
This is intentional so as to ease reviewing the devicetree changes.

Also update util/autoport accordingly.

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

46 files changed, 2 insertions, 158 deletions

diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c
index b24f411f00..514b1bb252 100644
--- a/src/cpu/intel/model_206ax/acpi.c
+++ b/src/cpu/intel/model_206ax/acpi.c
@@ -90,8 +90,8 @@ static void generate_C_state_entries(void)
 
 	/* Else on battery power */
 	acpigen_emit_byte(0xa4);	/* ReturnOp */
-	generate_cstate_entries(cpu->cstates, conf->c1_battery,
-				conf->c2_battery, conf->c3_battery);
+	generate_cstate_entries(cpu->cstates, conf->c1_acpower,
+				conf->c2_acpower, conf->c3_acpower);
 	acpigen_pop_len();
 }
 
diff --git a/src/cpu/intel/model_206ax/chip.h b/src/cpu/intel/model_206ax/chip.h
index a5a4312318..aca1804498 100644
--- a/src/cpu/intel/model_206ax/chip.h
+++ b/src/cpu/intel/model_206ax/chip.h
@@ -4,10 +4,6 @@
 #define SPEEDSTEP_APIC_MAGIC 0xACAC
 
 struct cpu_intel_model_206ax_config {
-	int c1_battery;		/* ACPI C1 on Battery Power */
-	int c2_battery;		/* ACPI C2 on Battery Power */
-	int c3_battery;		/* ACPI C3 on Battery Power */
-
 	int c1_acpower;		/* ACPI C1 on AC Power */
 	int c2_acpower;		/* ACPI C2 on AC Power */
 	int c3_acpower;		/* ACPI C3 on AC Power */
diff --git a/src/mainboard/apple/macbookair4_2/devicetree.cb b/src/mainboard/apple/macbookair4_2/devicetree.cb
index f6b01769c9..7bf6be24c9 100644
--- a/src/mainboard/apple/macbookair4_2/devicetree.cb
+++ b/src/mainboard/apple/macbookair4_2/devicetree.cb
@@ -16,11 +16,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
diff --git a/src/mainboard/asrock/b75pro3-m/devicetree.cb b/src/mainboard/asrock/b75pro3-m/devicetree.cb
index 2fc7c8844c..3838aecc85 100644
--- a/src/mainboard/asrock/b75pro3-m/devicetree.cb
+++ b/src/mainboard/asrock/b75pro3-m/devicetree.cb
@@ -16,11 +16,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
diff --git a/src/mainboard/asus/h61m-cs/devicetree.cb b/src/mainboard/asus/h61m-cs/devicetree.cb
index ea2a5d8c1a..9ecff521f5 100644
--- a/src/mainboard/asus/h61m-cs/devicetree.cb
+++ b/src/mainboard/asus/h61m-cs/devicetree.cb
@@ -4,11 +4,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0x0    on  end
 			device lapic 0xacac off end
 		end
diff --git a/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb b/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb
index a0b631261b..6bfd26fb98 100644
--- a/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb
+++ b/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb
@@ -4,11 +4,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
diff --git a/src/mainboard/asus/p8h61-m_lx/devicetree.cb b/src/mainboard/asus/p8h61-m_lx/devicetree.cb
index 4a29baa579..30abc61c21 100644
--- a/src/mainboard/asus/p8h61-m_lx/devicetree.cb
+++ b/src/mainboard/asus/p8h61-m_lx/devicetree.cb
@@ -4,11 +4,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/devicetree.cb b/src/mainboard/asus/p8h61-m_lx3_r2_0/devicetree.cb
index 757c5ccde8..b4c70e1514 100644
--- a/src/mainboard/asus/p8h61-m_lx3_r2_0/devicetree.cb
+++ b/src/mainboard/asus/p8h61-m_lx3_r2_0/devicetree.cb
@@ -4,11 +4,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0 on end
 			device lapic 0xacac off end
 		end
diff --git a/src/mainboard/asus/p8h61-m_pro/devicetree.cb b/src/mainboard/asus/p8h61-m_pro/devicetree.cb
index b318573b40..18e1831ff1 100644
--- a/src/mainboard/asus/p8h61-m_pro/devicetree.cb
+++ b/src/mainboard/asus/p8h61-m_pro/devicetree.cb
@@ -4,11 +4,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
diff --git a/src/mainboard/asus/p8z77-m_pro/devicetree.cb b/src/mainboard/asus/p8z77-m_pro/devicetree.cb
index 90feb7ac6c..30d12aa191 100644
--- a/src/mainboard/asus/p8z77-m_pro/devicetree.cb
+++ b/src/mainboard/asus/p8z77-m_pro/devicetree.cb
@@ -4,11 +4,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
diff --git a/src/mainboard/asus/p8z77-v_lx2/devicetree.cb b/src/mainboard/asus/p8z77-v_lx2/devicetree.cb
index 33ff961522..fa70be7547 100644
--- a/src/mainboard/asus/p8z77-v_lx2/devicetree.cb
+++ b/src/mainboard/asus/p8z77-v_lx2/devicetree.cb
@@ -4,11 +4,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0 on end
 			device lapic 0xacac off end
 		end
diff --git a/src/mainboard/biostar/th61-itx/devicetree.cb b/src/mainboard/biostar/th61-itx/devicetree.cb
index 2329bb23e3..b18f5935e2 100644
--- a/src/mainboard/biostar/th61-itx/devicetree.cb
+++ b/src/mainboard/biostar/th61-itx/devicetree.cb
@@ -4,11 +4,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0 on	end
 			device lapic 0xacac off	end
 		end
diff --git a/src/mainboard/compulab/intense_pc/devicetree.cb b/src/mainboard/compulab/intense_pc/devicetree.cb
index 414c410b10..14b6840e8f 100644
--- a/src/mainboard/compulab/intense_pc/devicetree.cb
+++ b/src/mainboard/compulab/intense_pc/devicetree.cb
@@ -9,11 +9,8 @@ chip northbridge/intel/sandybridge # FIXME: check gfx
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax # FIXME: check all registers
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
diff --git a/src/mainboard/dell/optiplex_9010/devicetree.cb b/src/mainboard/dell/optiplex_9010/devicetree.cb
index 6a21d20b74..0b010d3548 100644
--- a/src/mainboard/dell/optiplex_9010/devicetree.cb
+++ b/src/mainboard/dell/optiplex_9010/devicetree.cb
@@ -2,11 +2,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "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 fbc31b7788..4cb5bffac3 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
@@ -5,9 +5,6 @@ chip northbridge/intel/sandybridge
 			register "c1_acpower" = "1"
 			register "c2_acpower" = "3"
 			register "c3_acpower" = "5"
-			register "c1_battery" = "1"
-			register "c2_battery" = "3"
-			register "c3_battery" = "5"
 			# Magic APIC ID to locate this chip
 			device lapic 0x0 on end
 			device lapic 0xacac off end
diff --git a/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb b/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb
index cb7b918962..4a8f9bbe90 100644
--- a/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb
@@ -4,11 +4,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0 on	end
 			device lapic 0xacac off	end
 		end
diff --git a/src/mainboard/google/butterfly/devicetree.cb b/src/mainboard/google/butterfly/devicetree.cb
index 94e5a2151a..095656b158 100644
--- a/src/mainboard/google/butterfly/devicetree.cb
+++ b/src/mainboard/google/butterfly/devicetree.cb
@@ -29,10 +29,6 @@ chip northbridge/intel/sandybridge
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
 			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
-
-			register "c1_battery" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_battery" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_battery" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 
diff --git a/src/mainboard/google/link/devicetree.cb b/src/mainboard/google/link/devicetree.cb
index 6ce51a3961..5241dd650a 100644
--- a/src/mainboard/google/link/devicetree.cb
+++ b/src/mainboard/google/link/devicetree.cb
@@ -28,10 +28,6 @@ chip northbridge/intel/sandybridge
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
 			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
-
-			register "c1_battery" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_battery" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_battery" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 
diff --git a/src/mainboard/google/parrot/devicetree.cb b/src/mainboard/google/parrot/devicetree.cb
index 61e51d0df3..2dc35e8a30 100644
--- a/src/mainboard/google/parrot/devicetree.cb
+++ b/src/mainboard/google/parrot/devicetree.cb
@@ -28,10 +28,6 @@ chip northbridge/intel/sandybridge
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
 			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
-
-			register "c1_battery" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_battery" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_battery" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 
diff --git a/src/mainboard/google/stout/devicetree.cb b/src/mainboard/google/stout/devicetree.cb
index bd91506b39..66dd06de91 100644
--- a/src/mainboard/google/stout/devicetree.cb
+++ b/src/mainboard/google/stout/devicetree.cb
@@ -30,10 +30,6 @@ chip northbridge/intel/sandybridge
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
 			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
-
-			register "c1_battery" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_battery" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_battery" = "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 7bd312803e..0ec9a5346c 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
+++ b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
@@ -9,11 +9,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
diff --git a/src/mainboard/hp/snb_ivb_laptops/devicetree.cb b/src/mainboard/hp/snb_ivb_laptops/devicetree.cb
index acdd4b3496..eb73eef5fa 100644
--- a/src/mainboard/hp/snb_ivb_laptops/devicetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/devicetree.cb
@@ -18,11 +18,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
diff --git a/src/mainboard/hp/z220_sff_workstation/devicetree.cb b/src/mainboard/hp/z220_sff_workstation/devicetree.cb
index bfabacce6c..0fdbe90108 100644
--- a/src/mainboard/hp/z220_sff_workstation/devicetree.cb
+++ b/src/mainboard/hp/z220_sff_workstation/devicetree.cb
@@ -9,11 +9,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
diff --git a/src/mainboard/intel/dcp847ske/devicetree.cb b/src/mainboard/intel/dcp847ske/devicetree.cb
index b865d1a49e..8f83589cdd 100644
--- a/src/mainboard/intel/dcp847ske/devicetree.cb
+++ b/src/mainboard/intel/dcp847ske/devicetree.cb
@@ -17,10 +17,6 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_battery" = "1"
-			register "c2_battery" = "3"
-			register "c3_battery" = "5"
-
 			register "c1_acpower" = "1"
 			register "c2_acpower" = "3"
 			register "c3_acpower" = "5"
diff --git a/src/mainboard/intel/emeraldlake2/devicetree.cb b/src/mainboard/intel/emeraldlake2/devicetree.cb
index 3b4ee6532a..1fb02e384f 100644
--- a/src/mainboard/intel/emeraldlake2/devicetree.cb
+++ b/src/mainboard/intel/emeraldlake2/devicetree.cb
@@ -17,10 +17,6 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_battery" = "3"	# ACPI(C1) = MWAIT(C3)
-			register "c2_battery" = "4"	# ACPI(C2) = MWAIT(C6)
-			register "c3_battery" = "5"	# ACPI(C3) = MWAIT(C7)
-
 			register "c1_acpower" = "3"	# ACPI(C1) = MWAIT(C3)
 			register "c2_acpower" = "4"	# ACPI(C2) = MWAIT(C6)
 			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
diff --git a/src/mainboard/kontron/ktqm77/devicetree.cb b/src/mainboard/kontron/ktqm77/devicetree.cb
index db0c9e24f9..7abdbb3c1b 100644
--- a/src/mainboard/kontron/ktqm77/devicetree.cb
+++ b/src/mainboard/kontron/ktqm77/devicetree.cb
@@ -11,10 +11,6 @@ chip northbridge/intel/sandybridge
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "4"	# ACPI(C2) = MWAIT(C3)
 			register "c3_acpower" = "0"	# ACPI(C3) = MWAIT(C7)
-
-			register "c1_battery" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_battery" = "4"	# ACPI(C2) = MWAIT(C3)
-			register "c3_battery" = "0"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 
diff --git a/src/mainboard/lenovo/l520/devicetree.cb b/src/mainboard/lenovo/l520/devicetree.cb
index bab1d54f39..23af5b9a31 100644
--- a/src/mainboard/lenovo/l520/devicetree.cb
+++ b/src/mainboard/lenovo/l520/devicetree.cb
@@ -15,11 +15,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
diff --git a/src/mainboard/lenovo/s230u/devicetree.cb b/src/mainboard/lenovo/s230u/devicetree.cb
index f3b8c27784..06ec045666 100644
--- a/src/mainboard/lenovo/s230u/devicetree.cb
+++ b/src/mainboard/lenovo/s230u/devicetree.cb
@@ -14,11 +14,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
diff --git a/src/mainboard/lenovo/t420/devicetree.cb b/src/mainboard/lenovo/t420/devicetree.cb
index ef40fc4dde..6b0ed3b871 100644
--- a/src/mainboard/lenovo/t420/devicetree.cb
+++ b/src/mainboard/lenovo/t420/devicetree.cb
@@ -24,10 +24,6 @@ chip northbridge/intel/sandybridge
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
 			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
-
-			register "c1_battery" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_battery" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_battery" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 
diff --git a/src/mainboard/lenovo/t420s/devicetree.cb b/src/mainboard/lenovo/t420s/devicetree.cb
index 71068d0005..7110b9882b 100644
--- a/src/mainboard/lenovo/t420s/devicetree.cb
+++ b/src/mainboard/lenovo/t420s/devicetree.cb
@@ -24,10 +24,6 @@ chip northbridge/intel/sandybridge
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
 			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
-
-			register "c1_battery" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_battery" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_battery" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 
diff --git a/src/mainboard/lenovo/t430/devicetree.cb b/src/mainboard/lenovo/t430/devicetree.cb
index f3524cd999..f03a2251d4 100644
--- a/src/mainboard/lenovo/t430/devicetree.cb
+++ b/src/mainboard/lenovo/t430/devicetree.cb
@@ -17,11 +17,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax # FIXME: check all registers
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
diff --git a/src/mainboard/lenovo/t430s/devicetree.cb b/src/mainboard/lenovo/t430s/devicetree.cb
index 4bdb923b12..a6fb1bf8fc 100644
--- a/src/mainboard/lenovo/t430s/devicetree.cb
+++ b/src/mainboard/lenovo/t430s/devicetree.cb
@@ -23,10 +23,6 @@ chip northbridge/intel/sandybridge
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
 			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
-
-			register "c1_battery" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_battery" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_battery" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 
diff --git a/src/mainboard/lenovo/t520/devicetree.cb b/src/mainboard/lenovo/t520/devicetree.cb
index cc1e7f2999..de4d8d752c 100644
--- a/src/mainboard/lenovo/t520/devicetree.cb
+++ b/src/mainboard/lenovo/t520/devicetree.cb
@@ -24,10 +24,6 @@ chip northbridge/intel/sandybridge
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
 			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
-
-			register "c1_battery" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_battery" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_battery" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 
diff --git a/src/mainboard/lenovo/t530/devicetree.cb b/src/mainboard/lenovo/t530/devicetree.cb
index e4655b2f29..0b0c7fbe28 100644
--- a/src/mainboard/lenovo/t530/devicetree.cb
+++ b/src/mainboard/lenovo/t530/devicetree.cb
@@ -24,10 +24,6 @@ chip northbridge/intel/sandybridge
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
 			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
-
-			register "c1_battery" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_battery" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_battery" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 
diff --git a/src/mainboard/lenovo/x131e/devicetree.cb b/src/mainboard/lenovo/x131e/devicetree.cb
index ddbfd98491..38f833b461 100644
--- a/src/mainboard/lenovo/x131e/devicetree.cb
+++ b/src/mainboard/lenovo/x131e/devicetree.cb
@@ -23,10 +23,6 @@ chip northbridge/intel/sandybridge
 			register "c1_acpower" = "1"
 			register "c2_acpower" = "3"
 			register "c3_acpower" = "5"
-
-			register "c1_battery" = "1"
-			register "c2_battery" = "3"
-			register "c3_battery" = "5"
 		end
 	end
 
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb b/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb
index 34eaa75c13..da44a44985 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb
+++ b/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb
@@ -21,10 +21,6 @@ chip northbridge/intel/sandybridge
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
 			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
-
-			register "c1_battery" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_battery" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_battery" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 
diff --git a/src/mainboard/lenovo/x220/devicetree.cb b/src/mainboard/lenovo/x220/devicetree.cb
index 609036d61c..3559a16ef0 100644
--- a/src/mainboard/lenovo/x220/devicetree.cb
+++ b/src/mainboard/lenovo/x220/devicetree.cb
@@ -24,10 +24,6 @@ chip northbridge/intel/sandybridge
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
 			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
-
-			register "c1_battery" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_battery" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_battery" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 
diff --git a/src/mainboard/lenovo/x230/devicetree.cb b/src/mainboard/lenovo/x230/devicetree.cb
index 27d42b68be..e304794646 100644
--- a/src/mainboard/lenovo/x230/devicetree.cb
+++ b/src/mainboard/lenovo/x230/devicetree.cb
@@ -24,10 +24,6 @@ chip northbridge/intel/sandybridge
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
 			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
-
-			register "c1_battery" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_battery" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_battery" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 
diff --git a/src/mainboard/msi/ms7707/devicetree.cb b/src/mainboard/msi/ms7707/devicetree.cb
index db48656489..a7cbb1cb46 100644
--- a/src/mainboard/msi/ms7707/devicetree.cb
+++ b/src/mainboard/msi/ms7707/devicetree.cb
@@ -2,11 +2,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
diff --git a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
index f3108dbed9..86f07b5f1d 100644
--- a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
+++ b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
@@ -26,10 +26,6 @@ chip northbridge/intel/sandybridge
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "4"	# ACPI(C2) = MWAIT(C6)
 			register "c3_acpower" = "0"
-
-			register "c1_battery" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_battery" = "4"	# ACPI(C2) = MWAIT(C6)
-			register "c3_battery" = "0"
 		end
 	end
 
diff --git a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
index a1edcaa3f4..ca62c13ecb 100644
--- a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
+++ b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
@@ -26,10 +26,6 @@ chip northbridge/intel/sandybridge
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "4"	# ACPI(C2) = MWAIT(C6)
 			register "c3_acpower" = "0"
-
-			register "c1_battery" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_battery" = "4"	# ACPI(C2) = MWAIT(C6)
-			register "c3_battery" = "0"
 		end
 	end
 
diff --git a/src/mainboard/samsung/lumpy/devicetree.cb b/src/mainboard/samsung/lumpy/devicetree.cb
index 06efaf8ff9..9d7d456e2b 100644
--- a/src/mainboard/samsung/lumpy/devicetree.cb
+++ b/src/mainboard/samsung/lumpy/devicetree.cb
@@ -28,10 +28,6 @@ chip northbridge/intel/sandybridge
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
 			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
-
-			register "c1_battery" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_battery" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_battery" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 
diff --git a/src/mainboard/samsung/stumpy/devicetree.cb b/src/mainboard/samsung/stumpy/devicetree.cb
index df640b55fd..1cce1f1c55 100644
--- a/src/mainboard/samsung/stumpy/devicetree.cb
+++ b/src/mainboard/samsung/stumpy/devicetree.cb
@@ -17,10 +17,6 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_battery" = "3"	# ACPI(C1) = MWAIT(C3)
-			register "c2_battery" = "4"	# ACPI(C2) = MWAIT(C6)
-			register "c3_battery" = "5"	# ACPI(C3) = MWAIT(C7)
-
 			register "c1_acpower" = "3"	# ACPI(C1) = MWAIT(C3)
 			register "c2_acpower" = "4"	# ACPI(C2) = MWAIT(C6)
 			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
diff --git a/src/mainboard/sapphire/pureplatinumh61/devicetree.cb b/src/mainboard/sapphire/pureplatinumh61/devicetree.cb
index 2bef030268..a590450a5b 100644
--- a/src/mainboard/sapphire/pureplatinumh61/devicetree.cb
+++ b/src/mainboard/sapphire/pureplatinumh61/devicetree.cb
@@ -4,11 +4,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
diff --git a/src/mainboard/supermicro/x9scl/devicetree.cb b/src/mainboard/supermicro/x9scl/devicetree.cb
index 9236f6f3da..17b6c40eef 100644
--- a/src/mainboard/supermicro/x9scl/devicetree.cb
+++ b/src/mainboard/supermicro/x9scl/devicetree.cb
@@ -2,11 +2,8 @@ chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax # FIXME: check all registers
 			register "c1_acpower" = "1"
-			register "c1_battery" = "1"
 			register "c2_acpower" = "3"
-			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
-			register "c3_battery" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
diff --git a/util/autoport/sandybridge.go b/util/autoport/sandybridge.go
index 68cbe68134..645bd9300e 100644
--- a/util/autoport/sandybridge.go
+++ b/util/autoport/sandybridge.go
@@ -47,9 +47,6 @@ func (i sandybridgemc) Scan(ctx Context, addr PCIDevData) {
 							"c1_acpower": "1",
 							"c2_acpower": "3",
 							"c3_acpower": "5",
-							"c1_battery": "1",
-							"c2_battery": "3",
-							"c3_battery": "5",
 						},
 						Children: []DevTreeNode{
 							{