11 files changed, 25 insertions, 43 deletions
diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h
index c633d722a0..8188418469 100644
--- a/keyboards/gmmk/pro/config.h
+++ b/keyboards/gmmk/pro/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS \
-    { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10 }
-#define MATRIX_COL_PINS \
-    { A0, A1, A2, A3, A4, A8, A9, A10 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAP_CODE_DELAY 10
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/gmmk/pro/pro.c b/keyboards/gmmk/pro/pro.c
index 6aed1d6e18..3df15d71f2 100644
--- a/keyboards/gmmk/pro/pro.c
+++ b/keyboards/gmmk/pro/pro.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "pro.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/gmmk/pro/pro.h b/keyboards/gmmk/pro/pro.h
deleted file mode 100644
index c83d6c99c5..0000000000
--- a/keyboards/gmmk/pro/pro.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_gmmk_pro_rev1_ansi)
-#    include "rev1/ansi/ansi.h"
-#elif defined(KEYBOARD_gmmk_pro_rev1_iso)
-#    include "rev1/iso/iso.h"
-#elif defined(KEYBOARD_gmmk_pro_rev2_ansi)
-#    include "rev2/ansi/ansi.h"
-#elif defined(KEYBOARD_gmmk_pro_rev2_iso)
-#    include "rev2/iso/iso.h"
-#endif  // GMMK Pro revisions
diff --git a/keyboards/gmmk/pro/rev1/ansi/ansi.h b/keyboards/gmmk/pro/rev1/ansi/ansi.h
index ab08d66592..9a6ae0f49e 100644
--- a/keyboards/gmmk/pro/rev1/ansi/ansi.h
+++ b/keyboards/gmmk/pro/rev1/ansi/ansi.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "pro.h"
+#include "quantum.h"
 
 #define ___ KC_NO
 
diff --git a/keyboards/gmmk/pro/rev1/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/info.json
index b8a7e94a82..7e66ad5043 100644
--- a/keyboards/gmmk/pro/rev1/ansi/info.json
+++ b/keyboards/gmmk/pro/rev1/ansi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5044",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C15", "pin_b": "C14"}
diff --git a/keyboards/gmmk/pro/rev1/iso/info.json b/keyboards/gmmk/pro/rev1/iso/info.json
index 48181ec488..082f28a774 100644
--- a/keyboards/gmmk/pro/rev1/iso/info.json
+++ b/keyboards/gmmk/pro/rev1/iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5044",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C15", "pin_b": "C14"}
diff --git a/keyboards/gmmk/pro/rev1/iso/iso.h b/keyboards/gmmk/pro/rev1/iso/iso.h
index 353bcbe875..ad3b46cb97 100644
--- a/keyboards/gmmk/pro/rev1/iso/iso.h
+++ b/keyboards/gmmk/pro/rev1/iso/iso.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "pro.h"
+#include "quantum.h"
 
 #define ___ KC_NO
 
diff --git a/keyboards/gmmk/pro/rev2/ansi/ansi.h b/keyboards/gmmk/pro/rev2/ansi/ansi.h
index 2f8a28b940..b4a67dfd18 100644
--- a/keyboards/gmmk/pro/rev2/ansi/ansi.h
+++ b/keyboards/gmmk/pro/rev2/ansi/ansi.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "pro.h"
+#include "quantum.h"
 
 #define ___ KC_NO
 
diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/info.json
index a8a25f8547..0a20c97d2e 100644
--- a/keyboards/gmmk/pro/rev2/ansi/info.json
+++ b/keyboards/gmmk/pro/rev2/ansi/info.json
@@ -8,6 +8,11 @@
        "pid": "0x5044",
        "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C15", "pin_b": "C14"}
diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/info.json
index c37ccd53df..e3cb707c48 100644
--- a/keyboards/gmmk/pro/rev2/iso/info.json
+++ b/keyboards/gmmk/pro/rev2/iso/info.json
@@ -8,6 +8,11 @@
        "pid": "0x5044",
        "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C15", "pin_b": "C14"}
diff --git a/keyboards/gmmk/pro/rev2/iso/iso.h b/keyboards/gmmk/pro/rev2/iso/iso.h
index a5844e10eb..3c1291ff1b 100644
--- a/keyboards/gmmk/pro/rev2/iso/iso.h
+++ b/keyboards/gmmk/pro/rev2/iso/iso.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "pro.h"
+#include "quantum.h"
 
 #define ___ KC_NO