fix(p4_usb): p4 tinyusb device phy init

Author: lijunru-hub

components/audio/pwm_audio/pwm_audio.c

@@ -1,4 +1,4 @@
-/* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
+/* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -475,18 +475,12 @@ esp_err_t pwm_audio_init(const pwm_audio_config_t *cfg)
     /**
      * Get the address of LEDC register to reduce the addressing time
      */
-    g_ledc_left_duty_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].\
-                           channel[handle->ledc_channel[CHANNEL_LEFT_INDEX].channel].duty.val;
-    g_ledc_left_conf0_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].\
-                            channel[handle->ledc_channel[CHANNEL_LEFT_INDEX].channel].conf0.val;
-    g_ledc_left_conf1_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].\
-                            channel[handle->ledc_channel[CHANNEL_LEFT_INDEX].channel].conf1.val;
-    g_ledc_right_duty_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].\
-                            channel[handle->ledc_channel[CHANNEL_RIGHT_INDEX].channel].duty.val;
-    g_ledc_right_conf0_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].\
-                             channel[handle->ledc_channel[CHANNEL_RIGHT_INDEX].channel].conf0.val;
-    g_ledc_right_conf1_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].\
-                             channel[handle->ledc_channel[CHANNEL_RIGHT_INDEX].channel].conf1.val;
+    g_ledc_left_duty_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].channel[handle->ledc_channel[CHANNEL_LEFT_INDEX].channel].duty.val;
+    g_ledc_left_conf0_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].channel[handle->ledc_channel[CHANNEL_LEFT_INDEX].channel].conf0.val;
+    g_ledc_left_conf1_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].channel[handle->ledc_channel[CHANNEL_LEFT_INDEX].channel].conf1.val;
+    g_ledc_right_duty_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].channel[handle->ledc_channel[CHANNEL_RIGHT_INDEX].channel].duty.val;
+    g_ledc_right_conf0_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].channel[handle->ledc_channel[CHANNEL_RIGHT_INDEX].channel].conf0.val;
+    g_ledc_right_conf1_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].channel[handle->ledc_channel[CHANNEL_RIGHT_INDEX].channel].conf1.val;
 
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
     gptimer_config_t timer_config = {

components/usb/usb_device_uvc/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ChangeLog
 
+## v1.1.1 2024-10-17
+
+* Add USB PHY initialization support for P4.
+
 ## v1.1.0 2024-6-13
 
 * Remove support for ESP-IDF < v5.0

components/usb/usb_device_uvc/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.1.0"
+version: "1.1.1"
 targets:
   - esp32s2
   - esp32s3

components/usb/usb_device_uvc/usb_device_uvc.c

@@ -12,9 +12,8 @@
 #if CONFIG_TINYUSB_RHPORT_HS
 #include "soc/hp_sys_clkrst_reg.h"
 #include "soc/hp_system_reg.h"
-#else
-#include "esp_private/usb_phy.h"
 #endif
+#include "esp_private/usb_phy.h"
 #include "tusb.h"
 #include "usb_device_uvc.h"
 
@@ -27,9 +26,7 @@ static const char *TAG = "usbd_uvc";
 #endif
 
 typedef struct {
-#if !CONFIG_TINYUSB_RHPORT_HS
     usb_phy_handle_t phy_hdl;
-#endif
     bool uvc_init[UVC_CAM_NUM];
     uvc_format_t format[UVC_CAM_NUM];
     uvc_device_config_t user_config[UVC_CAM_NUM];
@@ -41,15 +38,16 @@ static uvc_device_t s_uvc_device;
 
 static void usb_phy_init(void)
 {
-#if !CONFIG_TINYUSB_RHPORT_HS
     // Configure USB PHY
     usb_phy_config_t phy_conf = {
         .controller = USB_PHY_CTRL_OTG,
         .otg_mode = USB_OTG_MODE_DEVICE,
         .target = USB_PHY_TARGET_INT,
+#if CONFIG_TINYUSB_RHPORT_HS
+        .otg_speed = USB_PHY_SPEED_HIGH,
+#endif
     };
     usb_new_phy(&phy_conf, &s_uvc_device.phy_hdl);
-#endif
 }
 
 static inline uint32_t get_time_millis(void)

examples/.build-rules.yml

@@ -259,7 +259,8 @@ examples/usb/device/usb_uac:
 
 examples/usb/device/usb_dual_uvc_device:
   enable:
-    - if: IDF_TARGET in ["esp32s3","esp32s2","esp32p4"]
+    - if: IDF_TARGET in ["esp32s3","esp32s2"]
+    - if: IDF_TARGET in ["esp32p4"] and (IDF_VERSION_MAJOR >= 5 and IDF_VERSION_MINOR >= 3)
   disable:
     - if: IDF_VERSION_MAJOR == 5 and IDF_VERSION_MINOR == 0
       temporary: true

examples/usb/device/usb_extend_screen/main/app_usb.c

@@ -24,7 +24,6 @@ static const char *TAG = "app_usb";
 //--------------------------------------------------------------------+
 static void usb_phy_init(void)
 {
-#if !CONFIG_TINYUSB_RHPORT_HS
     usb_phy_handle_t phy_hdl;
     // Configure USB PHY
     usb_phy_config_t phy_conf = {
@@ -33,7 +32,6 @@ static void usb_phy_init(void)
     };
     phy_conf.target = USB_PHY_TARGET_INT;
     usb_new_phy(&phy_conf, &phy_hdl);
-#endif
 }
 
 static void tusb_device_task(void *arg)

examples/usb/device/usb_extend_screen/main/uac/usb_device_uac.c

@@ -72,15 +72,13 @@ static portMUX_TYPE s_mux = portMUX_INITIALIZER_UNLOCKED;
 
 static void usb_phy_init(void)
 {
-#if !CONFIG_TINYUSB_RHPORT_HS
     // Configure USB PHY
     usb_phy_config_t phy_conf = {
         .controller = USB_PHY_CTRL_OTG,
         .otg_mode = USB_OTG_MODE_DEVICE,
         .target = USB_PHY_TARGET_INT,
     };
     usb_new_phy(&phy_conf, &s_uac_device->phy_hdl);
-#endif
 }
 
 // Invoked when device is mounted