4 files changed, 10 insertions, 31 deletions
diff --git a/keyboards/sam/s80/config.h b/keyboards/sam/s80/config.h
index 0a235bd36c..3d6d768957 100644
--- a/keyboards/sam/s80/config.h
+++ b/keyboards/sam/s80/config.h
@@ -16,22 +16,6 @@
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-
-#define DIODE_DIRECTION ROW2COL
-
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 20
diff --git a/keyboards/sam/s80/info.json b/keyboards/sam/s80/info.json
index ab0cde43a1..dd03cf3098 100644
--- a/keyboards/sam/s80/info.json
+++ b/keyboards/sam/s80/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3830",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+        "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
+    },
+    "diode_direction": "ROW2COL",
     "backlight": {
         "pin": "B6"
     },
diff --git a/keyboards/sam/sg81m/config.h b/keyboards/sam/sg81m/config.h
index 7cfba55dc8..946649d038 100644
--- a/keyboards/sam/sg81m/config.h
+++ b/keyboards/sam/sg81m/config.h
@@ -16,21 +16,6 @@
 
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { B7, B6, B5, B4, C7, C6, D0, D1, D2, D3, D4, D5, D6, D7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN E6 //reserved pin for potential underglow rgb
 #ifdef RGB_DI_PIN
     #define RGBLED_NUM 10
diff --git a/keyboards/sam/sg81m/info.json b/keyboards/sam/sg81m/info.json
index ebf5dda947..9f741abeff 100644
--- a/keyboards/sam/sg81m/info.json
+++ b/keyboards/sam/sg81m/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3831",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "B6", "B5", "B4", "C7", "C6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "B0"
     },