6 files changed, 10 insertions, 56 deletions
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)
-		}
-	}
 }
 
 /*