Merge branch 'bugfix/usb_hal_and_clk' into 'master'

Fix USB CLK always reset and USB with swapped pins not working through HAL

See merge request espressif/esp-idf!10113

Author: projectgus

components/esp_system/port/esp32s2/clk.c

@@ -233,7 +233,6 @@ void esp_perip_clk_init(void)
 #if CONFIG_ESP_CONSOLE_UART_NUM != 1
                            DPORT_UART1_CLK_EN |
 #endif
-                           DPORT_USB_CLK_EN |
                            DPORT_SPI2_CLK_EN |
                            DPORT_I2C_EXT0_CLK_EN |
                            DPORT_UHCI0_CLK_EN |

components/soc/src/esp32s2/usb_hal.c

@@ -22,6 +22,5 @@ void usb_hal_init(usb_hal_context_t *usb)
         usb_ll_ext_phy_enable();
     } else {
         usb_ll_int_phy_enable();
-        usb_ll_int_phy_pullup_conf(true, false, false, false);
     }
 }