diff options
| -rw-r--r-- | src/ec/google/chromeec/acpi/ec.asl | 3 | ||||
| -rw-r--r-- | src/soc/intel/common/acpi/dptf/thermal.asl | 17 | ||||
| -rw-r--r-- | src/soc/intel/skylake/acpi/dptf/thermal.asl | 18 |
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 |