feat(esp32h21): move gpio intr source to gpio_ll.h

Bruce297 · Bruce297 · commit 7e54886a4e3e · 2025-02-24T17:32:01.000+08:00
diff --git a/components/esp_driver_gpio/src/gpio.c b/components/esp_driver_gpio/src/gpio.c
@@ -604,13 +604,7 @@ esp_err_t gpio_isr_register(void (*fn)(void *), void *arg, int intr_alloc_flags,
 {
     GPIO_CHECK(fn, "GPIO ISR null", ESP_ERR_INVALID_ARG);
     gpio_isr_alloc_t p;
-#if CONFIG_IDF_TARGET_ESP32P4  //TODO: IDF-7995
-    p.source = ETS_GPIO_INTR0_SOURCE;
-#elif CONFIG_IDF_TARGET_ESP32H21 // TODO: IDF-11611
-    p.source = ETS_GPIO_INTERRUPT_PRO_SOURCE;
-#else
-    p.source = ETS_GPIO_INTR_SOURCE;
-#endif
+    p.source = GPIO_LL_INTR_SOURCE0;
     p.intr_alloc_flags = intr_alloc_flags;
 #if SOC_ANA_CMPR_INTR_SHARE_WITH_GPIO
     p.intr_alloc_flags |= ESP_INTR_FLAG_SHARED;
diff --git a/components/hal/esp32/include/hal/gpio_ll.h b/components/hal/esp32/include/hal/gpio_ll.h
@@ -42,6 +42,8 @@ extern const uint8_t GPIO_PIN_MUX_REG_OFFSET[SOC_GPIO_PIN_COUNT];
 #define GPIO_LL_PRO_CPU_NMI_INTR_ENA  (BIT(3))
 #define GPIO_LL_SDIO_EXT_INTR_ENA     (BIT(4))
 
+#define GPIO_LL_INTR_SOURCE0   ETS_GPIO_INTR_SOURCE
+
 /**
  * @brief Get the configuration for an IO
  *
diff --git a/components/hal/esp32c2/include/hal/gpio_ll.h b/components/hal/esp32c2/include/hal/gpio_ll.h
@@ -33,6 +33,8 @@ extern "C" {
 #define GPIO_LL_PRO_CPU_INTR_ENA      (BIT(0))
 #define GPIO_LL_PRO_CPU_NMI_INTR_ENA  (BIT(1))
 
+#define GPIO_LL_INTR_SOURCE0   ETS_GPIO_INTR_SOURCE
+
 /**
  * @brief Get the configuration for an IO
  *
diff --git a/components/hal/esp32c3/include/hal/gpio_ll.h b/components/hal/esp32c3/include/hal/gpio_ll.h
@@ -35,6 +35,8 @@ extern "C" {
 #define GPIO_LL_PRO_CPU_INTR_ENA      (BIT(0))
 #define GPIO_LL_PRO_CPU_NMI_INTR_ENA  (BIT(1))
 
+#define GPIO_LL_INTR_SOURCE0   ETS_GPIO_INTR_SOURCE
+
 /**
   * @brief Enable pull-up on GPIO.
   *
diff --git a/components/hal/esp32c5/include/hal/gpio_ll.h b/components/hal/esp32c5/include/hal/gpio_ll.h
@@ -37,6 +37,8 @@ extern "C" {
 
 #define GPIO_LL_PRO_CPU_INTR_ENA      (BIT(0))
 
+#define GPIO_LL_INTR_SOURCE0   ETS_GPIO_INTR_SOURCE
+
 /**
  * @brief Get the configuration for an IO
  *
diff --git a/components/hal/esp32c6/include/hal/gpio_ll.h b/components/hal/esp32c6/include/hal/gpio_ll.h
@@ -38,6 +38,8 @@ extern "C" {
 #define GPIO_LL_PRO_CPU_INTR_ENA      (BIT(0))
 #define GPIO_LL_PRO_CPU_NMI_INTR_ENA  (BIT(1))
 
+#define GPIO_LL_INTR_SOURCE0   ETS_GPIO_INTR_SOURCE
+
 /**
  * @brief Get the configuration for an IO
  *
diff --git a/components/hal/esp32c61/include/hal/gpio_ll.h b/components/hal/esp32c61/include/hal/gpio_ll.h
@@ -38,6 +38,8 @@ extern "C" {
 #define GPIO_LL_PRO_CPU_INTR_ENA      (BIT(0))
 #define GPIO_LL_PRO_CPU_NMI_INTR_ENA  (BIT(1))
 
+#define GPIO_LL_INTR_SOURCE0   ETS_GPIO_INTR_SOURCE
+
 /**
  * @brief Get the configuration for an IO
  *
diff --git a/components/hal/esp32h2/include/hal/gpio_ll.h b/components/hal/esp32h2/include/hal/gpio_ll.h
@@ -38,6 +38,8 @@ extern "C" {
 #define GPIO_LL_PRO_CPU_INTR_ENA      (BIT(0))
 #define GPIO_LL_PRO_CPU_NMI_INTR_ENA  (BIT(1))
 
+#define GPIO_LL_INTR_SOURCE0   ETS_GPIO_INTR_SOURCE
+
 /**
  * @brief Get the configuration for an IO
  *
diff --git a/components/hal/esp32h21/include/hal/gpio_ll.h b/components/hal/esp32h21/include/hal/gpio_ll.h
@@ -39,6 +39,8 @@ extern "C" {
 #define GPIO_LL_PRO_CPU_INTR_ENA      (BIT(0))
 #define GPIO_LL_PRO_CPU_NMI_INTR_ENA  (BIT(1))
 
+#define GPIO_LL_INTR_SOURCE0   ETS_GPIO_INTERRUPT_PRO_SOURCE
+
 /**
  * @brief Get the configuration for an IO
  *
diff --git a/components/hal/esp32p4/include/hal/gpio_ll.h b/components/hal/esp32p4/include/hal/gpio_ll.h
@@ -44,6 +44,8 @@ extern "C" {
 #define GPIO_LL_INTR2_ENA      (BIT(3))
 #define GPIO_LL_INTR3_ENA      (BIT(4))
 
+#define GPIO_LL_INTR_SOURCE0   ETS_GPIO_INTR0_SOURCE
+
 /**
  * @brief Get the configuration for an IO
  *
diff --git a/components/hal/esp32s2/include/hal/gpio_ll.h b/components/hal/esp32s2/include/hal/gpio_ll.h
@@ -32,6 +32,8 @@ extern "C" {
 #define GPIO_LL_PRO_CPU_INTR_ENA      (BIT(0))
 #define GPIO_LL_PRO_CPU_NMI_INTR_ENA  (BIT(1))
 
+#define GPIO_LL_INTR_SOURCE0   ETS_GPIO_INTR_SOURCE
+
 /**
  * @brief Get the configuration for an IO
  *
diff --git a/components/hal/esp32s3/include/hal/gpio_ll.h b/components/hal/esp32s3/include/hal/gpio_ll.h
@@ -33,6 +33,8 @@ extern "C" {
 #define GPIO_LL_INTR_ENA      (BIT(0))
 #define GPIO_LL_NMI_INTR_ENA  (BIT(1))
 
+#define GPIO_LL_INTR_SOURCE0   ETS_GPIO_INTR_SOURCE
+
 /**
   * @brief Enable pull-up on GPIO.
   *

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ extern const uint8_t GPIO_PIN_MUX_REG_OFFSET[SOC_GPIO_PIN_COUNT];`
`42`	`42`	`#define GPIO_LL_PRO_CPU_NMI_INTR_ENA (BIT(3))`
`43`	`43`	`#define GPIO_LL_SDIO_EXT_INTR_ENA (BIT(4))`
`44`	`44`
	`45`	`+#define GPIO_LL_INTR_SOURCE0 ETS_GPIO_INTR_SOURCE`
	`46`	`+`
`45`	`47`	`/**`
`46`	`48`	`* @brief Get the configuration for an IO`
`47`	`49`	`*`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ extern "C" {`
`33`	`33`	`#define GPIO_LL_PRO_CPU_INTR_ENA (BIT(0))`
`34`	`34`	`#define GPIO_LL_PRO_CPU_NMI_INTR_ENA (BIT(1))`
`35`	`35`
	`36`	`+#define GPIO_LL_INTR_SOURCE0 ETS_GPIO_INTR_SOURCE`
	`37`	`+`
`36`	`38`	`/**`
`37`	`39`	`* @brief Get the configuration for an IO`
`38`	`40`	`*`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@ extern "C" {`
`35`	`35`	`#define GPIO_LL_PRO_CPU_INTR_ENA (BIT(0))`
`36`	`36`	`#define GPIO_LL_PRO_CPU_NMI_INTR_ENA (BIT(1))`
`37`	`37`
	`38`	`+#define GPIO_LL_INTR_SOURCE0 ETS_GPIO_INTR_SOURCE`
	`39`	`+`
`38`	`40`	`/**`
`39`	`41`	`* @brief Enable pull-up on GPIO.`
`40`	`42`	`*`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ extern "C" {`
`37`	`37`
`38`	`38`	`#define GPIO_LL_PRO_CPU_INTR_ENA (BIT(0))`
`39`	`39`
	`40`	`+#define GPIO_LL_INTR_SOURCE0 ETS_GPIO_INTR_SOURCE`
	`41`	`+`
`40`	`42`	`/**`
`41`	`43`	`* @brief Get the configuration for an IO`
`42`	`44`	`*`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@ extern "C" {`
`38`	`38`	`#define GPIO_LL_PRO_CPU_INTR_ENA (BIT(0))`
`39`	`39`	`#define GPIO_LL_PRO_CPU_NMI_INTR_ENA (BIT(1))`
`40`	`40`
	`41`	`+#define GPIO_LL_INTR_SOURCE0 ETS_GPIO_INTR_SOURCE`
	`42`	`+`
`41`	`43`	`/**`
`42`	`44`	`* @brief Get the configuration for an IO`
`43`	`45`	`*`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@ extern "C" {`
`39`	`39`	`#define GPIO_LL_PRO_CPU_INTR_ENA (BIT(0))`
`40`	`40`	`#define GPIO_LL_PRO_CPU_NMI_INTR_ENA (BIT(1))`
`41`	`41`
	`42`	`+#define GPIO_LL_INTR_SOURCE0 ETS_GPIO_INTERRUPT_PRO_SOURCE`
	`43`	`+`
`42`	`44`	`/**`
`43`	`45`	`* @brief Get the configuration for an IO`
`44`	`46`	`*`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ extern "C" {`
`44`	`44`	`#define GPIO_LL_INTR2_ENA (BIT(3))`
`45`	`45`	`#define GPIO_LL_INTR3_ENA (BIT(4))`
`46`	`46`
	`47`	`+#define GPIO_LL_INTR_SOURCE0 ETS_GPIO_INTR0_SOURCE`
	`48`	`+`
`47`	`49`	`/**`
`48`	`50`	`* @brief Get the configuration for an IO`
`49`	`51`	`*`