10 files changed, 20 insertions, 49 deletions
diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h
index ff49f9aac5..77077bad34 100644
--- a/keyboards/matrix/cain_re/config.h
+++ b/keyboards/matrix/cain_re/config.h
@@ -19,14 +19,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F0, C7, C6, D5, D2, D4, D7, B7, D1 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6, B5, B6, B3, B2, B1, D0, B4, D6}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN E6
 
 #ifdef RGB_DI_PIN
diff --git a/keyboards/matrix/cain_re/info.json b/keyboards/matrix/cain_re/info.json
index 84b8dc38eb..b5020cb3db 100644
--- a/keyboards/matrix/cain_re/info.json
+++ b/keyboards/matrix/cain_re/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0106",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5", "F6", "B5", "B6", "B3", "B2", "B1", "D0", "B4", "D6"],
+        "rows": ["F0", "C7", "C6", "D5", "D2", "D4", "D7", "B7", "D1"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/matrix/falcon/config.h b/keyboards/matrix/falcon/config.h
index ea2e015af4..21177855ec 100644
--- a/keyboards/matrix/falcon/config.h
+++ b/keyboards/matrix/falcon/config.h
@@ -15,12 +15,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F1, B7, F7, F5, F4}
-#define MATRIX_COL_PINS { F6, B3, B2, B1, B0, C7, C6, B6, B5, B4, D7, D6, D4}
-
-#define DIODE_DIRECTION ROW2COL
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/matrix/falcon/info.json b/keyboards/matrix/falcon/info.json
index e52ffa1c74..c692e1c4ee 100644
--- a/keyboards/matrix/falcon/info.json
+++ b/keyboards/matrix/falcon/info.json
@@ -8,6 +8,11 @@
         "pid": "0x474E",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F6", "B3", "B2", "B1", "B0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F1", "B7", "F7", "F5", "F4"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "E2"
     },
diff --git a/keyboards/matrix/m12og/rev2/config.h b/keyboards/matrix/m12og/rev2/config.h
index 9df2a43d50..415ab3dbdd 100644
--- a/keyboards/matrix/m12og/rev2/config.h
+++ b/keyboards/matrix/m12og/rev2/config.h
@@ -4,14 +4,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { E6, F0, B7, C7, D3, B0, D1 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, B6, B5, B4, D7, D0, D2, D6, D4, D5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN B3
 
 #ifdef RGB_DI_PIN
diff --git a/keyboards/matrix/m12og/rev2/info.json b/keyboards/matrix/m12og/rev2/info.json
index af7e96d719..1036980434 100644
--- a/keyboards/matrix/m12og/rev2/info.json
+++ b/keyboards/matrix/m12og/rev2/info.json
@@ -8,6 +8,11 @@
     "pid": "0x8712",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D0", "D2", "D6", "D4", "D5"],
+    "rows": ["E6", "F0", "B7", "C7", "D3", "B0", "D1"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
diff --git a/keyboards/matrix/me/config.h b/keyboards/matrix/me/config.h
index 69b54b5bd0..487bdb7dea 100644
--- a/keyboards/matrix/me/config.h
+++ b/keyboards/matrix/me/config.h
@@ -15,11 +15,6 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS {D3, D5, D4, D6, B5, B4}
-#define MATRIX_COL_PINS {B7, B3, B2, B1, B0, F0, F1, F4, F5, F6, F7, C7, C6, B6, D7}
-#define DIODE_DIRECTION COL2ROW
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/matrix/me/info.json b/keyboards/matrix/me/info.json
index cfe0ad22d4..ecf1640811 100644
--- a/keyboards/matrix/me/info.json
+++ b/keyboards/matrix/me/info.json
@@ -8,6 +8,11 @@
     "pid": "0x454D",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B7", "B3", "B2", "B1", "B0", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "D7"],
+    "rows": ["D3", "D5", "D4", "D6", "B5", "B4"]
+  },
+  "diode_direction": "COL2ROW",
   "indicators": {
     "caps_lock": "E6",
     "scroll_lock": "D2"
diff --git a/keyboards/matrix/me/me.c b/keyboards/matrix/me/me.c
deleted file mode 100644
index c99f26e623..0000000000
--- a/keyboards/matrix/me/me.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * me.c
- *
-  Copyright 2021 astro 
-    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/>.
- */
-
-#include "me.h"
diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h
index a5688556f2..d5e609918f 100644
--- a/keyboards/matrix/noah/config.h
+++ b/keyboards/matrix/noah/config.h
@@ -11,11 +11,6 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 
-#define MATRIX_ROW_PINS {  B0,  A1, C14, C13,  A0}
-#define MATRIX_COL_PINS { C15, B10,  B7,  B6,  B5,  B4, A15, A10,  A9,  A8, B15, B14, B13, B12,  B2}
-
-#define DIODE_DIRECTION COL2ROW
-
 // i2c setting
 #define I2C1_SCL_PIN B8
 #define I2C1_SDA_PIN B9