9 files changed, 7 insertions, 11 deletions
diff --git a/keyboards/tzarc/djinn/config.h b/keyboards/tzarc/djinn/config.h
index 005784b98d..9ef23769f1 100644
--- a/keyboards/tzarc/djinn/config.h
+++ b/keyboards/tzarc/djinn/config.h
@@ -1,7 +1,6 @@
 // Copyright 2018-2022 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
-#include "config_common.h"
 
 // Encoders -- right-side is reversed
 #define ENCODERS_PAD_A \
diff --git a/keyboards/tzarc/djinn/info.json b/keyboards/tzarc/djinn/info.json
index 959663a6d6..08634983c8 100644
--- a/keyboards/tzarc/djinn/info.json
+++ b/keyboards/tzarc/djinn/info.json
@@ -9,7 +9,6 @@
   "build": {
     "lto": true
   },
-  "debounce": 5,
   "features": {
     "audio": true,
     "backlight": true,
diff --git a/keyboards/tzarc/ghoul/config.h b/keyboards/tzarc/ghoul/config.h
index 57068ef6cb..e08b8beee3 100644
--- a/keyboards/tzarc/ghoul/config.h
+++ b/keyboards/tzarc/ghoul/config.h
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "config_common.h"
 
 // Matrix
 #define MATRIX_SHIFT_REGISTER_COUNT 5
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/config.h b/keyboards/tzarc/ghoul/rev1/rp2040/config.h
index c428b26606..1a101d5dc4 100644
--- a/keyboards/tzarc/ghoul/rev1/rp2040/config.h
+++ b/keyboards/tzarc/ghoul/rev1/rp2040/config.h
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "config_common.h"
 
 // Matrix configuration
 #define SPI_MATRIX_CHIP_SELECT_PIN GP21
@@ -28,8 +27,8 @@
 #define RGB_ENABLE_PIN GP6
 
 // ADC Configuration
-#define ADC_RESOLUTION ? ? ? // ADC_CFGR1_RES_12BIT // TBD when RP2040 has analog support
-#define ADC_SATURATION ? ? ? // ((1 << 12) - 1) // TBD when RP2040 has analog support
+#define ADC_RESOLUTION 12
+#define ADC_SATURATION ((1 << 12) - 1)
 #define ADC_CURRENT_PIN GP26
 #define ADC_VOLTAGE_PIN GP27
 
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/halconf.h b/keyboards/tzarc/ghoul/rev1/rp2040/halconf.h
index a22be02412..73389ef1b1 100644
--- a/keyboards/tzarc/ghoul/rev1/rp2040/halconf.h
+++ b/keyboards/tzarc/ghoul/rev1/rp2040/halconf.h
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-//#define HAL_USE_ADC TRUE
+#define HAL_USE_ADC TRUE
 #define HAL_USE_SPI TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/mcuconf.h b/keyboards/tzarc/ghoul/rev1/rp2040/mcuconf.h
index abd4e19f7c..19d7f9be0e 100644
--- a/keyboards/tzarc/ghoul/rev1/rp2040/mcuconf.h
+++ b/keyboards/tzarc/ghoul/rev1/rp2040/mcuconf.h
@@ -5,8 +5,8 @@
 #include_next <mcuconf.h>
 
 // Used for RGB
-//#undef RP_ADC_USE_ADC1
-//#define RP_ADC_USE_ADC1 TRUE
+#undef RP_ADC_USE_ADC1
+#define RP_ADC_USE_ADC1 TRUE
 
 // Used for EEPROM
 #undef RP_SPI_USE_SPI0
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/config.h b/keyboards/tzarc/ghoul/rev1/stm32/config.h
index b9059f1837..53a370437d 100644
--- a/keyboards/tzarc/ghoul/rev1/stm32/config.h
+++ b/keyboards/tzarc/ghoul/rev1/stm32/config.h
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "config_common.h"
 
 // Matrix configuration
 #define SPI_MATRIX_CHIP_SELECT_PIN C4
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/rules.mk b/keyboards/tzarc/ghoul/rev1/stm32/rules.mk
index 69d4b426e1..c1285e300c 100644
--- a/keyboards/tzarc/ghoul/rev1/stm32/rules.mk
+++ b/keyboards/tzarc/ghoul/rev1/stm32/rules.mk
@@ -1,2 +1 @@
 WS2812_DRIVER = pwm
-SRC += analog.c
diff --git a/keyboards/tzarc/ghoul/rules.mk b/keyboards/tzarc/ghoul/rules.mk
index a56726860d..a18cf56fce 100644
--- a/keyboards/tzarc/ghoul/rules.mk
+++ b/keyboards/tzarc/ghoul/rules.mk
@@ -5,3 +5,5 @@ QUANTUM_PAINTER_DRIVERS = ssd1351_spi
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 
 DEFAULT_FOLDER = tzarc/ghoul/rev1/stm32
+
+SRC += analog.c