summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/parrot/acpi/ec.asl5
-rw-r--r--src/mainboard/google/parrot/acpi/mainboard.asl20
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/acpi/ec.asl4
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl21
4 files changed, 40 insertions, 10 deletions
diff --git a/src/mainboard/google/parrot/acpi/ec.asl b/src/mainboard/google/parrot/acpi/ec.asl
index a0ee9d5343..ae0090fb5e 100644
--- a/src/mainboard/google/parrot/acpi/ec.asl
+++ b/src/mainboard/google/parrot/acpi/ec.asl
@@ -19,10 +19,7 @@
/* mainboard configuration */
#include "../ec.h"
-#define EC_SCI 23 // GPIO7 << 16 to GPE bit for Runtime SCI
-
-/* GP15 is defined in the southbridge's ASL */
-#define EC_ACPI_LID_SWITCH_OBJECT GP15
+#define EC_SCI_GPE 23 // GPIO7 << 16 to GPE bit for Runtime SCI
/* ACPI code for EC functions */
#include "../../../../ec/compal/ene932/acpi/ec.asl"
diff --git a/src/mainboard/google/parrot/acpi/mainboard.asl b/src/mainboard/google/parrot/acpi/mainboard.asl
index 7b9aef0e91..4ab97330b1 100644
--- a/src/mainboard/google/parrot/acpi/mainboard.asl
+++ b/src/mainboard/google/parrot/acpi/mainboard.asl
@@ -68,4 +68,24 @@ Scope (\_SB) {
})
}
+ Device (MB) {
+ /* Lid open */
+ Method (LIDO) { /* Not needed on this board */ }
+ /* Lid closed */
+ Method (LIDC) { /* Not needed on this board */ }
+ /* Increase brightness */
+ Method (BRTU) { /* Not needed on this board */ }
+ /* Decrease brightness */
+ Method (BRTD) { /* Not needed on this board */ }
+ /* Switch display */
+ Method (DSPS) { /* Not needed on this board */ }
+ /* Toggle wireless */
+ Method (WLTG) { /* Not needed on this board */ }
+ /* Return lid state */
+ Method (LIDS)
+ {
+ Return (GP15)
+ }
+ }
+
}
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/ec.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/ec.asl
index e0d92fabac..188515c165 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/ec.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/ec.asl
@@ -6,9 +6,7 @@
/*
* EC bits specific to the mainboard
*/
-#define EC_SCI 3
-/* TODO: We do not yet know how the LID is connected to the platform */
-#define EC_ACPI_LID_SWITCH_OBJECT Zero
+#define EC_SCI_GPE 3
/* ACPI code for EC functions */
#include <ec/compal/ene932/acpi/ec.asl>
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
index e30d083aa8..57e2b3c5c7 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
@@ -38,7 +38,6 @@
/* Variables used by EC */
/* TODO: These may belong in global non-volatile storage */
Name(PWRS, Zero)
- Name(LIDS, Zero)
/* AcpiGpe0Blk */
OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
@@ -78,8 +77,24 @@ Scope (\_SB) {
Name(_HID, EisaId("PNP0C0D"))
Method(_LID, 0)
{
- Store (GE22, \LIDS)
- Return (\LIDS)
+ Return (GE22) /* GE pin 22 */
}
}
+
+ Device (MB) {
+ /* Lid open */
+ Method (LIDO) { /* Stub */ }
+ /* Lid closed */
+ Method (LIDC) { /* Stub */ }
+ /* Increase brightness */
+ Method (BRTU) { /* Stub */ }
+ /* Decrease brightness */
+ Method (BRTD) { /* Stub */ }
+ /* Switch display */
+ Method (DSPS) { /* Stub */ }
+ /* Toggle wireless */
+ Method (WLTG) { /* Stub */ }
+ /* Return lid state */
+ Method (LIDS) { /* Stub */ }
+ }
}