aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Vervoorn <wvervoorn@eltan.com>2020-01-15 09:16:46 +0100
committerPatrick Georgi <pgeorgi@google.com>2020-01-18 10:52:12 +0000
commit8629b49606bcbec237ae68bf1aa79aa0e183209a (patch)
tree5d0c7a15522e66375ca9f77e3d91530c0f1d39db
parent0826e35a358de83ec75fd48f23bfd17b0ced9b7b (diff)
soc/intel/{skylake,common}/acpi/dptf/thermal.asl: Prevent iasl remarks
Prevent iasl remarks about unused parameters. BUG=N/A TEST=build Change-Id: I54fa4712e618038fdd5a96c2012c2ec64ca34706 Signed-off-by: Wim Vervoorn <wvervoorn@eltan.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/38428 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
-rw-r--r--src/ec/google/chromeec/acpi/ec.asl3
-rw-r--r--src/soc/intel/common/acpi/dptf/thermal.asl17
-rw-r--r--src/soc/intel/skylake/acpi/dptf/thermal.asl18
3 files changed, 21 insertions, 17 deletions
diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl
index 962988e7a9..bf792d3629 100644
--- a/src/ec/google/chromeec/acpi/ec.asl
+++ b/src/ec/google/chromeec/acpi/ec.asl
@@ -510,6 +510,7 @@ Device (EC0)
Return (^TBMD)
}
+#ifdef EC_ENABLE_MULTIPLE_DPTF_PROFILES
/* Read current Device DPTF Profile Number */
Method (RCDP, 0, NotSerialized)
{
@@ -524,7 +525,7 @@ Device (EC0)
Return (Local0)
}
}
-
+#endif
#if CONFIG(EC_GOOGLE_CHROMEEC_ACPI_USB_PORT_POWER)
/*
* Enable USB Port Power
diff --git a/src/soc/intel/common/acpi/dptf/thermal.asl b/src/soc/intel/common/acpi/dptf/thermal.asl
index 7058b27f38..6e361dc496 100644
--- a/src/soc/intel/common/acpi/dptf/thermal.asl
+++ b/src/soc/intel/common/acpi/dptf/thermal.asl
@@ -79,6 +79,10 @@ Method (TPET)
#endif
}
+#ifndef EC_ENABLE_MULTIPLE_DPTF_PROFILES
+External (\_SB.PCI0.LPCB.EC0.RCDP, MethodObj)
+#endif
+
/*
* Method to return trip temperature value depending upon the device mode.
* Arg0 --> Value to return when device is in tablet mode
@@ -86,15 +90,12 @@ Method (TPET)
*/
Method (DTRP, 2, Serialized)
{
-#ifdef EC_ENABLE_MULTIPLE_DPTF_PROFILES
- If (LEqual (\_SB.PCI0.LPCB.EC0.RCDP, One)) {
- Return (CTOK (Arg0))
- } Else {
-#endif
- Return (CTOK (Arg1))
-#ifdef EC_ENABLE_MULTIPLE_DPTF_PROFILES
+ If (CondRefOf (\_SB.PCI0.LPCB.EC0.RCDP)) {
+ If (LEqual (\_SB.PCI0.LPCB.EC0.RCDP, One)) {
+ Return (CTOK (Arg0))
+ }
}
-#endif
+ Return (CTOK (Arg1))
}
#ifdef DPTF_TSR0_SENSOR_ID
diff --git a/src/soc/intel/skylake/acpi/dptf/thermal.asl b/src/soc/intel/skylake/acpi/dptf/thermal.asl
index 742b092311..f73d366e6a 100644
--- a/src/soc/intel/skylake/acpi/dptf/thermal.asl
+++ b/src/soc/intel/skylake/acpi/dptf/thermal.asl
@@ -79,6 +79,11 @@ Method (TPET)
}
#if defined(DPTF_TSR0_SENSOR_ID) || defined(DPTF_TSR1_SENSOR_ID) || defined(DPTF_TSR2_SENSOR_ID)
+
+#ifndef EC_ENABLE_MULTIPLE_DPTF_PROFILES
+External (\_SB.PCI0.LPCB.EC0.RCDP, MethodObj)
+#endif
+
/*
* Method to return trip temperature value depending upon the device mode.
* Arg0 --> Value to return when device is in tablet mode
@@ -86,15 +91,12 @@ Method (TPET)
*/
Method (DTRP, 2, Serialized)
{
-#ifdef EC_ENABLE_MULTIPLE_DPTF_PROFILES
- If (LEqual (\_SB.PCI0.LPCB.EC0.RCDP, One)) {
- Return (CTOK (Arg0))
- } Else {
-#endif
- Return (CTOK (Arg1))
-#ifdef EC_ENABLE_MULTIPLE_DPTF_PROFILES
+ If (CondRefOf (\_SB.PCI0.LPCB.EC0.RCDP)) {
+ If (LEqual (\_SB.PCI0.LPCB.EC0.RCDP, One)) {
+ Return (CTOK (Arg0))
+ }
}
-#endif
+ Return (CTOK (Arg1))
}
#endif