diff --git a/components/esp_driver_gpio/src/gpio_etm.c b/components/esp_driver_gpio/src/gpio_etm.c
index ad4f117bb0..d19d03248d 100644
--- a/components/esp_driver_gpio/src/gpio_etm.c
+++ b/components/esp_driver_gpio/src/gpio_etm.c
@@ -52,7 +52,7 @@ struct gpio_etm_task_t {
 };
 
 static gpio_etm_group_t s_gpio_etm_group = {
-    .dev = &GPIO_ETM,
+    .dev = GPIO_LL_ETM_GET_HW(),
     .spinlock = portMUX_INITIALIZER_UNLOCKED,
 };
 
diff --git a/components/esp_hal_gpio/esp32c5/include/hal/gpio_etm_ll.h b/components/esp_hal_gpio/esp32c5/include/hal/gpio_etm_ll.h
index 0e85a7f2aa..2e48c1a009 100644
--- a/components/esp_hal_gpio/esp32c5/include/hal/gpio_etm_ll.h
+++ b/components/esp_hal_gpio/esp32c5/include/hal/gpio_etm_ll.h
@@ -22,6 +22,8 @@
 #define GPIO_LL_ETM_TASK_ID_CLR(ch) (GPIO_TASK_CH0_CLEAR + (ch))
 #define GPIO_LL_ETM_TASK_ID_TOG(ch) (GPIO_TASK_CH0_TOGGLE + (ch))
 
+#define GPIO_LL_ETM_GET_HW() ((gpio_etm_dev_t *)(void *)&GPIO_EXT.etm)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/components/esp_hal_gpio/esp32c6/include/hal/gpio_etm_ll.h b/components/esp_hal_gpio/esp32c6/include/hal/gpio_etm_ll.h
index 1608eff713..c2ff53aa67 100644
--- a/components/esp_hal_gpio/esp32c6/include/hal/gpio_etm_ll.h
+++ b/components/esp_hal_gpio/esp32c6/include/hal/gpio_etm_ll.h
@@ -22,6 +22,8 @@
 #define GPIO_LL_ETM_TASK_ID_CLR(ch) (GPIO_TASK_CH0_CLEAR + (ch))
 #define GPIO_LL_ETM_TASK_ID_TOG(ch) (GPIO_TASK_CH0_TOGGLE + (ch))
 
+#define GPIO_LL_ETM_GET_HW() ((gpio_etm_dev_t *)(void *)&GPIO_EXT.etm)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/components/esp_hal_gpio/esp32c61/include/hal/gpio_etm_ll.h b/components/esp_hal_gpio/esp32c61/include/hal/gpio_etm_ll.h
index 0e85a7f2aa..2e48c1a009 100644
--- a/components/esp_hal_gpio/esp32c61/include/hal/gpio_etm_ll.h
+++ b/components/esp_hal_gpio/esp32c61/include/hal/gpio_etm_ll.h
@@ -22,6 +22,8 @@
 #define GPIO_LL_ETM_TASK_ID_CLR(ch) (GPIO_TASK_CH0_CLEAR + (ch))
 #define GPIO_LL_ETM_TASK_ID_TOG(ch) (GPIO_TASK_CH0_TOGGLE + (ch))
 
+#define GPIO_LL_ETM_GET_HW() ((gpio_etm_dev_t *)(void *)&GPIO_EXT.etm)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/components/esp_hal_gpio/esp32h2/include/hal/gpio_etm_ll.h b/components/esp_hal_gpio/esp32h2/include/hal/gpio_etm_ll.h
index 44077aff54..c4628a0787 100644
--- a/components/esp_hal_gpio/esp32h2/include/hal/gpio_etm_ll.h
+++ b/components/esp_hal_gpio/esp32h2/include/hal/gpio_etm_ll.h
@@ -22,6 +22,8 @@
 #define GPIO_LL_ETM_TASK_ID_CLR(ch) (GPIO_TASK_CH0_CLEAR + (ch))
 #define GPIO_LL_ETM_TASK_ID_TOG(ch) (GPIO_TASK_CH0_TOGGLE + (ch))
 
