diff --git a/keyboards/skyloong/gk61/pro/keymaps/via/keymap.c b/keyboards/skyloong/gk61/pro/keymaps/via/keymap.c
index d0d3e0696c0..079f6a7f426 100644
--- a/keyboards/skyloong/gk61/pro/keymaps/via/keymap.c
+++ b/keyboards/skyloong/gk61/pro/keymaps/via/keymap.c
@@ -2,14 +2,12 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H
-
 enum layer_names {
     _WIN,
     _WIN_LOCK,
     _MAC,
     _INDEX1
 };
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /*
      * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
diff --git a/keyboards/skyloong/gk61/pro/keymaps/via/rules.mk b/keyboards/skyloong/gk61/pro/keymaps/via/rules.mk
index 1e5b99807cb..f1adcab005e 100644
--- a/keyboards/skyloong/gk61/pro/keymaps/via/rules.mk
+++ b/keyboards/skyloong/gk61/pro/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/lib/chibios-contrib b/lib/chibios-contrib
index 5d2d95c520a..a224be155ae 160000
--- a/lib/chibios-contrib
+++ b/lib/chibios-contrib
@@ -1 +1 @@
-Subproject commit 5d2d95c520a13d2c3e42343f51b18822d63781d6
+Subproject commit a224be155ae18d38deccf33a6c1d259b9a5ad8d3