fix(kscan): Adjust composite kscan priority

* Composite kscan needs a dedicated priority to be sure it is initialized after the other kscan instances.
petejohanson · Nov 13, 2023 · c8d59fd · c8d59fd
1 parent 41cb58c
commit c8d59fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/module/drivers/kscan/Kconfig b/app/module/drivers/kscan/Kconfig
@@ -13,6 +13,14 @@ config ZMK_KSCAN_COMPOSITE_DRIVER
     bool
     default $(dt_compat_enabled,$(DT_COMPAT_ZMK_KSCAN_COMPOSITE))
 
+if ZMK_KSCAN_COMPOSITE_DRIVER
+
+config ZMK_KSCAN_COMPOSITE_INIT_PRIORITY
+    int "Init Priority for the composite kscan driver"
+    default 95
+
+endif
+
 config ZMK_KSCAN_GPIO_DRIVER
     bool
     select GPIO

diff --git a/app/module/drivers/kscan/kscan_composite.c b/app/module/drivers/kscan/kscan_composite.c
@@ -109,4 +109,4 @@ static const struct kscan_composite_config kscan_composite_config = {};
 static struct kscan_composite_data kscan_composite_data;
 
 DEVICE_DT_INST_DEFINE(0, kscan_composite_init, NULL, &kscan_composite_data, &kscan_composite_config,
-                      POST_KERNEL, CONFIG_KSCAN_INIT_PRIORITY, &mock_driver_api);
+                      POST_KERNEL, CONFIG_ZMK_KSCAN_COMPOSITE_INIT_PRIORITY, &mock_driver_api);