+#define GPIO_LL_ETM_GET_HW() ((gpio_etm_dev_t *)(void *)&GPIO_EXT.etm)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/components/esp_hal_gpio/esp32h21/include/hal/gpio_etm_ll.h b/components/esp_hal_gpio/esp32h21/include/hal/gpio_etm_ll.h
index 4885ee3e16..e5f6706fb3 100644
--- a/components/esp_hal_gpio/esp32h21/include/hal/gpio_etm_ll.h
+++ b/components/esp_hal_gpio/esp32h21/include/hal/gpio_etm_ll.h
@@ -22,6 +22,8 @@
 #define GPIO_LL_ETM_TASK_ID_CLR(ch) (GPIO_TASK_CH0_CLEAR + (ch))
 #define GPIO_LL_ETM_TASK_ID_TOG(ch) (GPIO_TASK_CH0_TOGGLE + (ch))
 
+#define GPIO_LL_ETM_GET_HW() ((gpio_etm_dev_t *)(void *)&GPIO_EXT.etm)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/components/esp_hal_gpio/esp32h4/include/hal/gpio_etm_ll.h b/components/esp_hal_gpio/esp32h4/include/hal/gpio_etm_ll.h
index 6b4162225a..cdc8dc91e1 100644
--- a/components/esp_hal_gpio/esp32h4/include/hal/gpio_etm_ll.h
+++ b/components/esp_hal_gpio/esp32h4/include/hal/gpio_etm_ll.h
@@ -22,6 +22,8 @@
 #define GPIO_LL_ETM_TASK_ID_CLR(ch) (GPIO_TASK_CH0_CLEAR + (ch))
 #define GPIO_LL_ETM_TASK_ID_TOG(ch) (GPIO_TASK_CH0_TOGGLE + (ch))
 
+#define GPIO_LL_ETM_GET_HW() ((gpio_etm_dev_t *)(void *)&GPIO_EXT.etm)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/components/esp_hal_gpio/esp32p4/include/hal/gpio_etm_ll.h b/components/esp_hal_gpio/esp32p4/include/hal/gpio_etm_ll.h
index 44077aff54..c4628a0787 100644
--- a/components/esp_hal_gpio/esp32p4/include/hal/gpio_etm_ll.h
+++ b/components/esp_hal_gpio/esp32p4/include/hal/gpio_etm_ll.h
@@ -22,6 +22,8 @@
 #define GPIO_LL_ETM_TASK_ID_CLR(ch) (GPIO_TASK_CH0_CLEAR + (ch))
 #define GPIO_LL_ETM_TASK_ID_TOG(ch) (GPIO_TASK_CH0_TOGGLE + (ch))
 
+#define GPIO_LL_ETM_GET_HW() ((gpio_etm_dev_t *)(void *)&GPIO_EXT.etm)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/components/esp_hal_gpio/esp32s31/include/hal/gpio_etm_ll.h b/components/esp_hal_gpio/esp32s31/include/hal/gpio_etm_ll.h
index d753142d09..fe6922570b 100644
--- a/components/esp_hal_gpio/esp32s31/include/hal/gpio_etm_ll.h
+++ b/components/esp_hal_gpio/esp32s31/include/hal/gpio_etm_ll.h
@@ -22,6 +22,8 @@
 #define GPIO_LL_ETM_TASK_ID_CLR(ch) (GPIO_TASK_CH0_CLEAR + (ch))
 #define GPIO_LL_ETM_TASK_ID_TOG(ch) (GPIO_TASK_CH0_TOGGLE + (ch))
 
+#define GPIO_LL_ETM_GET_HW() ((gpio_etm_dev_t *)(void *)&GPIO_EXT.etm)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/components/soc/esp32c5/ld/esp32c5.peripherals.ld b/components/soc/esp32c5/ld/esp32c5.peripherals.ld
index 24734c783d..7fd257efe0 100644
--- a/components/soc/esp32c5/ld/esp32c5.peripherals.ld
+++ b/components/soc/esp32c5/ld/esp32c5.peripherals.ld
@@ -47,7 +47,6 @@ PROVIDE ( IO_MUX              = 0x60090000 );
 PROVIDE ( GPIO                = 0x60091000 );
 PROVIDE ( GPIO_EXT            = 0x60091e00 );
 PROVIDE ( SDM                 = 0x60091e00 );
