diff --git a/src/ec/lenovo/h8/acpi/ec.asl b/src/ec/lenovo/h8/acpi/ec.asl
index df19fb883c..4b3fb12154 100644
--- a/src/ec/lenovo/h8/acpi/ec.asl
+++ b/src/ec/lenovo/h8/acpi/ec.asl
@@ -97,35 +97,23 @@ Device(EC)
 		Notify(^SLPB, 0x80)
 	}
 
-#if IS_ENABLED (CONFIG_BOARD_LENOVO_X201)
 	/* Brightness up GPE */
 	Method(_Q14, 0, NotSerialized)
 	{
-		\_SB.PCI0.GFX0.LCD0.INCB()
+		BRIGHTNESS_UP()
 	}
 
 	/* Brightness down GPE */
 	Method(_Q15, 0, NotSerialized)
 	{
-		\_SB.PCI0.GFX0.LCD0.DECB()
+		BRIGHTNESS_DOWN()
 	}
 
+#ifdef ACPI_VIDEO_DEVICE
 	/* Next display GPE */
 	Method(_Q16, 0, NotSerialized)
 	{
-		Notify (\_SB.PCI0.GFX0, 0x82)
-	}
-#else
-	/* Brightness up GPE */
-	Method(_Q14, 0, NotSerialized)
-	{
-		\DSPC.BRTU ()
-	}
-
-	/* Brightness down GPE */
-	Method(_Q15, 0, NotSerialized)
-	{
-		\DSPC.BRTD()
+		Notify (ACPI_VIDEO_DEVICE, 0x82)
 	}
 #endif
 	/* AC status change: present */
diff --git a/src/mainboard/lenovo/t60/dsdt.asl b/src/mainboard/lenovo/t60/dsdt.asl
index 383bb30c35..842dbc3d72 100644
--- a/src/mainboard/lenovo/t60/dsdt.asl
+++ b/src/mainboard/lenovo/t60/dsdt.asl
@@ -20,6 +20,8 @@
  */
 
 #define THINKPAD_EC_GPE 28
+#define BRIGHTNESS_UP \DSPC.BRTU
+#define BRIGHTNESS_DOWN \DSPC.BRTD
 
 DefinitionBlock(
 	"dsdt.aml",
diff --git a/src/mainboard/lenovo/x60/dsdt.asl b/src/mainboard/lenovo/x60/dsdt.asl
index 383bb30c35..842dbc3d72 100644
--- a/src/mainboard/lenovo/x60/dsdt.asl
+++ b/src/mainboard/lenovo/x60/dsdt.asl
@@ -20,6 +20,8 @@
  */
 
 #define THINKPAD_EC_GPE 28
+#define BRIGHTNESS_UP \DSPC.BRTU
+#define BRIGHTNESS_DOWN \DSPC.BRTD
 
 DefinitionBlock(
 	"dsdt.aml",