diff --git a/src/mainboard/system76/galp5/acpi/gpio.asl b/src/mainboard/system76/galp5/acpi/gpio.asl deleted file mode 100644 index 0e9bb8c1c8..0000000000 --- a/src/mainboard/system76/galp5/acpi/gpio.asl +++ /dev/null @@ -1,44 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include - -Method (PGPM, 1, Serialized) -{ - For (Local0 = 0, Local0 < 6, Local0++) - { - \_SB.PCI0.CGPM (Local0, Arg0) - } -} - -/* - * Method called from _PTS prior to system sleep state entry - * Enables dynamic clock gating for all 5 GPIO communities - */ -Method (MPTS, 1, Serialized) -{ - PGPM (MISCCFG_ENABLE_GPIO_PM_CONFIG) -} - -/* - * Method called from _WAK prior to system sleep state wakeup - * Disables dynamic clock gating for all 5 GPIO communities - */ -Method (MWAK, 1, Serialized) -{ - PGPM (0) -} - -/* - * S0ix Entry/Exit Notifications - * Called from \_SB.PEPD._DSM - */ -Method (MS0X, 1, Serialized) -{ - If (Arg0 == 1) { - /* S0ix Entry */ - PGPM (MISCCFG_ENABLE_GPIO_PM_CONFIG) - } Else { - /* S0ix Exit */ - PGPM (0) - } -} diff --git a/src/mainboard/system76/galp5/acpi/mainboard.asl b/src/mainboard/system76/galp5/acpi/mainboard.asl index d893e22c0f..c982a9ee4c 100644 --- a/src/mainboard/system76/galp5/acpi/mainboard.asl +++ b/src/mainboard/system76/galp5/acpi/mainboard.asl @@ -5,7 +5,6 @@ #include Scope (\_SB) { - #include "gpio.asl" #include "sleep.asl" Scope (PCI0) { #include "backlight.asl" diff --git a/src/mainboard/system76/galp5/acpi/sleep.asl b/src/mainboard/system76/galp5/acpi/sleep.asl index 48c50e075e..ceb8bacb12 100644 --- a/src/mainboard/system76/galp5/acpi/sleep.asl +++ b/src/mainboard/system76/galp5/acpi/sleep.asl @@ -1,11 +1,46 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* Method called from _PTS prior to enter sleep state */ -Method (MPTS, 1) { - \_SB.PCI0.LPCB.EC0.PTS (Arg0) +#include + +Method (PGPM, 1, Serialized) +{ + For (Local0 = 0, Local0 < 6, Local0++) + { + \_SB.PCI0.CGPM (Local0, Arg0) + } } -/* Method called from _WAK prior to wakeup */ -Method (MWAK, 1) { +/* + * Method called from _PTS prior to system sleep state entry + * Enables dynamic clock gating for all 5 GPIO communities + */ +Method (MPTS, 1, Serialized) +{ + \_SB.PCI0.LPCB.EC0.PTS (Arg0) + PGPM (MISCCFG_ENABLE_GPIO_PM_CONFIG) +} + +/* + * Method called from _WAK prior to system sleep state wakeup + * Disables dynamic clock gating for all 5 GPIO communities + */ +Method (MWAK, 1, Serialized) +{ + PGPM (0) \_SB.PCI0.LPCB.EC0.WAK (Arg0) } + +/* + * S0ix Entry/Exit Notifications + * Called from \_SB.PEPD._DSM + */ +Method (MS0X, 1, Serialized) +{ + If (Arg0 == 1) { + /* S0ix Entry */ + PGPM (MISCCFG_ENABLE_GPIO_PM_CONFIG) + } Else { + /* S0ix Exit */ + PGPM (0) + } +} diff --git a/src/mainboard/system76/lemp10/acpi/gpio.asl b/src/mainboard/system76/lemp10/acpi/gpio.asl deleted file mode 100644 index 0e9bb8c1c8..0000000000 --- a/src/mainboard/system76/lemp10/acpi/gpio.asl +++ /dev/null @@ -1,44 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include - -Method (PGPM, 1, Serialized) -{ - For (Local0 = 0, Local0 < 6, Local0++) - { - \_SB.PCI0.CGPM (Local0, Arg0) - } -} - -/* - * Method called from _PTS prior to system sleep state entry - * Enables dynamic clock gating for all 5 GPIO communities - */ -Method (MPTS, 1, Serialized) -{ - PGPM (MISCCFG_ENABLE_GPIO_PM_CONFIG) -} - -/* - * Method called from _WAK prior to system sleep state wakeup - * Disables dynamic clock gating for all 5 GPIO communities - */ -Method (MWAK, 1, Serialized) -{ - PGPM (0) -} - -/* - * S0ix Entry/Exit Notifications - * Called from \_SB.PEPD._DSM - */ -Method (MS0X, 1, Serialized) -{ - If (Arg0 == 1) { - /* S0ix Entry */ - PGPM (MISCCFG_ENABLE_GPIO_PM_CONFIG) - } Else { - /* S0ix Exit */ - PGPM (0) - } -} diff --git a/src/mainboard/system76/lemp10/acpi/mainboard.asl b/src/mainboard/system76/lemp10/acpi/mainboard.asl index d893e22c0f..c982a9ee4c 100644 --- a/src/mainboard/system76/lemp10/acpi/mainboard.asl +++ b/src/mainboard/system76/lemp10/acpi/mainboard.asl @@ -5,7 +5,6 @@ #include Scope (\_SB) { - #include "gpio.asl" #include "sleep.asl" Scope (PCI0) { #include "backlight.asl" diff --git a/src/mainboard/system76/lemp10/acpi/sleep.asl b/src/mainboard/system76/lemp10/acpi/sleep.asl index 48c50e075e..ceb8bacb12 100644 --- a/src/mainboard/system76/lemp10/acpi/sleep.asl +++ b/src/mainboard/system76/lemp10/acpi/sleep.asl @@ -1,11 +1,46 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* Method called from _PTS prior to enter sleep state */ -Method (MPTS, 1) { - \_SB.PCI0.LPCB.EC0.PTS (Arg0) +#include + +Method (PGPM, 1, Serialized) +{ + For (Local0 = 0, Local0 < 6, Local0++) + { + \_SB.PCI0.CGPM (Local0, Arg0) + } } -/* Method called from _WAK prior to wakeup */ -Method (MWAK, 1) { +/* + * Method called from _PTS prior to system sleep state entry + * Enables dynamic clock gating for all 5 GPIO communities + */ +Method (MPTS, 1, Serialized) +{ + \_SB.PCI0.LPCB.EC0.PTS (Arg0) + PGPM (MISCCFG_ENABLE_GPIO_PM_CONFIG) +} + +/* + * Method called from _WAK prior to system sleep state wakeup + * Disables dynamic clock gating for all 5 GPIO communities + */ +Method (MWAK, 1, Serialized) +{ + PGPM (0) \_SB.PCI0.LPCB.EC0.WAK (Arg0) } + +/* + * S0ix Entry/Exit Notifications + * Called from \_SB.PEPD._DSM + */ +Method (MS0X, 1, Serialized) +{ + If (Arg0 == 1) { + /* S0ix Entry */ + PGPM (MISCCFG_ENABLE_GPIO_PM_CONFIG) + } Else { + /* S0ix Exit */ + PGPM (0) + } +}