Skip to content

Commit 9056974

Browse files
songruoKainarx
songruo
authored and
Kainarx
committed
feat(gpio): ESP32P4 ECO5 GPIO related update
1 parent 3b0d850 commit 9056974

File tree

17 files changed

+24
-10278
lines changed

17 files changed

+24
-10278
lines changed

‎components/soc/esp32/register/soc/io_mux_reg.h‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -84,12 +84,6 @@
8484

8585
#define PIN_FUNC_GPIO 2
8686

87-
#define SPI_CLK_GPIO_NUM 6
88-
#define SPI_CS0_GPIO_NUM 11
89-
#define SPI_Q_GPIO_NUM 7
90-
#define SPI_D_GPIO_NUM 8
91-
#define SPI_WP_GPIO_NUM 10
92-
#define SPI_HD_GPIO_NUM 9
9387
#define XTAL32K_P_GPIO_NUM 32
9488
#define XTAL32K_N_GPIO_NUM 33
9589

‎components/soc/esp32c2/register/soc/io_mux_reg.h‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2017-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -122,13 +122,6 @@
122122
#define GPIO_PAD_PULLDOWN(num) do{PIN_PULLUP_DIS(IOMUX_REG_GPIO##num);PIN_PULLDWN_EN(IOMUX_REG_GPIO##num);}while(0)
123123
#define GPIO_PAD_SET_DRV(num, drv) PIN_SET_DRV(IOMUX_REG_GPIO##num, drv)
124124

125-
#define SPI_HD_GPIO_NUM 12
126-
#define SPI_WP_GPIO_NUM 13
127-
#define SPI_CS0_GPIO_NUM 14
128-
#define SPI_CLK_GPIO_NUM 15
129-
#define SPI_D_GPIO_NUM 16
130-
#define SPI_Q_GPIO_NUM 17
131-
132125
#define MAX_RTC_GPIO_NUM 5
133126
#define MAX_PAD_GPIO_NUM 20
134127
#define MAX_GPIO_NUM 24

‎components/soc/esp32c3/register/soc/io_mux_reg.h‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2020-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -123,13 +123,6 @@
123123
#define GPIO_PAD_PULLDOWN(num) do{PIN_PULLUP_DIS(IOMUX_REG_GPIO##num);PIN_PULLDWN_EN(IOMUX_REG_GPIO##num);}while(0)
124124
#define GPIO_PAD_SET_DRV(num, drv) PIN_SET_DRV(IOMUX_REG_GPIO##num, drv)
125125

126-
#define SPI_HD_GPIO_NUM 12
127-
#define SPI_WP_GPIO_NUM 13
128-
#define SPI_CS0_GPIO_NUM 14
129-
#define SPI_CLK_GPIO_NUM 15
130-
#define SPI_D_GPIO_NUM 16
131-
#define SPI_Q_GPIO_NUM 17
132-
133126
#define SD_CLK_GPIO_NUM 12
134127
#define SD_CMD_GPIO_NUM 11
135128
#define SD_DATA0_GPIO_NUM 13

