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>

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,
+	generate_cstate_entries(cpu->cstates, conf->c1_acpower,
-				conf->c2_battery, conf->c3_battery);
+				conf->c2_acpower, conf->c3_acpower);
 	acpigen_pop_len();
 }
 

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 */

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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
 

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
 

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
 

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
 

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

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

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

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"

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)

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
 

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

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

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
 

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
 

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

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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

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
 

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
 

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
 

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)

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

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

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{
 							{