From 5029a1668e0ca99ac64210967e22c971b0395efa Mon Sep 17 00:00:00 2001
From: Furquan Shaikh <furquan@chromium.org>
Date: Thu, 23 Mar 2017 23:41:53 -0700
Subject: ec: Use EC_ENABLE_LID_SWITCH for all mainboards with LID using
 chromeec

Instead of defining a separate LID device for mainboards using
chromeec, define EC_ENABLE_LID_SWITCH for these boards.

Change-Id: Iac58847c2055fa27c19d02b2dbda6813d6dec3ec
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/18964
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/mainboard/google/link/acpi/ec.asl        |  6 ++++++
 src/mainboard/google/link/acpi/mainboard.asl | 13 -------------
 src/mainboard/google/link/acpi/platform.asl  |  2 +-
 3 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'src/mainboard/google/link/acpi')

diff --git a/src/mainboard/google/link/acpi/ec.asl b/src/mainboard/google/link/acpi/ec.asl
index 2e898ede14..f94d8caccb 100644
--- a/src/mainboard/google/link/acpi/ec.asl
+++ b/src/mainboard/google/link/acpi/ec.asl
@@ -19,5 +19,11 @@
 /* Enable EC backed Keyboard Backlight in ACPI */
 #define EC_ENABLE_KEYBOARD_BACKLIGHT
 
+/* Enable LID switch and provide wake pin for EC */
+#define EC_ENABLE_LID_SWITCH
+
+/* EC_LID_OUT is GPIO15 */
+#define EC_ENABLE_WAKE_PIN	0x1f
+
 /* ACPI code for EC functions */
 #include <ec/google/chromeec/acpi/ec.asl>
diff --git a/src/mainboard/google/link/acpi/mainboard.asl b/src/mainboard/google/link/acpi/mainboard.asl
index 01e99fa60d..aa33d14468 100644
--- a/src/mainboard/google/link/acpi/mainboard.asl
+++ b/src/mainboard/google/link/acpi/mainboard.asl
@@ -17,19 +17,6 @@
 #include <mainboard/google/link/onboard.h>
 
 Scope (\_SB) {
-	Device (LID0)
-	{
-		Name(_HID, EisaId("PNP0C0D"))
-		Method(_LID, 0)
-		{
-			Store (\_SB.PCI0.LPCB.EC0.LIDS, \LIDS)
-			Return (\LIDS)
-		}
-
-		// EC_LID_OUT is GPIO15
-		Name(_PRW, Package(){0x1f, 0x05})
-	}
-
 	Device (PWRB)
 	{
 		Name(_HID, EisaId("PNP0C0C"))
diff --git a/src/mainboard/google/link/acpi/platform.asl b/src/mainboard/google/link/acpi/platform.asl
index c84736a7e1..5c4a6da6c9 100644
--- a/src/mainboard/google/link/acpi/platform.asl
+++ b/src/mainboard/google/link/acpi/platform.asl
@@ -38,7 +38,7 @@ Method(_WAK,1)
 	Store (\_SB.PCI0.LPCB.EC0.LIDS, Local0)
 	if (LNotEqual (Local0, \LIDS)) {
 		Store (Local0, \LIDS)
-		Notify (\_SB.LID0, 0x80)
+		Notify (\_SB.PCI0.LPCB.EC0.LID0, 0x80)
 	}
 
 	Return(Package(){0,0})
-- 
cgit v1.2.3