summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl8
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl6
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/acpi/sleep.asl16
3 files changed, 15 insertions, 15 deletions
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl
index 1e15d7a37d..e296ff90eb 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl
@@ -15,7 +15,7 @@ Scope(\_GPE) { /* Start Scope GPE */
/* USB controller PME# */
Method(_L0B) {
- Store("USB PME", Debug)
+ Debug = "USB PME"
/* Notify devices of wake event */
Notify(\_SB.PCI0.UOH1, 0x02)
Notify(\_SB.PCI0.UOH2, 0x02)
@@ -38,16 +38,16 @@ Scope(\_GPE) { /* Start Scope GPE */
/* Lid switch opened or closed */
Method(_L16) {
- Store("Lid status changed", Debug)
+ Debug = "Lid status changed"
/* Flip trigger polarity */
- Not(LPOL, LPOL)
+ LPOL = ~LPOL
/* Notify lid object of status change */
Notify(\_SB.LID, 0x80)
}
/* GPIO0 or GEvent8 event */
Method(_L18) {
- Store("PCI bridge wake event", Debug)
+ Debug = "PCI bridge wake event"
/* Notify PCI bridges of wake event */
Notify(\_SB.PCI0.PBR4, 0x02)
Notify(\_SB.PCI0.PBR5, 0x02)
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
index 3aa7a02b9b..698686466f 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
@@ -56,7 +56,7 @@
*/
Method (PNOT)
{
- Store("Received PNOT call (probably from EC)", Debug)
+ Debug = "Received PNOT call (probably from EC)"
/* TODO: Implement this */
}
@@ -75,7 +75,7 @@ Scope (\_SB) {
/* Make sure lid trigger polarity is set so that we
* trigger an SCI when lid status changes.
*/
- Not(GE22, LPOL)
+ LPOL = ~GE22
}
}
@@ -95,7 +95,7 @@ Scope (\_SB) {
/* Toggle wireless */
Method (WLTG)
{
- Store( Not(GP57), GP57 )
+ GP57 = ~GP57
}
/* Return lid state */
Method (LIDS)
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/sleep.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/sleep.asl
index dde9c37cd0..cd714cec87 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/sleep.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/sleep.asl
@@ -26,20 +26,20 @@ Method(\_PTS, 1) {
/* DBGO("\n") */
/* Clear sleep SMI status flag and enable sleep SMI trap. */
- /*Store(One, CSSM)
- Store(One, SSEN)*/
+ /*CSSM = 1
+ SSEN = 1*/
/* On older chips, clear PciExpWakeDisEn */
- /*if (LLessEqual(\_SB.SBRI, 0x13)) {
- * Store(0,\_SB.PWDE)
+ /*if (\_SB.SBRI <= 0x13) {
+ * \_SB.PWDE = 0
*}
*/
/* Clear wake status structure. */
- Store(0, Index(WKST,0))
- Store(0, Index(WKST,1))
+ WKST [0] = 0
+ WKST [1] = 0
- Store (0x07, UPWS)
+ UPWS = 0x07
} /* End Method(\_PTS) */
/*
@@ -64,7 +64,7 @@ Method(\_WAK, 1) {
/* DBGO(" to S0\n") */
/* Re-enable HPET */
- Store(1,USBS)
+ USBS = 1
Return(WKST)
} /* End Method(\_WAK) */