summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Żygowski <michal.zygowski@3mdeb.com>2020-03-23 14:41:32 +0100
committerMichał Żygowski <michal.zygowski@3mdeb.com>2020-03-25 15:19:52 +0000
commitb84c6167505ca76239b8bd59f4ebb3c115111de5 (patch)
tree381fb0347ea062f854cf0116b8b37879f8ed7b32
parent612a8676779f873f2f7a3c8011ad0eac61ca38f9 (diff)
downloadcoreboot-b84c6167505ca76239b8bd59f4ebb3c115111de5.tar.xz
amd/common/acpi: move thermal zone to common location
Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com> Change-Id: I048d1906bc474be4d5a4e44b9c7ae28f53b49d5a Reviewed-on: https://review.coreboot.org/c/coreboot/+/39779 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Christian Walter <christian.walter@9elements.com> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-rw-r--r--src/northbridge/amd/agesa/family14/acpi/northbridge.asl3
-rw-r--r--src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl2
-rw-r--r--src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl2
-rw-r--r--src/northbridge/amd/pi/00630F01/acpi/northbridge.asl2
-rw-r--r--src/northbridge/amd/pi/00730F01/acpi/northbridge.asl2
-rw-r--r--src/soc/amd/common/acpi/thermal_zone.asl (renamed from src/northbridge/amd/agesa/family14/acpi/thermal_mixin.asl)2
6 files changed, 6 insertions, 7 deletions
diff --git a/src/northbridge/amd/agesa/family14/acpi/northbridge.asl b/src/northbridge/amd/agesa/family14/acpi/northbridge.asl
index 72efeca1cf..6f51ea1f7a 100644
--- a/src/northbridge/amd/agesa/family14/acpi/northbridge.asl
+++ b/src/northbridge/amd/agesa/family14/acpi/northbridge.asl
@@ -124,7 +124,6 @@ Device(PE23) {
/* Northbridge function 3 */
Device(NBF3) {
Name(_ADR, 0x00180003)
-
/* k10temp thermal zone */
- #include "thermal_mixin.asl"
+ #include <soc/amd/common/acpi/thermal_zone.asl>
} /* end NBF3 */
diff --git a/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl b/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl
index 40df8918b1..217132f8e4 100644
--- a/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl
+++ b/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl
@@ -95,5 +95,5 @@ Device(PBR7) {
Device(K10M) {
Name (_ADR, 0x00180003)
- #include <northbridge/amd/agesa/family14/acpi/thermal_mixin.asl>
+ #include <soc/amd/common/acpi/thermal_zone.asl>
}
diff --git a/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl b/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl
index 34bf33a32e..34e8ef046d 100644
--- a/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl
+++ b/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl
@@ -95,5 +95,5 @@ Device(PBR8) {
Device(K10M) {
Name (_ADR, 0x00180003)
- #include <northbridge/amd/agesa/family14/acpi/thermal_mixin.asl>
+ #include <soc/amd/common/acpi/thermal_zone.asl>
}
diff --git a/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl b/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl
index cdb4063d36..ed5db82e79 100644
--- a/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl
+++ b/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl
@@ -65,5 +65,5 @@ Device(PBR3) {
Device(K10M) {
Name (_ADR, 0x00180003)
- #include <northbridge/amd/agesa/family14/acpi/thermal_mixin.asl>
+ #include <soc/amd/common/acpi/thermal_zone.asl>
}
diff --git a/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl b/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl
index 34bf33a32e..34e8ef046d 100644
--- a/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl
+++ b/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl
@@ -95,5 +95,5 @@ Device(PBR8) {
Device(K10M) {
Name (_ADR, 0x00180003)
- #include <northbridge/amd/agesa/family14/acpi/thermal_mixin.asl>
+ #include <soc/amd/common/acpi/thermal_zone.asl>
}
diff --git a/src/northbridge/amd/agesa/family14/acpi/thermal_mixin.asl b/src/soc/amd/common/acpi/thermal_zone.asl
index 3c692ce859..e6ab43235b 100644
--- a/src/northbridge/amd/agesa/family14/acpi/thermal_mixin.asl
+++ b/src/soc/amd/common/acpi/thermal_zone.asl
@@ -25,7 +25,7 @@
* Scope (\_SB.PCI0) {
* Device (K10M) {
* Name (_ADR, 0x00180003)
- * #include <northbridge/amd/agesa/family14/acpi/thermal_mixin.asl>
+ * #include <soc/amd/common/acpi/thermal_zone.asl>
* }
* }
*