cpu/intel/model_206ax: Rename cX_acpower options

They aren't specific to AC power operation anymore. Also adapt autoport.

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

src/cpu/intel/model_206ax/acpi.c

@@ -84,14 +84,14 @@ static void generate_C_state_entries(void)
 	acpigen_write_len_f();		/* PkgLength */
 	acpigen_emit_namestring("PWRS");
 	acpigen_emit_byte(0xa4);	/* ReturnOp */
-	generate_cstate_entries(cpu->cstates, conf->c1_acpower,
+	generate_cstate_entries(cpu->cstates, conf->acpi_c1,
-				conf->c2_acpower, conf->c3_acpower);
+				conf->acpi_c2, conf->acpi_c3);
 	acpigen_pop_len();
 
 	/* Else on battery power */
 	acpigen_emit_byte(0xa4);	/* ReturnOp */
-	generate_cstate_entries(cpu->cstates, conf->c1_acpower,
+	generate_cstate_entries(cpu->cstates, conf->acpi_c1,
-				conf->c2_acpower, conf->c3_acpower);
+				conf->acpi_c2, conf->acpi_c3);
 	acpigen_pop_len();
 }
 

src/cpu/intel/model_206ax/chip.h

@@ -4,9 +4,9 @@
 #define SPEEDSTEP_APIC_MAGIC 0xACAC
 
 struct cpu_intel_model_206ax_config {
-	int c1_acpower;		/* ACPI C1 on AC Power */
+	int acpi_c1;		/* ACPI C1 */
-	int c2_acpower;		/* ACPI C2 on AC Power */
+	int acpi_c2;		/* ACPI C2 */
-	int c3_acpower;		/* ACPI C3 on AC Power */
+	int acpi_c3;		/* ACPI C3 */
 
 	int tcc_offset;		/* TCC Activation Offset */
 };

src/mainboard/apple/macbookair4_2/devicetree.cb

@@ -15,9 +15,9 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x13121312"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end

src/mainboard/asrock/b75pro3-m/devicetree.cb

@@ -15,9 +15,9 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x00000000"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end

src/mainboard/asus/h61m-cs/devicetree.cb

@@ -3,9 +3,9 @@
 chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0x0    on  end
 			device lapic 0xacac off end
 		end

src/mainboard/asus/maximus_iv_gene-z/devicetree.cb

@@ -3,9 +3,9 @@
 chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end

src/mainboard/asus/p8h61-m_lx/devicetree.cb

@@ -3,9 +3,9 @@
 chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end

src/mainboard/asus/p8h61-m_lx3_r2_0/devicetree.cb

@@ -3,9 +3,9 @@
 chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0 on end
 			device lapic 0xacac off end
 		end

src/mainboard/asus/p8h61-m_pro/devicetree.cb

@@ -3,9 +3,9 @@
 chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end

src/mainboard/asus/p8z77-m_pro/devicetree.cb

@@ -3,9 +3,9 @@
 chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end

src/mainboard/asus/p8z77-v_lx2/devicetree.cb

@@ -3,9 +3,9 @@
 chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0 on end
 			device lapic 0xacac off end
 		end

src/mainboard/biostar/th61-itx/devicetree.cb

@@ -3,9 +3,9 @@
 chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0 on	end
 			device lapic 0xacac off	end
 		end

src/mainboard/compulab/intense_pc/devicetree.cb

@@ -8,9 +8,9 @@ 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 "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end

src/mainboard/dell/optiplex_9010/devicetree.cb

@@ -1,9 +1,9 @@
 chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "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

@@ -2,9 +2,9 @@ chip northbridge/intel/sandybridge
 
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "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

@@ -3,9 +3,9 @@
 chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0 on	end
 			device lapic 0xacac off	end
 		end

src/mainboard/google/butterfly/devicetree.cb

@@ -26,9 +26,9 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
+			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
+			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
+			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 

src/mainboard/google/link/devicetree.cb

@@ -25,9 +25,9 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
+			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
+			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
+			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 

src/mainboard/google/parrot/devicetree.cb

@@ -25,9 +25,9 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
+			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
+			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
+			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 

src/mainboard/google/stout/devicetree.cb

@@ -27,9 +27,9 @@ chip northbridge/intel/sandybridge
 
 			register "tcc_offset" = "5"	# TCC of 95C
 
-			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
+			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
+			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
+			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 

src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb

@@ -8,9 +8,9 @@ chip northbridge/intel/sandybridge
 
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end

src/mainboard/hp/snb_ivb_laptops/devicetree.cb

@@ -17,9 +17,9 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x02880288"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end

src/mainboard/hp/z220_sff_workstation/devicetree.cb

@@ -8,9 +8,9 @@ chip northbridge/intel/sandybridge
 
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end

src/mainboard/intel/dcp847ske/devicetree.cb

@@ -17,9 +17,9 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 		end
 	end
 	device domain 0x0 on

src/mainboard/intel/emeraldlake2/devicetree.cb

@@ -17,9 +17,9 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_acpower" = "3"	# ACPI(C1) = MWAIT(C3)
+			register "acpi_c1" = "3"	# ACPI(C1) = MWAIT(C3)
-			register "c2_acpower" = "4"	# ACPI(C2) = MWAIT(C6)
+			register "acpi_c2" = "4"	# ACPI(C2) = MWAIT(C6)
-			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
+			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 

