10 files changed, 15 insertions, 104 deletions
diff --git a/keyboards/handwired/uthol/config.h b/keyboards/handwired/uthol/config.h
deleted file mode 100644
index 5e6816b6b0..0000000000
--- a/keyboards/handwired/uthol/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2022 Uthol
- *
- * 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
-
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/uthol/rev1/config.h b/keyboards/handwired/uthol/rev1/config.h
deleted file mode 100644
index b5e17a0fe3..0000000000
--- a/keyboards/handwired/uthol/rev1/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2022 Uthol
- *
- * 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
-
-
-/* Uthol PCB default pin-out */
-#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
-#define MATRIX_COL_PINS { D3, B6, B2, B3, B1, F7, F6, F5, F4, B5, B4, D2 }
diff --git a/keyboards/handwired/uthol/rev1/info.json b/keyboards/handwired/uthol/rev1/info.json
index 1a0047080a..02802966b2 100644
--- a/keyboards/handwired/uthol/rev1/info.json
+++ b/keyboards/handwired/uthol/rev1/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "B5", "B4", "D2"],
+        "rows": ["D1", "D0", "D4", "C6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/handwired/uthol/rev2/config.h b/keyboards/handwired/uthol/rev2/config.h
index dd132283c3..744e66d948 100644
--- a/keyboards/handwired/uthol/rev2/config.h
+++ b/keyboards/handwired/uthol/rev2/config.h
@@ -17,11 +17,6 @@
 
 #pragma once
 
-
-/* Uthol PCB default pin-out */
-#define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, B5, B4, B6, B2, B3 }
-
 //RGB Stuff
 #define RGB_DI_PIN E6
 #define RGBLED_NUM 39
diff --git a/keyboards/handwired/uthol/rev2/info.json b/keyboards/handwired/uthol/rev2/info.json
index 95112123d5..bcefbb4956 100644
--- a/keyboards/handwired/uthol/rev2/info.json
+++ b/keyboards/handwired/uthol/rev2/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "B5", "B4", "B6", "B2", "B3"],
+        "rows": ["B1", "F7", "F6", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/handwired/uthol/rev3/config.h b/keyboards/handwired/uthol/rev3/config.h
index 1e6b532e2a..d7829f2fdc 100644
--- a/keyboards/handwired/uthol/rev3/config.h
+++ b/keyboards/handwired/uthol/rev3/config.h
@@ -17,14 +17,6 @@
 
 #pragma once
 
-
-/* key matrix size */
-// A11 and A12 dont work. They are reserved for USB. B2 is reserved for BOOT1
-#define MATRIX_COL_PINS \
-    { B1, B10, B9, B8, B5, B4, B3, A15, B15, B14, B13, B12 }
-#define MATRIX_ROW_PINS \
-    { A4, A3, A2, A1, A0 }
-
 // OLED config
 #define OLED_DISPLAY_128X64
 #define OLED_DISPLAY_WIDTH 128
diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/info.json
index b5d099b27a..34c0a3503a 100644
--- a/keyboards/handwired/uthol/rev3/info.json
+++ b/keyboards/handwired/uthol/rev3/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B10", "B9", "B8", "B5", "B4", "B3", "A15", "B15", "B14", "B13", "B12"],
+        "rows": ["A4", "A3", "A2", "A1", "A0"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C15", "pin_b": "C14", "resolution": 2}
diff --git a/keyboards/handwired/uthol/rev3/rev3.c b/keyboards/handwired/uthol/rev3/rev3.c
deleted file mode 100644
index 6c06387ee8..0000000000
--- a/keyboards/handwired/uthol/rev3/rev3.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2022 Uthol
- *
- * 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 QMK_KEYBOARD_H
diff --git a/keyboards/handwired/uthol/uthol.c b/keyboards/handwired/uthol/uthol.c
deleted file mode 100644
index 2b02e899d4..0000000000
--- a/keyboards/handwired/uthol/uthol.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2022 Uthol
- *
- * 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 "uthol.h"
diff --git a/keyboards/handwired/uthol/uthol.h b/keyboards/handwired/uthol/uthol.h
index 3e1cbdc72b..6130f7f1b2 100644
--- a/keyboards/handwired/uthol/uthol.h
+++ b/keyboards/handwired/uthol/uthol.h
@@ -19,17 +19,6 @@
 
 #include "quantum.h"
 
-/**************************************************
-** Include headers specific to keyboard revision **
-**************************************************/
-#if defined(KEYBOARD_uthol_rev1)
-#    include "rev1.h"
-#elif defined(KEYBOARD_uthol_rev2)
-#    include "rev2.h"
-#elif defined(KEYBOARD_uthol_rev2)
-#    include "rev3.h"
-#endif
-
 #define LAYOUT( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \