chromeec: Move keyboard backlight code into Chrome EC directory

Since more boards are starting to use the EC provided keyboard
backlight interface move the code to a common place and allow
it to get included in mainboards.

Change-Id: I3f307bbce1a96cdd1c8224b1e89a63d6fedef738
Signed-off-by: Duncan Laurie <dlaurie@google.com>
Reviewed-on: http://review.coreboot.org/11478
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

8 files changed, 56 insertions, 56 deletions

diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl
index 746060ec56..8b4f91d8c8 100644
--- a/src/ec/google/chromeec/acpi/ec.asl
+++ b/src/ec/google/chromeec/acpi/ec.asl
@@ -420,6 +420,10 @@ Device (EC0)
 	#include "als.asl"
 #endif
 
+#ifdef EC_ENABLE_KEYBOARD_BACKLIGHT
+       #include "keyboard_backlight.asl"
+#endif
+
 #ifdef EC_ENABLE_PD_MCU_DEVICE
 	#include "pd.asl"
 #endif
diff --git a/src/ec/google/chromeec/acpi/keyboard_backlight.asl b/src/ec/google/chromeec/acpi/keyboard_backlight.asl
new file mode 100644
index 0000000000..608994e435
--- /dev/null
+++ b/src/ec/google/chromeec/acpi/keyboard_backlight.asl
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2015 Google Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.
+ */
+
+Scope (\_SB)
+{
+	/*
+	 * Chrome EC Keyboard Backlight interface
+	 */
+	Device (KBLT)
+	{
+		Name (_HID, "GOOG0002")
+		Name (_UID, 1)
+
+		/* Read current backlight value */
+		Method (KBQC, 0, NotSerialized)
+		{
+			Return (\_SB.PCI0.LPCB.EC0.KBLV)
+		}
+
+		/* Write new backlight value */
+		Method (KBCM, 1, NotSerialized)
+		{
+			Store (Arg0, \_SB.PCI0.LPCB.EC0.KBLV)
+		}
+	}
+}
diff --git a/src/mainboard/google/glados/acpi/ec.asl b/src/mainboard/google/glados/acpi/ec.asl
index 321b2ce600..33a7471a8c 100644
--- a/src/mainboard/google/glados/acpi/ec.asl
+++ b/src/mainboard/google/glados/acpi/ec.asl
@@ -21,6 +21,9 @@
 #include <mainboard/google/glados/ec.h>
 #include <mainboard/google/glados/gpio.h>
 
+/* Enable EC backed Keyboard Backlight in ACPI */
+#define EC_ENABLE_KEYBOARD_BACKLIGHT
+
 /* Enable EC backed PD MCU device in ACPI */
 #define EC_ENABLE_PD_MCU_DEVICE
 
diff --git a/src/mainboard/google/glados/acpi/mainboard.asl b/src/mainboard/google/glados/acpi/mainboard.asl
index 8e512596f5..efa7dddcf4 100644
--- a/src/mainboard/google/glados/acpi/mainboard.asl
+++ b/src/mainboard/google/glados/acpi/mainboard.asl
@@ -47,24 +47,6 @@ Scope (\_SB)
 	{
 		Name (_HID, EisaId ("PNP0C0C"))
 	}
-
-	/* Keyboard Backlight interface via EC */
-	Device (KBLT) {
-		Name (_HID, "GOOG0002")
-		Name (_UID, 1)
-
-		/* Read current backlight value */
-		Method (KBQC, 0)
-		{
-			Return (\_SB.PCI0.LPCB.EC0.KBLV)
-		}
-
-		/* Write new backlight value */
-		Method (KBCM, 1)
-		{
-			Store (Arg0, \_SB.PCI0.LPCB.EC0.KBLV)
-		}
-	}
 }
 
 /*
diff --git a/src/mainboard/google/link/acpi/ec.asl b/src/mainboard/google/link/acpi/ec.asl
index d52e0e943f..97bec3e1b3 100644
--- a/src/mainboard/google/link/acpi/ec.asl
+++ b/src/mainboard/google/link/acpi/ec.asl
@@ -20,5 +20,8 @@
 /* mainboard configuration */
 #include "../ec.h"
 
+/* Enable EC backed Keyboard Backlight in ACPI */
+#define EC_ENABLE_KEYBOARD_BACKLIGHT
+
 /* ACPI code for EC functions */
-#include "../../../../ec/google/chromeec/acpi/ec.asl"
+#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 3470ff0c29..63169e55fe 100644
--- a/src/mainboard/google/link/acpi/mainboard.asl
+++ b/src/mainboard/google/link/acpi/mainboard.asl
@@ -85,23 +85,4 @@ Scope (\_SB) {
 			VendorShort (ADDR) {0x4a}
 		})
 	}
-
-	// Keyboard Backlight interface via EC
-	Device (KBLT) {
-		Name (_HID, EisaId("GGL0002"))
-		Name (_UID, 1)
-		Name (_ADR, 0)
-
-		// Read current backlight value
-		Method (KBQC, 0)
-		{
-			Return (\_SB.PCI0.LPCB.EC0.KBLV)
-		}
-
-		// Write new backlight value
-		Method (KBCM, 1)
-		{
-			Store (Arg0, \_SB.PCI0.LPCB.EC0.KBLV)
-		}
-	}
 }
diff --git a/src/mainboard/google/samus/acpi/ec.asl b/src/mainboard/google/samus/acpi/ec.asl
index 41951d1b3a..1147fcf136 100644
--- a/src/mainboard/google/samus/acpi/ec.asl
+++ b/src/mainboard/google/samus/acpi/ec.asl
@@ -23,6 +23,9 @@
 /* Enable EC backed ALS device in ACPI */
 #define EC_ENABLE_ALS_DEVICE
 
+/* Enable EC backed Keyboard Backlight in ACPI */
+#define EC_ENABLE_KEYBOARD_BACKLIGHT
+
 /* Enable EC backed PD MCU device in ACPI */
 #define EC_ENABLE_PD_MCU_DEVICE
 
diff --git a/src/mainboard/google/samus/acpi/mainboard.asl b/src/mainboard/google/samus/acpi/mainboard.asl
index 04f98a97ed..5a1ac570e7 100644
--- a/src/mainboard/google/samus/acpi/mainboard.asl
+++ b/src/mainboard/google/samus/acpi/mainboard.asl
@@ -37,24 +37,6 @@ Scope (\_SB)
 	{
 		Name(_HID, EisaId("PNP0C0C"))
 	}
-
-	// Keyboard Backlight interface via EC
-	Device (KBLT) {
-		Name (_HID, "GOOG0002")
-		Name (_UID, 1)
-
-		// Read current backlight value
-		Method (KBQC, 0)
-		{
-			Return (\_SB.PCI0.LPCB.EC0.KBLV)
-		}
-
-		// Write new backlight value
-		Method (KBCM, 1)
-		{
-			Store (Arg0, \_SB.PCI0.LPCB.EC0.KBLV)
-		}
-	}
 }
 
 /*