diff --git a/components/esp_adc/Kconfig b/components/esp_adc/Kconfig
index 80ec475dbb..d6af0751f0 100644
--- a/components/esp_adc/Kconfig
+++ b/components/esp_adc/Kconfig
@@ -2,6 +2,7 @@ menu "ADC and ADC Calibration"
 
     config ADC_ONESHOT_CTRL_FUNC_IN_IRAM
         bool "Place ISR version ADC oneshot mode read function into IRAM"
+        select ESP_PERIPH_CTRL_FUNC_IN_IRAM
         default n
         help
             Place ISR version ADC oneshot mode read function into IRAM.
diff --git a/components/esp_driver_parlio/Kconfig b/components/esp_driver_parlio/Kconfig
index 345e5f4cf1..6d4562eebd 100644
--- a/components/esp_driver_parlio/Kconfig
+++ b/components/esp_driver_parlio/Kconfig
@@ -6,6 +6,7 @@ menu "ESP-Driver:Parallel IO Configurations"
         default y
         select PARLIO_OBJ_CACHE_SAFE
         select GDMA_CTRL_FUNC_IN_IRAM
+        select ESP_PERIPH_CTRL_FUNC_IN_IRAM
         help
             Place Parallel IO TX ISR handler in IRAM to reduce latency caused by cache miss.
 
diff --git a/components/esp_driver_spi/Kconfig b/components/esp_driver_spi/Kconfig
index abfb6d4600..da78416f8c 100644
--- a/components/esp_driver_spi/Kconfig
+++ b/components/esp_driver_spi/Kconfig
@@ -23,6 +23,7 @@ menu "ESP-Driver:SPI Configurations"
         bool "Place SPI master ISR function into IRAM"
         default y
         depends on !HEAP_PLACE_FUNCTION_INTO_FLASH
+        select ESP_PERIPH_CTRL_FUNC_IN_IRAM
         select ESP_SPI_BUS_LOCK_ISR_FUNCS_IN_IRAM
         select GDMA_CTRL_FUNC_IN_IRAM if SOC_GDMA_SUPPORTED
         help
@@ -51,6 +52,7 @@ menu "ESP-Driver:SPI Configurations"
     config SPI_SLAVE_ISR_IN_IRAM
         bool "Place SPI slave ISR function into IRAM"
         default y
+        select ESP_PERIPH_CTRL_FUNC_IN_IRAM
         select GDMA_CTRL_FUNC_IN_IRAM if SOC_GDMA_SUPPORTED
         help
             Place the SPI slave ISR in to IRAM to avoid possible cache miss.
diff --git a/components/esp_hw_support/Kconfig b/components/esp_hw_support/Kconfig
index d63f73fd2b..fe5614ce08 100644
--- a/components/esp_hw_support/Kconfig
+++ b/components/esp_hw_support/Kconfig
@@ -70,7 +70,8 @@ menu "Hardware Settings"
         # regardless of power management configuration.
         config ESP_SLEEP_POWER_DOWN_FLASH
             bool "Power down flash in light sleep when there is no SPIRAM or SPIRAM has independent power supply"
-            select PM_SLP_IRAM_OPT
+            # TODO: PM-383
+            select PM_SLP_IRAM_OPT if !IDF_TARGET_ESP32H21
             select ESP_PERIPH_CTRL_FUNC_IN_IRAM
             select ESP_REGI2C_CTRL_FUNC_IN_IRAM
             depends on !SPIRAM || ESP_LDO_RESERVE_PSRAM
diff --git a/components/esp_lcd/Kconfig b/components/esp_lcd/Kconfig
index a53f8514a9..0cc7d93381 100644
--- a/components/esp_lcd/Kconfig
+++ b/components/esp_lcd/Kconfig
@@ -10,6 +10,7 @@ menu "ESP-Driver:LCD Controller Configurations"
         config LCD_RGB_ISR_IRAM_SAFE
             bool "RGB LCD ISR IRAM-Safe"
             select GDMA_ISR_HANDLER_IN_IRAM # bounce buffer mode relies on GDMA EOF interrupt
+            select ESP_PERIPH_CTRL_FUNC_IN_IRAM
             default n
             help
                 Ensure the LCD interrupt is IRAM-Safe by allowing the interrupt handler to be