USB UAC2 cherry-picks

drivers/clock_control/clock_control_nrf.c

@@ -329,6 +329,18 @@
 	nrfx_clock_hfclk_stop();
 }
 
+#if NRF_CLOCK_HAS_HFCLK24M
+static void hfclk24m_start(void)
+{
+	nrfx_clock_start(NRF_CLOCK_DOMAIN_HFCLK24M);
+}
+
+static void hfclk24m_stop(void)
+{
+	nrfx_clock_stop(NRF_CLOCK_DOMAIN_HFCLK24M);
+}
+#endif
+
 #if NRF_CLOCK_HAS_HFCLK192M
 static void hfclk192m_start(void)
 {
@@ -714,7 +726,11 @@
 		break;
 	}
 #endif
-
+#if NRF_CLOCK_HAS_HFCLK24M
+	case NRFX_CLOCK_EVT_HFCLK24M_STARTED:
+		clkstarted_handle(dev, CLOCK_CONTROL_NRF_TYPE_HFCLK24M);
+		break;
+#endif
 #if NRF_CLOCK_HAS_HFCLK192M
 	case NRFX_CLOCK_EVT_HFCLK192M_STARTED:
 		clkstarted_handle(dev, CLOCK_CONTROL_NRF_TYPE_HFCLK192M);
@@ -843,6 +859,13 @@
 			.stop = lfclk_stop,
 			IF_ENABLED(CONFIG_LOG, (.name = "lfclk",))
 		},
+#if NRF_CLOCK_HAS_HFCLK24M
+		[CLOCK_CONTROL_NRF_TYPE_HFCLK24M] = {
+			.start = hfclk24m_start,
+			.stop = hfclk24m_stop,
+			IF_ENABLED(CONFIG_LOG, (.name = "hfclk24m",))
+		},
+#endif
 #if NRF_CLOCK_HAS_HFCLK192M
 		[CLOCK_CONTROL_NRF_TYPE_HFCLK192M] = {
 			.start = hfclk192m_start,
@@ -859,7 +882,7 @@
 #endif
 	}
 };
 
 DEVICE_DT_DEFINE(DT_NODELABEL(clock), clk_init, NULL,
 		 &data, &config,
 		 PRE_KERNEL_1, CONFIG_CLOCK_CONTROL_INIT_PRIORITY,

drivers/usb/udc/Kconfig

@@ -42,6 +42,12 @@ config UDC_BUF_FORCE_NOCACHE
 	  Place the buffer pools in the nocache memory region if the driver
 	  cannot handle buffers in cached memory.
 
+config UDC_ENABLE_SOF
+	bool "SOF interrupt processing"
+	help
+	  Enabled SoF interrupts can cause a very high CPU load on high-speed
+	  controllers because the interrupt rate would be 125 µs.
+
 config UDC_WORKQUEUE
 	bool "Use a dedicate work queue for UDC drivers"
 	help

drivers/usb/udc/udc_ambiq.c

@@ -156,9 +156,10 @@
 	case AM_HAL_USB_DEV_EVT_BUS_RESET:
 		/* enable usb bus interrupts */
 		am_hal_usb_intr_usb_enable(priv->usb_handle,
-					   USB_CFG2_SOFE_Msk | USB_CFG2_ResumeE_Msk |
-						   USB_CFG2_SuspendE_Msk | USB_CFG2_ResetE_Msk);
+					   IF_ENABLED(CONFIG_UDC_ENABLE_SOF, (USB_CFG2_SOFE_Msk |))
+					   USB_CFG2_ResumeE_Msk |
+					   USB_CFG2_SuspendE_Msk | USB_CFG2_ResetE_Msk);
 		/* init the endpoint */
 		am_hal_usb_ep_init(priv->usb_handle, 0, 0, EP0_MPS);
 		/* Set USB device speed to HAL */
 		am_hal_usb_set_dev_speed(priv->usb_handle, priv->usb_speed);
@@ -174,7 +175,7 @@
 		udc_submit_event(dev, UDC_EVT_RESUME, 0);
 		break;
 	case AM_HAL_USB_DEV_EVT_SOF:
-		udc_submit_event(dev, UDC_EVT_SOF, 0);
+		udc_submit_sof_event(dev);
 		break;
 	case AM_HAL_USB_DEV_EVT_SUSPEND:
 		/* Handle USB Suspend event, then set device state to suspended */

drivers/usb/udc/udc_common.h

@@ -156,6 +156,29 @@ int udc_submit_event(const struct device *dev,
 int udc_submit_ep_event(const struct device *dev,
 			struct net_buf *const buf,
 			const int err);
+
+/**
+ * @brief Helper function to send UDC SOF event to a higher level.
+ *
+ * Type of this event is hardcoded to UDC_EVT_SOF.
+ *
+ * @param[in] dev    Pointer to device struct of the driver instance
+ */
+#if defined(CONFIG_UDC_ENABLE_SOF)
+static inline void udc_submit_sof_event(const struct device *dev)
+{
+	struct udc_data *data = dev->data;
+	struct udc_event drv_evt = {
+		.type = UDC_EVT_SOF,
+		.dev = dev,
+	};
+
+	(void)data->event_cb(dev, &drv_evt);
+}
+#else
+#define udc_submit_sof_event(dev) ARG_UNUSED(dev)
+#endif
+
 /**
  * @brief Helper function to enable endpoint.
  *