diff --git a/components/esp_hw_support/include/esp_ds.h b/components/esp_hw_support/include/esp_ds.h
index 449ef62828..6ff822ea2d 100644
--- a/components/esp_hw_support/include/esp_ds.h
+++ b/components/esp_hw_support/include/esp_ds.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -12,6 +12,8 @@
 #include "esp_ds_err.h"
 #include "soc/soc_caps.h"
 
+#ifdef SOC_DIG_SIGN_SUPPORTED
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -61,7 +63,7 @@ typedef struct esp_digital_signature_data {
      * alter the DS peripheral results this way, it will just truncate or
      * extend the message and the resulting signature in software.)
      *
-     * @note In IDF, the enum type length is the same as of type unsigned, so they can be used interchangably.
+     * @note In IDF, the enum type length is the same as of type unsigned, so they can be used interchangeably.
      *       See the ROM code for the original declaration of struct \c ets_ds_data_t.
      */
     esp_digital_signature_length_t rsa_length;
@@ -186,7 +188,7 @@ bool esp_ds_is_busy(void);
  *
  * @param signature the destination of the signature, should be (data->rsa_length + 1)*4 bytes long,
           the resultant signature bytes shall be written in little endian format.
- * @param esp_ds_ctx the context object retreived by \c esp_ds_start_sign()
+ * @param esp_ds_ctx the context object retrieved by \c esp_ds_start_sign()
  *
  * @return
  *      - ESP_OK if successful, the ds operation has been finished and the result is written to signature.
@@ -232,3 +234,5 @@ esp_err_t esp_ds_encrypt_params(esp_ds_data_t *data,
 #ifdef __cplusplus
 }
 #endif
+
+#endif
diff --git a/components/soc/esp32c61/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c61/include/soc/Kconfig.soc_caps.in
index cd51c64628..a8afa1dca2 100644
--- a/components/soc/esp32c61/include/soc/Kconfig.soc_caps.in
+++ b/components/soc/esp32c61/include/soc/Kconfig.soc_caps.in
@@ -171,18 +171,6 @@ config SOC_CPU_PMP_REGION_GRANULARITY
     int
     default 128
 
-config SOC_DS_SIGNATURE_MAX_BIT_LEN
-    int
-    default 3072
-
-config SOC_DS_KEY_PARAM_MD_IV_LENGTH
-    int
-    default 16
-
-config SOC_DS_KEY_CHECK_MAX_WAIT_US
-    int
-    default 1100
-
 config SOC_ETM_GROUPS
     int
     default 1
diff --git a/components/soc/esp32c61/include/soc/soc_caps.h b/components/soc/esp32c61/include/soc/soc_caps.h
index db6f419857..1513a65cf7 100644
--- a/components/soc/esp32c61/include/soc/soc_caps.h
+++ b/components/soc/esp32c61/include/soc/soc_caps.h
@@ -43,8 +43,6 @@
 //  \#define SOC_SUPPORT_COEXISTENCE         1
 //  \#define SOC_MPI_SUPPORTED               1
 //  \#define SOC_SHA_SUPPORTED               1    //TODO: [ESP32C61] IDF-9234
-//  \#define SOC_HMAC_SUPPORTED              1    //TODO: [ESP32C61] IDF-9323
-//  \#define SOC_DIG_SIGN_SUPPORTED          1    //TODO: [ESP32C61] IDF-9325
 #define SOC_ECC_SUPPORTED               1
 #define SOC_ECC_EXTENDED_MODES_SUPPORTED   1
 #define SOC_FLASH_ENC_SUPPORTED         1
@@ -154,18 +152,6 @@
 #define SOC_CPU_PMP_REGION_GRANULARITY  128 // TODO IDF-9580 check when doing PMP bringup
 
 
-/*-------------------------- DIGITAL SIGNATURE CAPS ----------------------------------------*/
-//TODO: [ESP32C61] IDF-9325 (Copy from esp32c6, need check)
-/** The maximum length of a Digital Signature in bits. */
-#define SOC_DS_SIGNATURE_MAX_BIT_LEN (3072)
-
-/** Initialization vector (IV) length for the RSA key parameter message digest (MD) in bytes. */
-#define SOC_DS_KEY_PARAM_MD_IV_LENGTH (16)
-
-/** Maximum wait time for DS parameter decryption key. If overdue, then key error.
-    See TRM DS chapter for more details */
-#define SOC_DS_KEY_CHECK_MAX_WAIT_US (1100)
-
 //TODO: [ESP32C61] IDF-9310
 /*-------------------------- GDMA CAPS -------------------------------------*/
 //  \#define SOC_AHB_GDMA_VERSION            1U