Merge branch 'bugfix/gpio_rom_patch_fix_v5.4' into 'release/v5.4'

suda-morris · suda-morris · commit 3ecfa81c9b66 · 2025-02-17T11:14:21.000+08:00
fix(gpio): fix esp_rom_gpio_connect_out_signal for gpio num over 31 on esp32/s2 (v5.4)

See merge request espressif/esp-idf!36865
diff --git a/components/esp_rom/patches/esp_rom_gpio.c b/components/esp_rom/patches/esp_rom_gpio.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -23,6 +23,10 @@ IRAM_ATTR __attribute__((optimize("-Os"))) void esp_rom_gpio_connect_out_signal(
     }
     REG_WRITE(GPIO_FUNC0_OUT_SEL_CFG_REG + (gpio_num * 4), value);
 
-    REG_WRITE(GPIO_ENABLE_W1TS_REG, (1 << gpio_num));
+    if (gpio_num < 32) {
+        REG_WRITE(GPIO_ENABLE_W1TS_REG, (1 << gpio_num));
+    } else {
+        REG_WRITE(GPIO_ENABLE1_W1TS_REG, (1 << (gpio_num - 32)));
+    }
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD`
	`2`	`+ * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD`
`3`	`3`	`*`
`4`	`4`	`* SPDX-License-Identifier: Apache-2.0`
`5`	`5`	`*/`
`@@ -23,6 +23,10 @@ IRAM_ATTR __attribute__((optimize("-Os"))) void esp_rom_gpio_connect_out_signal(`
`23`	`23`	`}`
`24`	`24`	`REG_WRITE(GPIO_FUNC0_OUT_SEL_CFG_REG + (gpio_num * 4), value);`
`25`	`25`
`26`		`- REG_WRITE(GPIO_ENABLE_W1TS_REG, (1 << gpio_num));`
	`26`	`+ if (gpio_num < 32) {`
	`27`	`+ REG_WRITE(GPIO_ENABLE_W1TS_REG, (1 << gpio_num));`
	`28`	`+ } else {`
	`29`	`+ REG_WRITE(GPIO_ENABLE1_W1TS_REG, (1 << (gpio_num - 32)));`
	`30`	`+ }`
`27`	`31`	`}`
`28`	`32`	`#endif`