2 files changed, 6 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c
index 33cf61d..8604989 100644
--- a/src/main.c
+++ b/src/main.c
@@ -8,14 +8,16 @@
 #include <device.h>
 #include <devicetree.h>
 
+#include "zmk.h"
 #include "kscan.h"
 #include "usb_hid.h"
 
+#define ZMK_KSCAN_DEV DT_LABEL(ZMK_MATRIX_NODE_ID)
 void main(void)
 {
 	printk("Welcome to ZMK!\n");
 
-	if (zmk_kscan_init(CONFIG_KSCAN_MATRIX_DEV_NAME) != 0) {
+	if (zmk_kscan_init(ZMK_KSCAN_DEV) != 0) {
 		printk("Keyboard Scan Init Failed\n");
 		return;
 	}
diff --git a/src/zmk.h b/src/zmk.h
index a5a5ff1..82ef3b6 100644
--- a/src/zmk.h
+++ b/src/zmk.h
@@ -1,8 +1,8 @@
 #ifndef ZMK_H
 #define ZMK_H
 
-#define __ZMK_MATRIX_NODE_ID DT_PATH(kscan)
-#define ZMK_MATRIX_ROWS DT_PROP_LEN(__ZMK_MATRIX_NODE_ID,row_gpios)
-#define ZMK_MATRIX_COLS DT_PROP_LEN(__ZMK_MATRIX_NODE_ID,col_gpios)
+#define ZMK_MATRIX_NODE_ID DT_CHOSEN(zmk_kscan)
+#define ZMK_MATRIX_ROWS DT_PROP_LEN(ZMK_MATRIX_NODE_ID,row_gpios)
+#define ZMK_MATRIX_COLS DT_PROP_LEN(ZMK_MATRIX_NODE_ID,col_gpios)
 
 #endif