diff --git a/components/soc/esp32s2/usb_dwc_periph.c b/components/soc/esp32s2/usb_dwc_periph.c index 1d77e297fa..b243d84c65 100644 --- a/components/soc/esp32s2/usb_dwc_periph.c +++ b/components/soc/esp32s2/usb_dwc_periph.c @@ -58,54 +58,3 @@ const usb_dwc_info_t usb_dwc_info = { }, }, }; - -/* ------------------------------- Deprecated ------------------------------- */ - -#include "soc/usb_periph.h" -/* -Note: These IO pins are deprecated. When connecting USB OTG to an external FSLS -PHY, the FSLS Serial Interface signals can be routed to any GPIO via the GPIO -matrix. Thus, this mapping of signals to IO pins is meaningless. - -Todo: Remove in IDF v6.0 (IDF-9029) -*/ -const usb_iopin_dsc_t usb_periph_iopins[] = { - {USBPHY_VP_NUM, USB_EXTPHY_VP_IDX, 0, 1}, - {USBPHY_VM_NUM, USB_EXTPHY_VM_IDX, 0, 1}, - {USBPHY_RCV_NUM, USB_EXTPHY_RCV_IDX, 0, 1}, - {USBPHY_OEN_NUM, USB_EXTPHY_OEN_IDX, 1, 1}, - {USBPHY_VPO_NUM, USB_EXTPHY_VPO_IDX, 1, 1}, - {USBPHY_VMO_NUM, USB_EXTPHY_VMO_IDX, 1, 1}, - {GPIO_MATRIX_CONST_ONE_INPUT, USB_OTG_IDDIG_IN_IDX, 0, 0}, //connected connector is mini-B - //connected connector is mini-B - {GPIO_MATRIX_CONST_ONE_INPUT, USB_SRP_BVALID_IN_IDX, 0, 0}, //HIGH to force USB device mode - {GPIO_MATRIX_CONST_ONE_INPUT, USB_OTG_VBUSVALID_IN_IDX, 0, 0}, //receiving a valid Vbus from host - {GPIO_MATRIX_CONST_ZERO_INPUT, USB_OTG_AVALID_IN_IDX, 0, 0}, - {-1, -1, 0, 0} -}; - -/* - Bunch of constants for USB peripheral: GPIO signals -*/ -const usb_phy_signal_conn_t usb_otg_periph_signal = { - .extphy_vp_in = USB_EXTPHY_VP_IDX, - .extphy_vm_in = USB_EXTPHY_VM_IDX, - .extphy_rcv_in = USB_EXTPHY_RCV_IDX, - .extphy_oen_out = USB_EXTPHY_OEN_IDX, - .extphy_vpo_out = USB_EXTPHY_VPO_IDX, - .extphy_vmo_out = USB_EXTPHY_VMO_IDX, - .extphy_suspend_in = USB_EXTPHY_SUSPND_IDX, - .extphy_speed_in = USB_EXTPHY_SPEED_IDX, - .srp_bvalid_in = USB_SRP_BVALID_IN_IDX, - .srp_sessend_in = USB_SRP_SESSEND_IN_IDX, - .srp_chrgvbus_out = USB_SRP_CHRGVBUS_IDX, - .srp_dischrgvbus_out = USB_SRP_DISCHRGVBUS_IDX, - .otg_iddig_in = USB_OTG_IDDIG_IN_IDX, - .otg_avalid_in = USB_OTG_AVALID_IN_IDX, - .otg_vbusvalid_in = USB_OTG_VBUSVALID_IN_IDX, - .otg_idpullup_out = USB_OTG_IDPULLUP_IDX, - .otg_dppulldown_out = USB_OTG_DPPULLDOWN_IDX, - .otg_dmpulldown_out = USB_OTG_DMPULLDOWN_IDX, - .otg_drvvbus_out = USB_OTG_DRVVBUS_IDX, - .module = PERIPH_USB_MODULE -}; diff --git a/components/soc/esp32s3/usb_dwc_periph.c b/components/soc/esp32s3/usb_dwc_periph.c index 1d77e297fa..b243d84c65 100644 --- a/components/soc/esp32s3/usb_dwc_periph.c +++ b/components/soc/esp32s3/usb_dwc_periph.c @@ -58,54 +58,3 @@ const usb_dwc_info_t usb_dwc_info = { }, }, }; - -/* ------------------------------- Deprecated ------------------------------- */ - -#include "soc/usb_periph.h" -/* -Note: These IO pins are deprecated. When connecting USB OTG to an external FSLS -PHY, the FSLS Serial Interface signals can be routed to any GPIO via the GPIO -matrix. Thus, this mapping of signals to IO pins is meaningless. - -Todo: Remove in IDF v6.0 (IDF-9029) -*/ -const usb_iopin_dsc_t usb_periph_iopins[] = { - {USBPHY_VP_NUM, USB_EXTPHY_VP_IDX, 0, 1}, - {USBPHY_VM_NUM, USB_EXTPHY_VM_IDX, 0, 1}, - {USBPHY_RCV_NUM, USB_EXTPHY_RCV_IDX, 0, 1}, - {USBPHY_OEN_NUM, USB_EXTPHY_OEN_IDX, 1, 1}, - {USBPHY_VPO_NUM, USB_EXTPHY_VPO_IDX, 1, 1}, - {USBPHY_VMO_NUM, USB_EXTPHY_VMO_IDX, 1, 1}, - {GPIO_MATRIX_CONST_ONE_INPUT, USB_OTG_IDDIG_IN_IDX, 0, 0}, //connected connector is mini-B - //connected connector is mini-B - {GPIO_MATRIX_CONST_ONE_INPUT, USB_SRP_BVALID_IN_IDX, 0, 0}, //HIGH to force USB device mode - {GPIO_MATRIX_CONST_ONE_INPUT, USB_OTG_VBUSVALID_IN_IDX, 0, 0}, //receiving a valid Vbus from host - {GPIO_MATRIX_CONST_ZERO_INPUT, USB_OTG_AVALID_IN_IDX, 0, 0}, - {-1, -1, 0, 0} -}; - -/* - Bunch of constants for USB peripheral: GPIO signals -*/ -const usb_phy_signal_conn_t usb_otg_periph_signal = { - .extphy_vp_in = USB_EXTPHY_VP_IDX, - .extphy_vm_in = USB_EXTPHY_VM_IDX, - .extphy_rcv_in = USB_EXTPHY_RCV_IDX, - .extphy_oen_out = USB_EXTPHY_OEN_IDX, - .extphy_vpo_out = USB_EXTPHY_VPO_IDX, - .extphy_vmo_out = USB_EXTPHY_VMO_IDX, - .extphy_suspend_in = USB_EXTPHY_SUSPND_IDX, - .extphy_speed_in = USB_EXTPHY_SPEED_IDX, - .srp_bvalid_in = USB_SRP_BVALID_IN_IDX, - .srp_sessend_in = USB_SRP_SESSEND_IN_IDX, - .srp_chrgvbus_out = USB_SRP_CHRGVBUS_IDX, - .srp_dischrgvbus_out = USB_SRP_DISCHRGVBUS_IDX, - .otg_iddig_in = USB_OTG_IDDIG_IN_IDX, - .otg_avalid_in = USB_OTG_AVALID_IN_IDX, - .otg_vbusvalid_in = USB_OTG_VBUSVALID_IN_IDX, - .otg_idpullup_out = USB_OTG_IDPULLUP_IDX, - .otg_dppulldown_out = USB_OTG_DPPULLDOWN_IDX, - .otg_dmpulldown_out = USB_OTG_DMPULLDOWN_IDX, - .otg_drvvbus_out = USB_OTG_DRVVBUS_IDX, - .module = PERIPH_USB_MODULE -}; diff --git a/components/soc/include/soc/usb_dwc_periph.h b/components/soc/include/soc/usb_dwc_periph.h index f35664d0c9..8d1c5350db 100644 --- a/components/soc/include/soc/usb_dwc_periph.h +++ b/components/soc/include/soc/usb_dwc_periph.h @@ -103,43 +103,6 @@ extern const usb_dwc_info_t usb_dwc_info; #endif // SOC_USB_OTG_SUPPORTED -/* ------------------------------- Deprecated ------------------------------- */ -/* Todo: Remove in ESP-IDF v6.0 (IDF-9052) */ -#include - -#if SOC_USB_OTG_SUPPORTED -#include "soc/periph_defs.h" - -/* - Stores a bunch of USB-peripheral data. -*/ -typedef struct { - const uint8_t extphy_vp_in; - const uint8_t extphy_vm_in; - const uint8_t extphy_rcv_in; - const uint8_t extphy_oen_out; - const uint8_t extphy_vpo_out; - const uint8_t extphy_vmo_out; - const uint8_t extphy_suspend_in; - const uint8_t extphy_speed_in; - const uint8_t srp_bvalid_in; - const uint8_t srp_sessend_in; - const uint8_t srp_chrgvbus_out; - const uint8_t srp_dischrgvbus_out; - const uint8_t otg_iddig_in; - const uint8_t otg_avalid_in; - const uint8_t otg_vbusvalid_in; - const uint8_t otg_idpullup_out; - const uint8_t otg_dppulldown_out; - const uint8_t otg_dmpulldown_out; - const uint8_t otg_drvvbus_out; - const periph_module_t module; -} usb_phy_signal_conn_t; - -extern const usb_phy_signal_conn_t usb_otg_periph_signal; - -#endif // SOC_USB_OTG_SUPPORTED - #ifdef __cplusplus } #endif diff --git a/components/soc/include/soc/usb_otg_periph.h b/components/soc/include/soc/usb_otg_periph.h deleted file mode 100644 index be92ac4eb1..0000000000 --- a/components/soc/include/soc/usb_otg_periph.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#pragma once - -/* Todo: Remove in ESP-IDF v6.0 (IDF-9052) */ -#warning "This header is deprecated, please use usb_dwc_periph.h instead" - -#include "soc/usb_dwc_periph.h"