Merge branch 'contrib/github_pr_9302' into 'master'

ESP32S3 USB external PHY pinout (GitHub PR)

Closes IDFGH-7761

See merge request espressif/esp-idf!18909
This commit is contained in:
morris
2022-07-07 16:17:26 +08:00
3 changed files with 15 additions and 33 deletions

View File

@@ -1,16 +1,8 @@
// Copyright 2020 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once #pragma once

View File

@@ -1,25 +1,17 @@
// Copyright 2020 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once #pragma once
/* GPIOs used to connect an external USB PHY */ /* GPIOs used to connect an external USB PHY */
#define USBPHY_VP_NUM 33 #define USBPHY_VP_NUM 42
#define USBPHY_VM_NUM 34 #define USBPHY_VM_NUM 41
#define USBPHY_RCV_NUM 35 #define USBPHY_RCV_NUM 21
#define USBPHY_OEN_NUM 36 #define USBPHY_OEN_NUM 40
#define USBPHY_VPO_NUM 37 #define USBPHY_VPO_NUM 39
#define USBPHY_VMO_NUM 38 #define USBPHY_VMO_NUM 38
/* GPIOs corresponding to the pads of the internal USB PHY */ /* GPIOs corresponding to the pads of the internal USB PHY */

View File

@@ -1245,7 +1245,6 @@ components/soc/esp32s2/include/soc/uart_reg.h
components/soc/esp32s2/include/soc/uart_struct.h components/soc/esp32s2/include/soc/uart_struct.h
components/soc/esp32s2/include/soc/uhci_reg.h components/soc/esp32s2/include/soc/uhci_reg.h
components/soc/esp32s2/include/soc/uhci_struct.h components/soc/esp32s2/include/soc/uhci_struct.h
components/soc/esp32s2/include/soc/usb_pins.h
components/soc/esp32s2/include/soc/usb_reg.h components/soc/esp32s2/include/soc/usb_reg.h
components/soc/esp32s2/include/soc/usb_struct.h components/soc/esp32s2/include/soc/usb_struct.h
components/soc/esp32s2/include/soc/usb_types.h components/soc/esp32s2/include/soc/usb_types.h
@@ -1335,7 +1334,6 @@ components/soc/esp32s3/include/soc/uart_reg.h
components/soc/esp32s3/include/soc/uart_struct.h components/soc/esp32s3/include/soc/uart_struct.h
components/soc/esp32s3/include/soc/uhci_reg.h components/soc/esp32s3/include/soc/uhci_reg.h
components/soc/esp32s3/include/soc/uhci_struct.h components/soc/esp32s3/include/soc/uhci_struct.h
components/soc/esp32s3/include/soc/usb_pins.h
components/soc/esp32s3/include/soc/usb_reg.h components/soc/esp32s3/include/soc/usb_reg.h
components/soc/esp32s3/include/soc/usb_serial_jtag_struct.h components/soc/esp32s3/include/soc/usb_serial_jtag_struct.h
components/soc/esp32s3/include/soc/usb_struct.h components/soc/esp32s3/include/soc/usb_struct.h