7 files changed, 10 insertions, 16 deletions
diff --git a/keyboards/rgbkb/sol/config.h b/keyboards/rgbkb/sol/config.h
index b2e5f2b0d3..5c327fd760 100644
--- a/keyboards/rgbkb/sol/config.h
+++ b/keyboards/rgbkb/sol/config.h
@@ -23,13 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define EE_HANDS
 
-#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, E6}
-
-// wiring of each half
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef IOS_DEVICE_ENABLE
   #define RGBLIGHT_LIMIT_VAL 40
   #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 40
diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json
index eb742972b1..dfaedb6cff 100644
--- a/keyboards/rgbkb/sol/rev1/info.json
+++ b/keyboards/rgbkb/sol/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3060",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
+        "rows": ["C6", "B6", "B5", "B4", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D2", "pin_b": "D6"}
diff --git a/keyboards/rgbkb/sol/rev1/rev1.h b/keyboards/rgbkb/sol/rev1/rev1.h
deleted file mode 100644
index 6f70f09bee..0000000000
--- a/keyboards/rgbkb/sol/rev1/rev1.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json
index 264f21d02b..e60042b2c2 100644
--- a/keyboards/rgbkb/sol/rev2/info.json
+++ b/keyboards/rgbkb/sol/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3060",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
+        "rows": ["C6", "B6", "B5", "B4", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D3"
     },
diff --git a/keyboards/rgbkb/sol/rev2/rev2.h b/keyboards/rgbkb/sol/rev2/rev2.h
deleted file mode 100644
index 6f70f09bee..0000000000
--- a/keyboards/rgbkb/sol/rev2/rev2.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/keyboards/rgbkb/sol/sol.c b/keyboards/rgbkb/sol/sol.c
deleted file mode 100644
index 5945cc60a4..0000000000
--- a/keyboards/rgbkb/sol/sol.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "sol.h"
diff --git a/keyboards/rgbkb/sol/sol.h b/keyboards/rgbkb/sol/sol.h
index e885dc78c4..695dc6db61 100644
--- a/keyboards/rgbkb/sol/sol.h
+++ b/keyboards/rgbkb/sol/sol.h
@@ -1,12 +1,6 @@
 #pragma once
 
 #include "quantum.h"
-#ifdef KEYBOARD_rgbkb_sol_rev1
-#include "rev1.h"
-#else
-#include "rev2.h"
-#endif
-
 
 #define LAYOUT( \
   L00, L01, L02, L03, L04, L05, L06, R06, R00, R01, R02, R03, R04, R05, \