From d1950c4a64333b2477374a8c14c8da3cdb6f525c Mon Sep 17 00:00:00 2001
From: Peter Johanson <peter@peterjohanson.com>
Date: Fri, 13 Jun 2025 02:02:44 -0600
Subject: [PATCH] fix(usb): Adjust Kconfig settings for USB.

* Ensure USB isn't initialized automatically before we do, which can
  happen if USB CDC logging is used/enabled for a given board.
* Adjust USB HID to initialize the USB class/interface before we enable
  the USB device itself.
---
 app/Kconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Kconfig b/app/Kconfig
index eec04d8c5..d0ae48c07 100644
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -131,6 +131,9 @@ config ZMK_USB_BOOT
     select USB_HID_BOOT_PROTOCOL
     select USB_DEVICE_SOF
 
+config USB_DEVICE_INITIALIZE_AT_BOOT
+    default n
+
 if ZMK_USB
 
 config USB_NUMOF_EP_WRITE_RETRIES
@@ -482,7 +485,7 @@ if USB_DEVICE_STACK
 
 config ZMK_USB_INIT_PRIORITY
     int "USB Init Priority"
-    default 94
+    default 96
 
 config ZMK_USB_HID_INIT_PRIORITY
     int "USB HID Init Priority"