5 files changed, 10 insertions, 28 deletions
diff --git a/keyboards/smithrune/iron165r2/config.h b/keyboards/smithrune/iron165r2/config.h
index d8e7bc64d8..9749d68d72 100644
--- a/keyboards/smithrune/iron165r2/config.h
+++ b/keyboards/smithrune/iron165r2/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_COL_PINS { A3 , B8 , B9 , B1 , B0 , B5 , B4 , B3 , A15, A8 , A1 , A0 , C15, C14, C13}
-#define MATRIX_ROW_PINS { B10, A10, A2 , A5 , A7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 
diff --git a/keyboards/smithrune/iron165r2/info.json b/keyboards/smithrune/iron165r2/info.json
index ed24e0e63c..35a2a0c4bd 100644
--- a/keyboards/smithrune/iron165r2/info.json
+++ b/keyboards/smithrune/iron165r2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1652",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A3", "B8", "B9", "B1", "B0", "B5", "B4", "B3", "A15", "A8", "A1", "A0", "C15", "C14", "C13"],
+        "rows": ["B10", "A10", "A2", "A5", "A7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "A4"
     },
diff --git a/keyboards/smithrune/iron180/config.h b/keyboards/smithrune/iron180/config.h
index 92c28d5719..7506922b00 100644
--- a/keyboards/smithrune/iron180/config.h
+++ b/keyboards/smithrune/iron180/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define MATRIX_COL_PINS { B7 , B6 , B5 , B4 , B3 , A10, A9 , A8 , B15, B14, B13, B12, B11, B2 , A4 , B1 , A3 }
-#define MATRIX_ROW_PINS { B9 , B8 , A15, B0 , A7 , A5 }
-#define DIODE_DIRECTION COL2ROW
-
 #define BACKLIGHT_PWM_DRIVER    PWMD3
 #define BACKLIGHT_PWM_CHANNEL   1
 #define BACKLIGHT_PAL_MODE      1
diff --git a/keyboards/smithrune/iron180/info.json b/keyboards/smithrune/iron180/info.json
index 0f8c436240..17febf6be5 100644
--- a/keyboards/smithrune/iron180/info.json
+++ b/keyboards/smithrune/iron180/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1180",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B7", "B6", "B5", "B4", "B3", "A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B2", "A4", "B1", "A3"],
+        "rows": ["B9", "B8", "A15", "B0", "A7", "A5"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "A6",
         "levels": 6,
diff --git a/keyboards/smithrune/iron180/iron180.c b/keyboards/smithrune/iron180/iron180.c
deleted file mode 100644
index 236f8176f6..0000000000
--- a/keyboards/smithrune/iron180/iron180.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.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/>.
-*/
-
-#include "iron180.h"