‎components/soc/esp32c5/register/soc/io_mux_reg.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,6 @@ extern "C" {
130130
#define GPIO_PAD_PULLUP(num) do{PIN_PULLDWN_DIS(IOMUX_REG_GPIO##num);PIN_PULLUP_EN(IOMUX_REG_GPIO##num);}while(0)
131131
#define GPIO_PAD_PULLDOWN(num) do{PIN_PULLUP_DIS(IOMUX_REG_GPIO##num);PIN_PULLDWN_EN(IOMUX_REG_GPIO##num);}while(0)
132132

133-
#define SPI_HD_GPIO_NUM 20
134-
#define SPI_WP_GPIO_NUM 18
135-
#define SPI_CS0_GPIO_NUM 16
136-
#define SPI_CLK_GPIO_NUM 21
137-
#define SPI_D_GPIO_NUM 22
138-
#define SPI_Q_GPIO_NUM 17
139-
#define SPI_CS1_GPIO_NUM 15
140-
141133
#define USB_INT_PHY0_DM_GPIO_NUM 13
142134
#define USB_INT_PHY0_DP_GPIO_NUM 14
143135

‎components/soc/esp32c6/register/soc/io_mux_reg.h‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -129,13 +129,6 @@
129129
#define GPIO_PAD_PULLDOWN(num) do{PIN_PULLUP_DIS(IOMUX_REG_GPIO##num);PIN_PULLDWN_EN(IOMUX_REG_GPIO##num);}while(0)
130130
#define GPIO_PAD_SET_DRV(num, drv) PIN_SET_DRV(IOMUX_REG_GPIO##num, drv)
131131

132-
#define SPI_HD_GPIO_NUM 28
133-
#define SPI_WP_GPIO_NUM 26
134-
#define SPI_CS0_GPIO_NUM 24
135-
#define SPI_CLK_GPIO_NUM 29
136-
#define SPI_D_GPIO_NUM 30
137-
#define SPI_Q_GPIO_NUM 25
138-
139132
#define SD_CLK_GPIO_NUM 19
140133
#define SD_CMD_GPIO_NUM 18
141134
#define SD_DATA0_GPIO_NUM 20

‎components/soc/esp32h2/register/soc/io_mux_reg.h‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -148,13 +148,6 @@
148148
#define GPIO_PAD_PULLDOWN(num) do{PIN_PULLUP_DIS(IOMUX_REG_GPIO##num);PIN_PULLDWN_EN(IOMUX_REG_GPIO##num);}while(0)
149149
#define GPIO_PAD_SET_DRV(num, drv) PIN_SET_DRV(IOMUX_REG_GPIO##num, drv)
150150

151-
#define SPI_HD_GPIO_NUM 18
152-
#define SPI_WP_GPIO_NUM 17
153-
#define SPI_CS0_GPIO_NUM 15
154-
#define SPI_CLK_GPIO_NUM 19
155-
#define SPI_D_GPIO_NUM 20
156-
#define SPI_Q_GPIO_NUM 16
157-
158151
#define USB_INT_PHY0_DM_GPIO_NUM 26
159152
#define USB_INT_PHY0_DP_GPIO_NUM 27
160153

‎components/soc/esp32p4/emac_periph.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ const emac_io_info_t emac_io_idx = {
1616
.mii_tx_clk_i_idx = EMAC_TX_CLK_PAD_IN_IDX,
1717
.mii_tx_en_o_idx = EMAC_PHY_TXEN_PAD_OUT_IDX,
1818
.mii_txd0_o_idx = EMAC_PHY_TXD0_PAD_OUT_IDX,
19-
.mii_txd1_o_idx = EMAC_PHY_TXD0_PAD_OUT_IDX,
20-
.mii_txd2_o_idx = EMAC_PHY_TXD0_PAD_OUT_IDX,
21-
.mii_txd3_o_idx = EMAC_PHY_TXD0_PAD_OUT_IDX,
19+
.mii_txd1_o_idx = EMAC_PHY_TXD1_PAD_OUT_IDX,
20+
.mii_txd2_o_idx = EMAC_PHY_TXD2_PAD_OUT_IDX,
21+
.mii_txd3_o_idx = EMAC_PHY_TXD3_PAD_OUT_IDX,
2222
.mii_rx_clk_i_idx = EMAC_RX_CLK_PAD_IN_IDX,
2323
.mii_rx_dv_i_idx = EMAC_PHY_RXDV_PAD_IN_IDX,
2424
.mii_rxd0_i_idx = EMAC_PHY_RXD0_PAD_IN_IDX,

‎components/soc/esp32p4/include/soc/gpio_sig_map.h‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -196,13 +196,9 @@
196196
#define PWM1_SYNC2_PAD_IN_IDX 100
197197
#define PWM1_CH2_B_PAD_OUT_IDX 100
198198
#define PWM1_F0_PAD_IN_IDX 101
199-
#define ADP_CHRG_PAD_OUT_IDX 101
200199
#define PWM1_F1_PAD_IN_IDX 102
201-
#define ADP_DISCHRG_PAD_OUT_IDX 102
202200
#define PWM1_F2_PAD_IN_IDX 103
203-
#define ADP_PRB_EN_PAD_OUT_IDX 103
204201
#define PWM1_CAP0_PAD_IN_IDX 104
205-
#define ADP_SNS_EN_PAD_OUT_IDX 104
206202
#define PWM1_CAP1_PAD_IN_IDX 105
207203
#define TWAI0_STANDBY_PAD_OUT_IDX 105
208204
#define PWM1_CAP2_PAD_IN_IDX 106
@@ -224,7 +220,6 @@
224220
#define USB_SRP_SESSEND_PAD_IN_IDX 114
225221
#define USB_OTG11_DRVVBUS_PAD_OUT_IDX 114
226222
#define USB_SRP_CHRGVBUS_PAD_OUT_IDX 115
227-
#define OTG_DRVVBUS_PAD_OUT_IDX 116
228223
#define ULPI_CLK_PAD_IN_IDX 117
229224
#define RNG_CHAIN_CLK_PAD_OUT_IDX 117
230225
#define USB_HSPHY_REFCLK_IN_IDX 118
@@ -260,9 +255,7 @@
260255
#define I3C_SLV_SCL_PAD_OUT_IDX 136
261256
#define I3C_SLV_SDA_PAD_IN_IDX 137
262257
#define I3C_SLV_SDA_PAD_OUT_IDX 137
263-
#define ADP_PRB_PAD_IN_IDX 138
264258
#define I3C_MST_SCL_PULLUP_EN_PAD_OUT_IDX 138
265-
#define ADP_SNS_PAD_IN_IDX 139
266259
#define I3C_MST_SDA_PULLUP_EN_PAD_OUT_IDX 139
267260
#define USB_JTAG_TDO_BRIDGE_PAD_IN_IDX 140
268261
#define USB_JTAG_TDI_BRIDGE_PAD_OUT_IDX 140
@@ -458,13 +451,13 @@
458451
#define CORE_GPIO_IN_PAD_IN27_IDX 241
459452
#define CORE_GPIO_OUT_PAD_OUT27_IDX 241
460453
#define CORE_GPIO_IN_PAD_IN28_IDX 242
461-
#define CORE_GPIO_OUT_PAD_OUT28_IDX 242
454+
#define PARLIO_TX_CS_PAD_OUT_IDX 242
462455
#define CORE_GPIO_IN_PAD_IN29_IDX 243
463-
#define CORE_GPIO_OUT_PAD_OUT29_IDX 243
456+
#define EMAC_PTP_PPS_PAD_OUT_IDX 243
464457
#define CORE_GPIO_IN_PAD_IN30_IDX 244
465-
#define CORE_GPIO_OUT_PAD_OUT30_IDX 244
458+
#define ANA_COMP0_OUT_IDX 244
466459
#define CORE_GPIO_IN_PAD_IN31_IDX 245
467-
#define CORE_GPIO_OUT_PAD_OUT31_IDX 245
460+
#define ANA_COMP1_OUT_IDX 245
468461
#define RMT_SIG_PAD_IN0_IDX 246
469462
#define RMT_SIG_PAD_OUT0_IDX 246
470463
#define RMT_SIG_PAD_IN1_IDX 247
@@ -485,4 +478,5 @@
485478
#define SIG_IN_FUNC254_IDX 254
486479
#define SIG_IN_FUNC255_IDX 255
487480
#define SIG_IN_FUNC255_IDX 255
481+
// version date 230403
488482
#define SIG_GPIO_OUT_IDX 256

‎components/soc/esp32p4/register/hw_ver1/soc/io_mux_reg.h‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -153,23 +153,6 @@
153153
#define GPIO_PAD_PULLDOWN(num) do{PIN_PULLUP_DIS(IOMUX_REG_GPIO##num);PIN_PULLDWN_EN(IOMUX_REG_GPIO##num);}while(0)
154154
#define GPIO_PAD_SET_DRV(num, drv) PIN_SET_DRV(IOMUX_REG_GPIO##num, drv)
155155

156-
// TODO: IDF-7499, IDF-7495
157-
// SPI pins defined here are all wrong. On P4, these pins are individual pins, don't use normal GPIO pins anymore.
158-
// Please check iomux_mspi_pin_struct/reg.h
159-
#include "soc/gpio_num.h"
160-
#define SPI_CS1_GPIO_NUM GPIO_NUM_MAX
161-
#define SPI_HD_GPIO_NUM GPIO_NUM_MAX
162-
#define SPI_WP_GPIO_NUM GPIO_NUM_MAX
163-
#define SPI_CS0_GPIO_NUM GPIO_NUM_MAX
164-
#define SPI_CLK_GPIO_NUM GPIO_NUM_MAX
165-
#define SPI_Q_GPIO_NUM GPIO_NUM_MAX
166-
#define SPI_D_GPIO_NUM GPIO_NUM_MAX
167-
#define SPI_D4_GPIO_NUM GPIO_NUM_MAX
168-
#define SPI_D5_GPIO_NUM GPIO_NUM_MAX
169-
#define SPI_D6_GPIO_NUM GPIO_NUM_MAX
170-
#define SPI_D7_GPIO_NUM GPIO_NUM_MAX
171-
#define SPI_DQS_GPIO_NUM GPIO_NUM_MAX
172-
173156
#define SD_CLK_GPIO_NUM 43
174157
#define SD_CMD_GPIO_NUM 44
175158
#define SD_DATA0_GPIO_NUM 39

0 commit comments

Comments
 (0)