diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ec/starlabs/merlin/acpi/ac.asl | 2 | ||||
| -rw-r--r-- | src/ec/starlabs/merlin/acpi/lid.asl | 2 | ||||
| -rw-r--r-- | src/ec/starlabs/merlin/acpi/suspend.asl | 12 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/ec/starlabs/merlin/acpi/ac.asl b/src/ec/starlabs/merlin/acpi/ac.asl index 847f872e50..01dcca90a3 100644 --- a/src/ec/starlabs/merlin/acpi/ac.asl +++ b/src/ec/starlabs/merlin/acpi/ac.asl @@ -9,7 +9,7 @@ Device (ADP1) } Method (_PSR, 0) { - PWRS = ECPS & 0x01 + PWRS = (ECRD (RefOf(ECPS)) & 0x01) Return (PWRS) } Method (_PCL, 0) diff --git a/src/ec/starlabs/merlin/acpi/lid.asl b/src/ec/starlabs/merlin/acpi/lid.asl index 936eeed7ec..0eaa2c5bae 100644 --- a/src/ec/starlabs/merlin/acpi/lid.asl +++ b/src/ec/starlabs/merlin/acpi/lid.asl @@ -11,6 +11,6 @@ Device (LID0) { // 0x00 == Closed // 0x01 == Open - Return (^^LSTE) + Return (ECRD (RefOf (LSTE))) } } diff --git a/src/ec/starlabs/merlin/acpi/suspend.asl b/src/ec/starlabs/merlin/acpi/suspend.asl index 08ca787113..2dae8dae68 100644 --- a/src/ec/starlabs/merlin/acpi/suspend.asl +++ b/src/ec/starlabs/merlin/acpi/suspend.asl @@ -7,10 +7,14 @@ Method (RPTS, 1, NotSerialized) If ((Arg0 == 0x04) || (Arg0 == 0x05)) { /* Store current EC settings in CMOS */ - \_SB.PCI0.LPCB.TPLC = \_SB.PCI0.LPCB.EC.TPLE - \_SB.PCI0.LPCB.FLKC = \_SB.PCI0.LPCB.EC.FLKE - \_SB.PCI0.LPCB.KLSC = \_SB.PCI0.LPCB.EC.KLSE - \_SB.PCI0.LPCB.KLBC = \_SB.PCI0.LPCB.EC.KLBE + \_SB.PCI0.LPCB.TPLC = + \_SB.PCI0.LPCB.EC.ECRD (RefOf (\_SB.PCI0.LPCB.EC.TPLE)) + \_SB.PCI0.LPCB.FLKC = + \_SB.PCI0.LPCB.EC.ECRD (RefOf (\_SB.PCI0.LPCB.EC.FLKE)) + \_SB.PCI0.LPCB.KLSC = + \_SB.PCI0.LPCB.EC.ECRD (RefOf (\_SB.PCI0.LPCB.EC.KLSE)) + \_SB.PCI0.LPCB.KLBC = + \_SB.PCI0.LPCB.EC.ECRD (RefOf (\_SB.PCI0.LPCB.EC.KLBE)) } } |