src/mainboard/kontron/ktqm77/devicetree.cb

@@ -8,9 +8,9 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
+			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_acpower" = "4"	# ACPI(C2) = MWAIT(C3)
+			register "acpi_c2" = "4"	# ACPI(C2) = MWAIT(C3)
-			register "c3_acpower" = "0"	# ACPI(C3) = MWAIT(C7)
+			register "acpi_c3" = "0"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 

src/mainboard/lenovo/l520/devicetree.cb

@@ -14,9 +14,9 @@ chip northbridge/intel/sandybridge
 
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end

src/mainboard/lenovo/s230u/devicetree.cb

@@ -13,9 +13,9 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x041e041e"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end

src/mainboard/lenovo/t420/devicetree.cb

@@ -21,9 +21,9 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
+			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
+			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
+			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 

src/mainboard/lenovo/t420s/devicetree.cb

@@ -21,9 +21,9 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
+			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
+			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
+			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 

src/mainboard/lenovo/t430/devicetree.cb

@@ -16,9 +16,9 @@ chip northbridge/intel/sandybridge
 
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax # FIXME: check all registers
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end

src/mainboard/lenovo/t430s/devicetree.cb

@@ -20,9 +20,9 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
+			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
+			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
+			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 

src/mainboard/lenovo/t520/devicetree.cb

@@ -21,9 +21,9 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
+			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
+			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
+			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 

src/mainboard/lenovo/t530/devicetree.cb

@@ -21,9 +21,9 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
+			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
+			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
+			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 

src/mainboard/lenovo/x131e/devicetree.cb

@@ -20,9 +20,9 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 		end
 	end
 

src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb

@@ -18,9 +18,9 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
+			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
+			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
+			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 

src/mainboard/lenovo/x220/devicetree.cb

@@ -21,9 +21,9 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
+			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
+			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
+			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 

src/mainboard/lenovo/x230/devicetree.cb

@@ -21,9 +21,9 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
+			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
+			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
+			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 

src/mainboard/msi/ms7707/devicetree.cb

@@ -1,9 +1,9 @@
 chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end

src/mainboard/roda/rv11/variants/rv11/devicetree.cb

@@ -23,9 +23,9 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
+			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_acpower" = "4"	# ACPI(C2) = MWAIT(C6)
+			register "acpi_c2" = "4"	# ACPI(C2) = MWAIT(C6)
-			register "c3_acpower" = "0"
+			register "acpi_c3" = "0"
 		end
 	end
 

src/mainboard/roda/rv11/variants/rw11/devicetree.cb

@@ -23,9 +23,9 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
+			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_acpower" = "4"	# ACPI(C2) = MWAIT(C6)
+			register "acpi_c2" = "4"	# ACPI(C2) = MWAIT(C6)
-			register "c3_acpower" = "0"
+			register "acpi_c3" = "0"
 		end
 	end
 

src/mainboard/samsung/lumpy/devicetree.cb

@@ -25,9 +25,9 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
+			register "acpi_c1" = "1"	# ACPI(C1) = MWAIT(C1)
-			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
+			register "acpi_c2" = "3"	# ACPI(C2) = MWAIT(C3)
-			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
+			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 

src/mainboard/samsung/stumpy/devicetree.cb

@@ -17,9 +17,9 @@ chip northbridge/intel/sandybridge
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 
-			register "c1_acpower" = "3"	# ACPI(C1) = MWAIT(C3)
+			register "acpi_c1" = "3"	# ACPI(C1) = MWAIT(C3)
-			register "c2_acpower" = "4"	# ACPI(C2) = MWAIT(C6)
+			register "acpi_c2" = "4"	# ACPI(C2) = MWAIT(C6)
-			register "c3_acpower" = "5"	# ACPI(C3) = MWAIT(C7)
+			register "acpi_c3" = "5"	# ACPI(C3) = MWAIT(C7)
 		end
 	end
 

src/mainboard/sapphire/pureplatinumh61/devicetree.cb

@@ -3,9 +3,9 @@
 chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
 		chip cpu/intel/model_206ax
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end

src/mainboard/supermicro/x9scl/devicetree.cb

@@ -1,9 +1,9 @@
 chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
 		chip cpu/intel/model_206ax # FIXME: check all registers
-			register "c1_acpower" = "1"
+			register "acpi_c1" = "1"
-			register "c2_acpower" = "3"
+			register "acpi_c2" = "3"
-			register "c3_acpower" = "5"
+			register "acpi_c3" = "5"
 			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end

util/autoport/sandybridge.go

@@ -44,9 +44,9 @@ func (i sandybridgemc) Scan(ctx Context, addr PCIDevData) {
 						Comment: "FIXME: check all registers",
 						Registers: map[string]string{
 							/* FIXME:XX hardcoded.  */
-							"c1_acpower": "1",
+							"acpi_c1": "1",
-							"c2_acpower": "3",
+							"acpi_c2": "3",
-							"c3_acpower": "5",
+							"acpi_c3": "5",
 						},
 						Children: []DevTreeNode{
 							{