From 9ceff23c6d50b37a9fba4c370cffa1654fedeecd Mon Sep 17 00:00:00 2001 From: lsita Date: Wed, 6 Jul 2022 14:54:35 +0200 Subject: [PATCH 1/2] USB external PHY pinout set as in Reference Manual Figure 29-3. --- components/soc/esp32s3/include/soc/usb_pins.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/soc/esp32s3/include/soc/usb_pins.h b/components/soc/esp32s3/include/soc/usb_pins.h index c8ad806e08..fb68c49bc9 100644 --- a/components/soc/esp32s3/include/soc/usb_pins.h +++ b/components/soc/esp32s3/include/soc/usb_pins.h @@ -15,11 +15,11 @@ #pragma once /* GPIOs used to connect an external USB PHY */ -#define USBPHY_VP_NUM 33 -#define USBPHY_VM_NUM 34 -#define USBPHY_RCV_NUM 35 -#define USBPHY_OEN_NUM 36 -#define USBPHY_VPO_NUM 37 +#define USBPHY_VP_NUM 42 +#define USBPHY_VM_NUM 41 +#define USBPHY_RCV_NUM 21 +#define USBPHY_OEN_NUM 40 +#define USBPHY_VPO_NUM 39 #define USBPHY_VMO_NUM 38 /* GPIOs corresponding to the pads of the internal USB PHY */ From b0e228f756b30539a71dfdbc24ed6a620180cfcb Mon Sep 17 00:00:00 2001 From: morris Date: Thu, 7 Jul 2022 11:47:40 +0800 Subject: [PATCH 2/2] soc: update copyright for usb phy pins --- components/soc/esp32s2/include/soc/usb_pins.h | 18 +++++------------- components/soc/esp32s3/include/soc/usb_pins.h | 18 +++++------------- tools/ci/check_copyright_ignore.txt | 2 -- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/components/soc/esp32s2/include/soc/usb_pins.h b/components/soc/esp32s2/include/soc/usb_pins.h index c8ad806e08..436df2baa6 100644 --- a/components/soc/esp32s2/include/soc/usb_pins.h +++ b/components/soc/esp32s2/include/soc/usb_pins.h @@ -1,16 +1,8 @@ -// Copyright 2020 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// 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. +/* + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #pragma once diff --git a/components/soc/esp32s3/include/soc/usb_pins.h b/components/soc/esp32s3/include/soc/usb_pins.h index fb68c49bc9..7407b0a615 100644 --- a/components/soc/esp32s3/include/soc/usb_pins.h +++ b/components/soc/esp32s3/include/soc/usb_pins.h @@ -1,16 +1,8 @@ -// Copyright 2020 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// 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. +/* + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #pragma once diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index a88152665b..89a00d94fb 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -1344,7 +1344,6 @@ components/soc/esp32s2/include/soc/uart_reg.h components/soc/esp32s2/include/soc/uart_struct.h components/soc/esp32s2/include/soc/uhci_reg.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_struct.h components/soc/esp32s2/include/soc/usb_types.h @@ -1434,7 +1433,6 @@ components/soc/esp32s3/include/soc/uart_reg.h components/soc/esp32s3/include/soc/uart_struct.h components/soc/esp32s3/include/soc/uhci_reg.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_serial_jtag_struct.h components/soc/esp32s3/include/soc/usb_struct.h