From 5f6a128b6454f0cc4871ef5ca7a2de402a77d035 Mon Sep 17 00:00:00 2001
From: songruojing <songruojing@espressif.com>
Date: Fri, 24 Sep 2021 14:22:47 +0800
Subject: [PATCH] tinyusb: Update tinyusb.c to use the usb_phy API to configure
 PHY

---
 components/tinyusb/additions/src/tinyusb.c | 67 ++++++++--------------
 1 file changed, 25 insertions(+), 42 deletions(-)

diff --git a/components/tinyusb/additions/src/tinyusb.c b/components/tinyusb/additions/src/tinyusb.c
index c5186eb392..d36addd95d 100644
--- a/components/tinyusb/additions/src/tinyusb.c
+++ b/components/tinyusb/additions/src/tinyusb.c
@@ -5,63 +5,46 @@
  */
 
 #include "sdkconfig.h"
-#include "driver/gpio.h"
-#include "esp_private/periph_ctrl.h"
 #include "esp_log.h"
 #include "esp_check.h"
-#include "esp_rom_gpio.h"
-#include "hal/gpio_ll.h"
-#include "hal/usb_hal.h"
-#include "soc/gpio_periph.h"
-#include "soc/usb_periph.h"
-#include "soc/gpio_pins.h"
+#include "esp_err.h"
+#include "esp_private/periph_ctrl.h"
+#include "esp_private/usb_phy.h"
+#include "soc/usb_pins.h"
 #include "tinyusb.h"
 #include "descriptors_control.h"
 #include "tusb.h"
 #include "tusb_tasks.h"
 
 const static char *TAG = "TinyUSB";
-
-static void configure_pins(usb_hal_context_t *usb)
-{
-    /* usb_periph_iopins currently configures USB_OTG as USB Device.
-     * Introduce additional parameters in usb_hal_context_t when adding support
-     * for USB Host.
-     */
-    for (const usb_iopin_dsc_t *iopin = usb_periph_iopins; iopin->pin != -1; ++iopin) {
-        if ((usb->use_external_phy) || (iopin->ext_phy_only == 0)) {
-            esp_rom_gpio_pad_select_gpio(iopin->pin);
-            if (iopin->is_output) {
-                esp_rom_gpio_connect_out_signal(iopin->pin, iopin->func, false, false);
-            } else {
-                esp_rom_gpio_connect_in_signal(iopin->pin, iopin->func, false);
-                if ((iopin->pin != GPIO_MATRIX_CONST_ZERO_INPUT) && (iopin->pin != GPIO_MATRIX_CONST_ONE_INPUT)) {
-                    gpio_ll_input_enable(&GPIO, iopin->pin);
-                }
-            }
-            esp_rom_gpio_pad_unhold(iopin->pin);
-        }
-    }
-    if (!usb->use_external_phy) {
-        gpio_set_drive_capability(USBPHY_DM_NUM, GPIO_DRIVE_CAP_3);
-        gpio_set_drive_capability(USBPHY_DP_NUM, GPIO_DRIVE_CAP_3);
-    }
-}
+static usb_phy_handle_t phy_hdl;
 
 esp_err_t tinyusb_driver_install(const tinyusb_config_t *config)
 {
     tusb_desc_device_t *dev_descriptor;
     const char **string_descriptor;
     ESP_RETURN_ON_FALSE(config, ESP_ERR_INVALID_ARG, TAG, "invalid argument");
-    // Enable APB CLK to USB peripheral
-    periph_module_enable(PERIPH_USB_MODULE);
-    periph_module_reset(PERIPH_USB_MODULE);
-    // Initialize HAL layer
-    usb_hal_context_t hal = {
-        .use_external_phy = config->external_phy
+
+    // Configure USB PHY
+    usb_phy_config_t phy_conf = {
+        .controller = USB_PHY_CTRL_OTG,
+        .otg_mode = USB_OTG_MODE_DEVICE,
     };
-    usb_hal_init(&hal);
-    configure_pins(&hal);
+    if (config->external_phy) {
+        phy_conf.target = USB_PHY_TARGET_EXT;
+        usb_phy_gpio_conf_t gpio_conf = {
+            .vp_io_num = USBPHY_VP_NUM,
+            .vm_io_num = USBPHY_VM_NUM,
+            .rcv_io_num = USBPHY_RCV_NUM,
+            .oen_io_num = USBPHY_OEN_NUM,
+            .vpo_io_num = USBPHY_VPO_NUM,
+            .vmo_io_num = USBPHY_VMO_NUM,
+        };
+        phy_conf.gpio_conf = &gpio_conf;
+    } else {
+        phy_conf.target = USB_PHY_TARGET_INT;
+    }
+    ESP_RETURN_ON_ERROR(usb_new_phy(&phy_conf, &phy_hdl), TAG, "Install USB PHY failed");
 
     dev_descriptor = config->descriptor ? config->descriptor : &descriptor_kconfig;
     string_descriptor = config->string_descriptor ? config->string_descriptor : descriptor_str_kconfig;