-PROVIDE ( GPIO_ETM            = 0x60091f18 );
 PROVIDE ( MEM_MONITOR         = 0x60092000 );
 PROVIDE ( PAU                 = 0x60093000 );
 PROVIDE ( HP_SYSTEM           = 0x60095000 );
diff --git a/components/soc/esp32c5/register/soc/gpio_ext_struct.h b/components/soc/esp32c5/register/soc/gpio_ext_struct.h
index d7720e63c4..d3887ef2ee 100644
--- a/components/soc/esp32c5/register/soc/gpio_ext_struct.h
+++ b/components/soc/esp32c5/register/soc/gpio_ext_struct.h
@@ -416,7 +416,6 @@ typedef struct {
 } gpio_ext_dev_t;
 
 extern gpio_sd_dev_t SDM;
-extern gpio_etm_dev_t GPIO_ETM;
 extern gpio_ext_dev_t GPIO_EXT;
 
 #ifndef __cplusplus
diff --git a/components/soc/esp32c6/ld/esp32c6.peripherals.ld b/components/soc/esp32c6/ld/esp32c6.peripherals.ld
index caad419859..a2bbc81658 100644
--- a/components/soc/esp32c6/ld/esp32c6.peripherals.ld
+++ b/components/soc/esp32c6/ld/esp32c6.peripherals.ld
@@ -48,7 +48,6 @@ PROVIDE ( IO_MUX         = 0x60090000 );
 PROVIDE ( GPIO           = 0x60091000 );
 PROVIDE ( GPIO_EXT       = 0x60091f00 );
 PROVIDE ( SDM            = 0x60091f00 );
-PROVIDE ( GPIO_ETM       = 0x60091f60 );
 
 PROVIDE ( MEM_MONITOR       = 0x60092000 );
 PROVIDE ( PAU               = 0x60093000 );
diff --git a/components/soc/esp32c6/register/soc/gpio_ext_struct.h b/components/soc/esp32c6/register/soc/gpio_ext_struct.h
index 5d066f6c70..c5a2cb09c7 100644
--- a/components/soc/esp32c6/register/soc/gpio_ext_struct.h
+++ b/components/soc/esp32c6/register/soc/gpio_ext_struct.h
@@ -201,7 +201,6 @@ typedef struct gpio_ext_dev_t {
 } gpio_ext_dev_t;
 
 extern gpio_sd_dev_t SDM;
-extern gpio_etm_dev_t GPIO_ETM;
 extern gpio_ext_dev_t GPIO_EXT;
 
 #ifndef __cplusplus
diff --git a/components/soc/esp32c61/ld/esp32c61.peripherals.ld b/components/soc/esp32c61/ld/esp32c61.peripherals.ld
index 8f7e0dca33..dce7ad8a24 100644
--- a/components/soc/esp32c61/ld/esp32c61.peripherals.ld
+++ b/components/soc/esp32c61/ld/esp32c61.peripherals.ld
@@ -32,7 +32,6 @@ PROVIDE ( ECDSA               = 0x6008E000 );
 PROVIDE ( IO_MUX              = 0x60090000 );
 PROVIDE ( GPIO                = 0x60091000 );
 PROVIDE ( GPIO_EXT            = 0x60091e00 );
-PROVIDE ( GPIO_ETM            = 0x60091f18 );
 PROVIDE ( MEM_MONITOR         = 0x60092000 );
 PROVIDE ( PAU                 = 0x60093000 );
 PROVIDE ( HP_SYSTEM           = 0x60095000 );
diff --git a/components/soc/esp32c61/register/soc/gpio_ext_struct.h b/components/soc/esp32c61/register/soc/gpio_ext_struct.h
index da34fe95f9..7d07e7daaa 100644
--- a/components/soc/esp32c61/register/soc/gpio_ext_struct.h
+++ b/components/soc/esp32c61/register/soc/gpio_ext_struct.h
@@ -551,7 +551,6 @@ typedef struct {
     volatile gpio_ext_version_reg_t version;
 } gpio_ext_dev_t;
 
-extern gpio_etm_dev_t GPIO_ETM;
 extern gpio_ext_dev_t GPIO_EXT;
 
 #ifndef __cplusplus
