diff options
29 files changed, 55 insertions, 29 deletions
diff --git a/src/mainboard/google/auron/acpi/thermal.asl b/src/mainboard/google/auron/acpi/thermal.asl index 8fc6217fa320..16d1d45f923c 100644 --- a/src/mainboard/google/auron/acpi/thermal.asl +++ b/src/mainboard/google/auron/acpi/thermal.asl @@ -17,6 +17,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { ThermalZone (THRM) diff --git a/src/mainboard/google/auron/dsdt.asl b/src/mainboard/google/auron/dsdt.asl index 531d6a7247e1..445d927d5f5e 100644 --- a/src/mainboard/google/auron/dsdt.asl +++ b/src/mainboard/google/auron/dsdt.asl @@ -26,6 +26,9 @@ DefinitionBlock( // Some generic macros #include <soc/intel/broadwell/acpi/platform.asl> + // Thermal handler + #include "acpi/thermal.asl" + // global NVS and variables #include <soc/intel/broadwell/acpi/globalnvs.asl> @@ -43,9 +46,6 @@ DefinitionBlock( } } - // Thermal handler - #include "acpi/thermal.asl" - // Chrome OS specific #include <vendorcode/google/chromeos/acpi/chromeos.asl> diff --git a/src/mainboard/google/beltino/acpi/thermal.asl b/src/mainboard/google/beltino/acpi/thermal.asl index af36a5c9857a..1d4eca3a0992 100644 --- a/src/mainboard/google/beltino/acpi/thermal.asl +++ b/src/mainboard/google/beltino/acpi/thermal.asl @@ -17,6 +17,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { ThermalZone (THRM) diff --git a/src/mainboard/google/beltino/dsdt.asl b/src/mainboard/google/beltino/dsdt.asl index 6393d688fb0e..268cd9dc9ee0 100644 --- a/src/mainboard/google/beltino/dsdt.asl +++ b/src/mainboard/google/beltino/dsdt.asl @@ -26,6 +26,9 @@ DefinitionBlock( // Some generic macros #include "acpi/platform.asl" + // Thermal handler + #include "acpi/thermal.asl" + // global NVS and variables #include <southbridge/intel/lynxpoint/acpi/globalnvs.asl> @@ -45,9 +48,6 @@ DefinitionBlock( // Mainboard devices #include "acpi/mainboard.asl" - // Thermal handler - #include "acpi/thermal.asl" - // Chrome OS specific #include <vendorcode/google/chromeos/acpi/chromeos.asl> diff --git a/src/mainboard/google/butterfly/acpi/thermal.asl b/src/mainboard/google/butterfly/acpi/thermal.asl index f6158bac0f37..2faa7de63626 100644 --- a/src/mainboard/google/butterfly/acpi/thermal.asl +++ b/src/mainboard/google/butterfly/acpi/thermal.asl @@ -15,6 +15,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { ThermalZone (THRM) diff --git a/src/mainboard/google/butterfly/dsdt.asl b/src/mainboard/google/butterfly/dsdt.asl index c1ea0e671787..b4fd6cff2d3a 100644 --- a/src/mainboard/google/butterfly/dsdt.asl +++ b/src/mainboard/google/butterfly/dsdt.asl @@ -29,14 +29,15 @@ DefinitionBlock( #include "acpi/platform.asl" #include "acpi/mainboard.asl" + // Thermal handler + #include "acpi/thermal.asl" + // global NVS and variables #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> // General Purpose Events //#include "acpi/gpe.asl" - #include "acpi/thermal.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> Scope (\_SB) { diff --git a/src/mainboard/google/jecht/dsdt.asl b/src/mainboard/google/jecht/dsdt.asl index 1ac32887d1e5..8157a84d362b 100644 --- a/src/mainboard/google/jecht/dsdt.asl +++ b/src/mainboard/google/jecht/dsdt.asl @@ -26,6 +26,9 @@ DefinitionBlock( // Some generic macros #include "acpi/platform.asl" + // Thermal handler + #include <variant/acpi/thermal.asl> + // global NVS and variables #include <soc/intel/broadwell/acpi/globalnvs.asl> @@ -43,9 +46,6 @@ DefinitionBlock( } } - // Thermal handler - #include <variant/acpi/thermal.asl> - // Chrome OS specific #include <vendorcode/google/chromeos/acpi/chromeos.asl> diff --git a/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl index 1cd1b9b713e6..d09b4915fb45 100644 --- a/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl +++ b/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl @@ -17,6 +17,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { ThermalZone (THRM) diff --git a/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl index 1cd1b9b713e6..d09b4915fb45 100644 --- a/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl +++ b/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl @@ -17,6 +17,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { ThermalZone (THRM) diff --git a/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl index 151ac51289c5..7bf7155dca2e 100644 --- a/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl +++ b/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl @@ -17,6 +17,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { ThermalZone (THRM) diff --git a/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl index 78e7bf75c7e2..177d75e1c79f 100644 --- a/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl +++ b/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl @@ -17,6 +17,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { ThermalZone (THRM) diff --git a/src/mainboard/google/link/acpi/thermal.asl b/src/mainboard/google/link/acpi/thermal.asl index 91634936733e..e0d25e711d1c 100644 --- a/src/mainboard/google/link/acpi/thermal.asl +++ b/src/mainboard/google/link/acpi/thermal.asl @@ -15,6 +15,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { ThermalZone (CRIT) diff --git a/src/mainboard/google/link/dsdt.asl b/src/mainboard/google/link/dsdt.asl index 82fb3f62df79..5af07938c5e8 100644 --- a/src/mainboard/google/link/dsdt.asl +++ b/src/mainboard/google/link/dsdt.asl @@ -29,13 +29,15 @@ DefinitionBlock( #include "acpi/platform.asl" #include "acpi/mainboard.asl" + // Thermal handler + #include "acpi/thermal.asl" + // global NVS and variables #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> // General Purpose Events //#include "acpi/gpe.asl" - #include "acpi/thermal.asl" #include <cpu/intel/model_206ax/acpi/cpu.asl> diff --git a/src/mainboard/google/parrot/acpi/thermal.asl b/src/mainboard/google/parrot/acpi/thermal.asl index 98aa52da7c0d..38fe15f77dc5 100644 --- a/src/mainboard/google/parrot/acpi/thermal.asl +++ b/src/mainboard/google/parrot/acpi/thermal.asl @@ -15,6 +15,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { ThermalZone (THRM) diff --git a/src/mainboard/google/parrot/dsdt.asl b/src/mainboard/google/parrot/dsdt.asl index 4f2f9866e1fa..ebc86cacfc83 100644 --- a/src/mainboard/google/parrot/dsdt.asl +++ b/src/mainboard/google/parrot/dsdt.asl @@ -28,14 +28,15 @@ DefinitionBlock( // Some generic macros #include "acpi/platform.asl" + // Thermal handler + #include "acpi/thermal.asl" + // global NVS and variables #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> // General Purpose Events //#include "acpi/gpe.asl" - #include "acpi/thermal.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> Scope (\_SB) { diff --git a/src/mainboard/google/slippy/acpi/thermal.asl b/src/mainboard/google/slippy/acpi/thermal.asl index 36b0e216040a..0c694c0f70c1 100644 --- a/src/mainboard/google/slippy/acpi/thermal.asl +++ b/src/mainboard/google/slippy/acpi/thermal.asl @@ -15,6 +15,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { // Handler for throttle requests on this platform diff --git a/src/mainboard/google/slippy/dsdt.asl b/src/mainboard/google/slippy/dsdt.asl index 7d41f9adb3b3..076039d8884a 100644 --- a/src/mainboard/google/slippy/dsdt.asl +++ b/src/mainboard/google/slippy/dsdt.asl @@ -26,6 +26,9 @@ DefinitionBlock( // Some generic macros #include "acpi/platform.asl" + // Thermal handler + #include "acpi/thermal.asl" + // global NVS and variables #include <southbridge/intel/lynxpoint/acpi/globalnvs.asl> @@ -56,9 +59,6 @@ DefinitionBlock( // Mainboard specific #include "acpi/mainboard.asl" - // Thermal handler - #include "acpi/thermal.asl" - // Chrome OS specific #include <vendorcode/google/chromeos/acpi/chromeos.asl> diff --git a/src/mainboard/google/stout/acpi/thermal.asl b/src/mainboard/google/stout/acpi/thermal.asl index 01f622962775..335f018ecde2 100644 --- a/src/mainboard/google/stout/acpi/thermal.asl +++ b/src/mainboard/google/stout/acpi/thermal.asl @@ -15,6 +15,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { ThermalZone (THRM) diff --git a/src/mainboard/google/stout/dsdt.asl b/src/mainboard/google/stout/dsdt.asl index b12c963e544f..60ea646cb664 100644 --- a/src/mainboard/google/stout/dsdt.asl +++ b/src/mainboard/google/stout/dsdt.asl @@ -29,14 +29,15 @@ DefinitionBlock( #include "acpi/platform.asl" #include "acpi/mainboard.asl" + // Thermal handeler + #include "acpi/thermal.asl" + // global NVS and variables #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> // General Purpose Events //#include "acpi/gpe.asl" - #include "acpi/thermal.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> Scope (\_SB) { diff --git a/src/mainboard/intel/emeraldlake2/acpi/thermal.asl b/src/mainboard/intel/emeraldlake2/acpi/thermal.asl index 448cb9739267..b3d3824eb6ad 100644 --- a/src/mainboard/intel/emeraldlake2/acpi/thermal.asl +++ b/src/mainboard/intel/emeraldlake2/acpi/thermal.asl @@ -15,6 +15,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { ThermalZone (THRM) diff --git a/src/mainboard/intel/emeraldlake2/dsdt.asl b/src/mainboard/intel/emeraldlake2/dsdt.asl index 4adc4571b4cf..fc6fd1efc63f 100644 --- a/src/mainboard/intel/emeraldlake2/dsdt.asl +++ b/src/mainboard/intel/emeraldlake2/dsdt.asl @@ -28,14 +28,15 @@ DefinitionBlock( // Some generic macros #include "acpi/platform.asl" + // Thermal handler + #include "acpi/thermal.asl" + // global NVS and variables #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> // General Purpose Events //#include "acpi/gpe.asl" - #include "acpi/thermal.asl" - #include "../../../cpu/intel/model_206ax/acpi/cpu.asl" Scope (\_SB) { diff --git a/src/mainboard/kontron/ktqm77/acpi/thermal.asl b/src/mainboard/kontron/ktqm77/acpi/thermal.asl index 0bdef147f508..9c1407ea9063 100644 --- a/src/mainboard/kontron/ktqm77/acpi/thermal.asl +++ b/src/mainboard/kontron/ktqm77/acpi/thermal.asl @@ -16,6 +16,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { ThermalZone (THRM) diff --git a/src/mainboard/kontron/ktqm77/dsdt.asl b/src/mainboard/kontron/ktqm77/dsdt.asl index 1b26ed0a2a44..0432f778d4c3 100644 --- a/src/mainboard/kontron/ktqm77/dsdt.asl +++ b/src/mainboard/kontron/ktqm77/dsdt.asl @@ -29,14 +29,15 @@ DefinitionBlock( #include "acpi/platform.asl" #include "acpi/mainboard.asl" + // Thermal Handler + #include "acpi/thermal.asl" + // global NVS and variables #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> // General Purpose Events //#include "acpi/gpe.asl" - #include "acpi/thermal.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> Scope (\_SB) { diff --git a/src/mainboard/roda/rv11/acpi/thermal.asl b/src/mainboard/roda/rv11/acpi/thermal.asl index b87fc4f63d18..a1d28e4c5384 100644 --- a/src/mainboard/roda/rv11/acpi/thermal.asl +++ b/src/mainboard/roda/rv11/acpi/thermal.asl @@ -15,6 +15,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { // Convert from Degrees C to 1/10 Kelvin for ACPI diff --git a/src/mainboard/roda/rv11/dsdt.asl b/src/mainboard/roda/rv11/dsdt.asl index 4934eed54254..ff837959f2af 100644 --- a/src/mainboard/roda/rv11/dsdt.asl +++ b/src/mainboard/roda/rv11/dsdt.asl @@ -28,11 +28,12 @@ DefinitionBlock( #include "acpi/platform.asl" #include "acpi/mainboard.asl" + // Thermal handler + #include "acpi/thermal.asl" + // global NVS and variables #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> - #include "acpi/thermal.asl" - #include "acpi/alsd.asl" #include <cpu/intel/model_206ax/acpi/cpu.asl> diff --git a/src/mainboard/samsung/lumpy/acpi/thermal.asl b/src/mainboard/samsung/lumpy/acpi/thermal.asl index c61a3b613a41..10a74f3bb0ae 100644 --- a/src/mainboard/samsung/lumpy/acpi/thermal.asl +++ b/src/mainboard/samsung/lumpy/acpi/thermal.asl @@ -15,6 +15,7 @@ // Thermal Zone +#define HAVE_THERMALZONE Scope (\_TZ) { ThermalZone (THRM) diff --git a/src/mainboard/samsung/lumpy/dsdt.asl b/src/mainboard/samsung/lumpy/dsdt.asl index f42bec66b427..3ca8bf2cc148 100644 --- a/src/mainboard/samsung/lumpy/dsdt.asl +++ b/src/mainboard/samsung/lumpy/dsdt.asl @@ -28,6 +28,9 @@ DefinitionBlock( // Some generic macros #include "acpi/platform.asl" + // Thermal handler + #include "acpi/thermal.asl" + // global NVS and variables #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> @@ -36,8 +39,6 @@ DefinitionBlock( #include <cpu/intel/model_206ax/acpi/cpu.asl> - #include "acpi/thermal.asl" - Scope (\_SB) { Device (PCI0) { diff --git a/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl b/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl index 2a3227d3daca..f7652ee5a505 100644 --- a/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl +++ b/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl @@ -233,15 +233,16 @@ Method (XHCD) { Store (Zero, \XHCI) } -External (\_TZ.THRM) External (\_TZ.SKIN) Method (TZUP) { +#ifdef HAVE_THERMALZONE /* Update Primary Thermal Zone */ If (CondRefOf (\_TZ.THRM)) { Notify (\_TZ.THRM, 0x81) } +#endif /* Update Secondary Thermal Zone */ If (CondRefOf (\_TZ.SKIN)) { diff --git a/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl b/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl index 468c755b163d..ba9f8502089f 100644 --- a/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl +++ b/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl @@ -216,15 +216,16 @@ Method (S3GD) Store (Zero, \S33G) } -External (\_TZ.THRM) External (\_TZ.SKIN) Method (TZUP) { +#ifdef HAVE_THERMALZONE /* Update Primary Thermal Zone */ If (CondRefOf (\_TZ.THRM)) { Notify (\_TZ.THRM, 0x81) } +#endif /* Update Secondary Thermal Zone */ If (CondRefOf (\_TZ.SKIN)) { |