Force backlight on when led matrix is enabled

diff --git a/common_features.mk b/common_features.mk
index ff01ecb85df88e20619047edf398be5b87501bbb..b5fdb404bb2b3b044e7c20c8739a2138a55ab9e6 100644 (file)
--- a/common_features.mk
+++ b/common_features.mk
@@ -118,12 +118,13 @@ VALID_MATRIX_TYPES := yes IS31FL3731 IS31FL3733 custom
 
 LED_MATRIX_ENABLE ?= no
 ifneq ($(strip $(LED_MATRIX_ENABLE)), no)
-ifeq ($(filter $(LED_MATRIX_ENABLE),$(VALID_MATRIX_TYPES)),)
-    $(error LED_MATRIX_ENABLE="$(LED_MATRIX_ENABLE)" is not a valid matrix type)
-endif
-    OPT_DEFS += -DLED_MATRIX_ENABLE
-    SRC += $(QUANTUM_DIR)/led_matrix.c
-    SRC += $(QUANTUM_DIR)/led_matrix_drivers.c
+    ifeq ($(filter $(LED_MATRIX_ENABLE),$(VALID_MATRIX_TYPES)),)
+        $(error LED_MATRIX_ENABLE="$(LED_MATRIX_ENABLE)" is not a valid matrix type)
+    else
+        OPT_DEFS += -DLED_MATRIX_ENABLE -DBACKLIGHT_ENABLE -DBACKLIGHT_CUSTOM_DRIVER
+        SRC += $(QUANTUM_DIR)/led_matrix.c
+        SRC += $(QUANTUM_DIR)/led_matrix_drivers.c
+    endif
 endif
 
 ifeq ($(strip $(LED_MATRIX_ENABLE)), IS31FL3731)
@@ -212,9 +213,6 @@ ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
     ifeq ($(strip $(BACKLIGHT_CUSTOM_DRIVER)), yes)
         OPT_DEFS += -DBACKLIGHT_CUSTOM_DRIVER
     endif
-    ifeq ($(filter $(LED_MATRIX_ENABLE),$(VALID_MATRIX_TYPES)),)
-        OPT_DEFS += -DBACKLIGHT_CUSTOM_DRIVER
-    endif
 endif
 
 ifeq ($(strip $(CIE1931_CURVE)), yes)