diff --git a/components/soc/esp32h2/ld/esp32h2.peripherals.ld b/components/soc/esp32h2/ld/esp32h2.peripherals.ld
index 2aa249c964..ad309d4813 100644
--- a/components/soc/esp32h2/ld/esp32h2.peripherals.ld
+++ b/components/soc/esp32h2/ld/esp32h2.peripherals.ld
@@ -45,7 +45,6 @@ PROVIDE ( IO_MUX         = 0x60090000 );
 PROVIDE ( GPIO           = 0x60091000 );
 PROVIDE ( GPIO_EXT       = 0x60091f00 );
 PROVIDE ( SDM            = 0x60091f00 );
-PROVIDE ( GPIO_ETM       = 0x60091f60 );
 
 PROVIDE ( MEM_ACS_MONITOR   = 0x60092000 );
 PROVIDE ( PAU               = 0x60093000 );
diff --git a/components/soc/esp32h2/register/soc/gpio_ext_struct.h b/components/soc/esp32h2/register/soc/gpio_ext_struct.h
index 5ff803b3fc..17b5227dd2 100644
--- a/components/soc/esp32h2/register/soc/gpio_ext_struct.h
+++ b/components/soc/esp32h2/register/soc/gpio_ext_struct.h
@@ -306,7 +306,6 @@ typedef struct {
 } gpio_ext_dev_t;
 
 extern gpio_sd_dev_t SDM;
-extern gpio_etm_dev_t GPIO_ETM;
 extern gpio_ext_dev_t GPIO_EXT;
 
 #ifndef __cplusplus
diff --git a/components/soc/esp32h21/ld/esp32h21.peripherals.ld b/components/soc/esp32h21/ld/esp32h21.peripherals.ld
index 08b2d4cd82..808fb0cc06 100644
--- a/components/soc/esp32h21/ld/esp32h21.peripherals.ld
+++ b/components/soc/esp32h21/ld/esp32h21.peripherals.ld
@@ -40,7 +40,6 @@ PROVIDE ( IO_MUX              = 0x60090000 );
 PROVIDE ( GPIO                = 0x60091000 );
 PROVIDE ( GPIO_EXT            = 0x60091E00 );
 PROVIDE ( SDM                 = 0x60091E04 );
-PROVIDE ( GPIO_ETM            = 0x60091F18 );
 PROVIDE ( MEM_MONITOR         = 0x60092000 );
 PROVIDE ( PAU                 = 0x60093000 );
 PROVIDE ( HP_SYSTEM           = 0x60095000 );
diff --git a/components/soc/esp32h21/register/soc/gpio_ext_struct.h b/components/soc/esp32h21/register/soc/gpio_ext_struct.h
index 5a82543aae..29ae36bccc 100644
--- a/components/soc/esp32h21/register/soc/gpio_ext_struct.h
+++ b/components/soc/esp32h21/register/soc/gpio_ext_struct.h
@@ -592,7 +592,6 @@ typedef struct {
 } gpio_ext_dev_t;
 
 extern gpio_sd_dev_t SDM;
-extern gpio_etm_dev_t GPIO_ETM;
 extern gpio_ext_dev_t GPIO_EXT;
 
 #ifndef __cplusplus
diff --git a/components/soc/esp32h4/ld/esp32h4.peripherals.ld b/components/soc/esp32h4/ld/esp32h4.peripherals.ld
index da609b7621..b6607c4ca8 100644
--- a/components/soc/esp32h4/ld/esp32h4.peripherals.ld
+++ b/components/soc/esp32h4/ld/esp32h4.peripherals.ld
@@ -46,7 +46,6 @@ PROVIDE ( IO_MUX              = 0x60092000 );
 PROVIDE ( GPIO                = 0x60093000 );
 PROVIDE ( GPIO_EXT            = 0x60093E00 );
 PROVIDE ( SDM                 = 0x60093E00 );
-PROVIDE ( GPIO_ETM            = 0x60093F18 );
 PROVIDE ( PCR                 = 0x60094000 );
 PROVIDE ( SPIMEM0             = 0x60098000 );
 PROVIDE ( SPIMEM1             = 0x60099000 );
