From 0d5ef95fc341f922a84f30f6167253af11c8ad24 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Mon, 4 Jan 2021 15:10:21 +0100 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/49088 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/mainboard/google/butterfly/devicetree.cb | 4 ---- src/mainboard/google/link/devicetree.cb | 4 ---- src/mainboard/google/parrot/devicetree.cb | 4 ---- src/mainboard/google/stout/devicetree.cb | 4 ---- 4 files changed, 16 deletions(-) (limited to 'src/mainboard/google') 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 -- cgit v1.2.3