diff --git a/components/soc/esp32h4/register/soc/gpio_ext_struct.h b/components/soc/esp32h4/register/soc/gpio_ext_struct.h
index 7664547a8f..fe99a33297 100644
--- a/components/soc/esp32h4/register/soc/gpio_ext_struct.h
+++ b/components/soc/esp32h4/register/soc/gpio_ext_struct.h
@@ -271,7 +271,6 @@ typedef struct {
 } gpio_ext_dev_t;
 
 extern gpio_sd_dev_t SDM;
-extern gpio_etm_dev_t GPIO_ETM;
 extern gpio_ext_dev_t GPIO_EXT;
 
 #ifndef __cplusplus
diff --git a/components/soc/esp32p4/ld/esp32p4.peripherals.ld b/components/soc/esp32p4/ld/esp32p4.peripherals.ld
index db01398913..354331399b 100644
--- a/components/soc/esp32p4/ld/esp32p4.peripherals.ld
+++ b/components/soc/esp32p4/ld/esp32p4.peripherals.ld
@@ -63,7 +63,6 @@ PROVIDE ( ECDSA     = 0x50096000 );
 PROVIDE ( GPIO           = 0x500E0000 );
 PROVIDE ( GPIO_EXT       = 0x500E0F00 );
 PROVIDE ( SDM            = 0x500E0F00 );
-PROVIDE ( GPIO_ETM       = 0x500E0F60 );
 PROVIDE ( IO_MUX         = 0x500E1000 );
 PROVIDE ( MSPI_IOMUX     = 0x500E1200 );
 
diff --git a/components/soc/esp32p4/register/hw_ver1/soc/gpio_ext_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/gpio_ext_struct.h
index e5fb6ea364..0511450eae 100644
--- a/components/soc/esp32p4/register/hw_ver1/soc/gpio_ext_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/gpio_ext_struct.h
@@ -181,7 +181,6 @@ typedef struct {
 } gpio_ext_dev_t;
 
 extern gpio_sd_dev_t SDM;
-extern gpio_etm_dev_t GPIO_ETM;
 extern gpio_ext_dev_t GPIO_EXT;
 
 #ifndef __cplusplus
diff --git a/components/soc/esp32p4/register/hw_ver3/soc/gpio_ext_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/gpio_ext_struct.h
index e5fb6ea364..0511450eae 100644
--- a/components/soc/esp32p4/register/hw_ver3/soc/gpio_ext_struct.h
+++ b/components/soc/esp32p4/register/hw_ver3/soc/gpio_ext_struct.h
@@ -181,7 +181,6 @@ typedef struct {
 } gpio_ext_dev_t;
 
 extern gpio_sd_dev_t SDM;
-extern gpio_etm_dev_t GPIO_ETM;
 extern gpio_ext_dev_t GPIO_EXT;
 
 #ifndef __cplusplus
diff --git a/components/soc/esp32s31/ld/esp32s31.peripherals.ld b/components/soc/esp32s31/ld/esp32s31.peripherals.ld
index 6f0fb49cbf..0c5bb04371 100644
--- a/components/soc/esp32s31/ld/esp32s31.peripherals.ld
+++ b/components/soc/esp32s31/ld/esp32s31.peripherals.ld
@@ -73,7 +73,6 @@ PROVIDE ( IO_MUX              = 0x20582000 );
 PROVIDE ( GPIO                = 0x20583000 );
 PROVIDE ( GPIO_EXT            = 0x20583E00 );
 PROVIDE ( SDM                 = 0x20583E04 );
-PROVIDE ( GPIO_ETM            = 0x20583F18 );
 PROVIDE ( MSPI_IOMUX          = 0x20584000 );
 PROVIDE ( HP_SYSTEM           = 0x20586000 );
 PROVIDE ( HP_SYS_CLKRST       = 0x20587000 );
diff --git a/components/soc/esp32s31/register/soc/gpio_ext_struct.h b/components/soc/esp32s31/register/soc/gpio_ext_struct.h
index 6476fa8fc6..1d419153a6 100644
--- a/components/soc/esp32s31/register/soc/gpio_ext_struct.h
+++ b/components/soc/esp32s31/register/soc/gpio_ext_struct.h
@@ -242,7 +242,6 @@ typedef struct {
 } gpio_ext_dev_t;
 
 extern gpio_sd_dev_t SDM;
-extern gpio_etm_dev_t GPIO_ETM;
 extern gpio_ext_dev_t GPIO_EXT;
 
 #ifndef __cplusplus