Merge branch 'change/remove_deprecated_items' into 'master'

change: remove deprecated items

See merge request espressif/esp-idf!41769

Author: Icarus113

components/esp_driver_spi/test_apps/master/main/test_spi_bus_lock.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -13,13 +13,13 @@
 #include "unity.h"
 
 #if CONFIG_IDF_TARGET_ESP32
-// The VSPI pins on UT_T1_ESP_FLASH are connected to a external flash
-#define TEST_BUS_PIN_NUM_MISO   VSPI_IOMUX_PIN_NUM_MISO
-#define TEST_BUS_PIN_NUM_MOSI   VSPI_IOMUX_PIN_NUM_MOSI
-#define TEST_BUS_PIN_NUM_CLK    VSPI_IOMUX_PIN_NUM_CLK
-#define TEST_BUS_PIN_NUM_CS     VSPI_IOMUX_PIN_NUM_CS
-#define TEST_BUS_PIN_NUM_WP     VSPI_IOMUX_PIN_NUM_WP
-#define TEST_BUS_PIN_NUM_HD     VSPI_IOMUX_PIN_NUM_HD
+// The SPI3 pins on UT_T1_ESP_FLASH are connected to a external flash
+#define TEST_BUS_PIN_NUM_MISO   SPI3_IOMUX_PIN_NUM_MISO
+#define TEST_BUS_PIN_NUM_MOSI   SPI3_IOMUX_PIN_NUM_MOSI
+#define TEST_BUS_PIN_NUM_CLK    SPI3_IOMUX_PIN_NUM_CLK
+#define TEST_BUS_PIN_NUM_CS     SPI3_IOMUX_PIN_NUM_CS
+#define TEST_BUS_PIN_NUM_WP     SPI3_IOMUX_PIN_NUM_WP
+#define TEST_BUS_PIN_NUM_HD     SPI3_IOMUX_PIN_NUM_HD
 
 #else
 #define TEST_BUS_PIN_NUM_MISO   SPI2_IOMUX_PIN_NUM_MISO

components/esp_hw_support/port/include/esp_spiram.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -209,17 +209,6 @@ esp_err_t esp_vfs_fat_sdspi_mount(const char* base_path,
                                   const esp_vfs_fat_mount_config_t* mount_config,
                                   sdmmc_card_t** out_card);
 
-/**
- * @brief Unmount FAT filesystem and release resources acquired using esp_vfs_fat_sdmmc_mount
- *
- * @deprecated Use `esp_vfs_fat_sdcard_unmount()` instead.
- *
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_INVALID_STATE if esp_vfs_fat_sdmmc_mount hasn't been called
- */
-esp_err_t esp_vfs_fat_sdmmc_unmount(void) __attribute__((deprecated("Please use esp_vfs_fat_sdcard_unmount instead")));
-
 /**
  * @brief Unmount an SD card from the FAT filesystem and release resources acquired using
  *        `esp_vfs_fat_sdmmc_mount()` or `esp_vfs_fat_sdspi_mount()`

components/fatfs/vfs/esp_vfs_fat.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -32,11 +32,6 @@ static const char* TAG = "vfs_fat_sdmmc";
     } while(0)
 
 static vfs_fat_sd_ctx_t *s_ctx[FF_VOLUMES] = {};
-/**
- * This `s_saved_ctx_id` is only used by `esp_vfs_fat_sdmmc_unmount`, which is deprecated.
- * This variable together with `esp_vfs_fat_sdmmc_unmount` should be removed in next major version
- */
-static uint32_t s_saved_ctx_id = FF_VOLUMES;
 
 static void call_host_deinit(const sdmmc_host_t *host_config);
 static esp_err_t partition_card(const esp_vfs_fat_mount_config_t *mount_config,
@@ -287,10 +282,6 @@ esp_err_t esp_vfs_fat_sdmmc_mount(const char* base_path,
     if (out_card != NULL) {
         *out_card = card;
     }
-    //For deprecation backward compatibility
-    if (s_saved_ctx_id == FF_VOLUMES) {
-        s_saved_ctx_id = 0;
-    }
 
     ctx = calloc(1, sizeof(vfs_fat_sd_ctx_t));
     if (!ctx) {
@@ -385,10 +376,6 @@ esp_err_t esp_vfs_fat_sdspi_mount(const char* base_path,
     if (out_card != NULL) {
         *out_card = card;
     }
-    //For deprecation backward compatibility
-    if (s_saved_ctx_id == FF_VOLUMES) {
-        s_saved_ctx_id = 0;
-    }
 
     ctx = calloc(1, sizeof(vfs_fat_sd_ctx_t));
     if (!ctx) {
@@ -444,15 +431,6 @@ static esp_err_t unmount_card_core(const char *base_path, sdmmc_card_t *card)
     return err;
 }
 
-esp_err_t esp_vfs_fat_sdmmc_unmount(void)
-{
-    esp_err_t err = unmount_card_core(s_ctx[s_saved_ctx_id]->base_path, s_ctx[s_saved_ctx_id]->card);
-    free(s_ctx[s_saved_ctx_id]);
-    s_ctx[s_saved_ctx_id] = NULL;
-    s_saved_ctx_id = FF_VOLUMES;
-    return err;
-}
-
 esp_err_t esp_vfs_fat_sdcard_unmount(const char *base_path, sdmmc_card_t *card)
 {
     uint32_t id = FF_VOLUMES;

components/fatfs/vfs/vfs_fat_sdmmc.c

@@ -85,7 +85,6 @@ typedef struct {
     };
     bool iomux;             ///< Whether the IOMUX is used, used for timing compensation.
     int input_delay_ns;     ///< Input delay on the MISO pin after the launch clock, used for timing compensation.
-    enum esp_flash_speed_s speed __attribute__((deprecated));      ///< SPI flash clock speed to work at. Replaced by freq_mhz
     spi_host_device_t host_id;            ///< SPI peripheral ID.
     int cs_num;             ///< Which cs pin is used, 0-(SOC_SPI_PERIPH_CS_NUM-1).
     bool auto_sus_en;       ///< Auto suspend feature enable bit 1: enable, 0: disable.

components/hal/include/hal/spi_flash_hal.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2010-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2010-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -33,25 +33,6 @@ typedef struct {
     uint32_t io_mode;           ///< Flash working mode when `SPI_FLASH_IGNORE_BASEIO` is specified.
 } spi_flash_trans_t;
 
-/**
- * @brief SPI flash clock speed values, always refer to them by the enum rather
- * than the actual value (more speed may be appended into the list).
- *
- * A strategy to select the maximum allowed speed is to enumerate from the
- * ``ESP_FLSH_SPEED_MAX-1`` or highest frequency supported by your flash, and
- * decrease the speed until the probing success.
- */
-typedef enum esp_flash_speed_s {
-    ESP_FLASH_5MHZ = 5, ///< The flash runs under 5MHz
-    ESP_FLASH_10MHZ = 10,    ///< The flash runs under 10MHz
-    ESP_FLASH_20MHZ = 20,    ///< The flash runs under 20MHz
-    ESP_FLASH_26MHZ = 26,    ///< The flash runs under 26MHz
-    ESP_FLASH_40MHZ = 40,    ///< The flash runs under 40MHz
-    ESP_FLASH_80MHZ = 80,    ///< The flash runs under 80MHz
-    ESP_FLASH_120MHZ = 120,   ///< The flash runs under 120MHz, 120MHZ can only be used by main flash after timing tuning in system. Do not use this directly in any API.
-    ESP_FLASH_SPEED_MAX, ///< The maximum frequency supported by the host is ``ESP_FLASH_SPEED_MAX-1``.
-} esp_flash_speed_t __attribute__((deprecated));
-
 // These bits are not quite like "IO mode", but are able to be appended into the io mode and used by the HAL.
 #define SPI_FLASH_CONFIG_CONF_BITS      BIT(31) ///< OR the io_mode with this mask, to enable the dummy output feature or replace the first several dummy bits into address to meet the requirements of conf bits. (Used in DIO/QIO/OIO mode)
 

components/hal/include/hal/spi_flash_types.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -23,35 +23,18 @@
 #define SPI_D2WD_PIN_NUM_WP         7
 #define SPI_D2WD_PIN_NUM_HD         11
 
-#define SPI2_FUNC_NUM           HSPI_FUNC_NUM
-#define SPI2_IOMUX_PIN_NUM_MISO HSPI_IOMUX_PIN_NUM_MISO
-#define SPI2_IOMUX_PIN_NUM_MOSI HSPI_IOMUX_PIN_NUM_MOSI
-#define SPI2_IOMUX_PIN_NUM_CLK  HSPI_IOMUX_PIN_NUM_CLK
-#define SPI2_IOMUX_PIN_NUM_CS   HSPI_IOMUX_PIN_NUM_CS
-#define SPI2_IOMUX_PIN_NUM_WP   HSPI_IOMUX_PIN_NUM_WP
-#define SPI2_IOMUX_PIN_NUM_HD   HSPI_IOMUX_PIN_NUM_HD
+#define SPI2_FUNC_NUM           1
+#define SPI2_IOMUX_PIN_NUM_MISO 12
+#define SPI2_IOMUX_PIN_NUM_MOSI 13
+#define SPI2_IOMUX_PIN_NUM_CLK  14
+#define SPI2_IOMUX_PIN_NUM_CS   15
+#define SPI2_IOMUX_PIN_NUM_WP   2
+#define SPI2_IOMUX_PIN_NUM_HD   4
 
-#define SPI3_FUNC_NUM           VSPI_FUNC_NUM
-#define SPI3_IOMUX_PIN_NUM_MISO VSPI_IOMUX_PIN_NUM_MISO
-#define SPI3_IOMUX_PIN_NUM_MOSI VSPI_IOMUX_PIN_NUM_MOSI
-#define SPI3_IOMUX_PIN_NUM_CLK  VSPI_IOMUX_PIN_NUM_CLK
-#define SPI3_IOMUX_PIN_NUM_CS   VSPI_IOMUX_PIN_NUM_CS
-#define SPI3_IOMUX_PIN_NUM_WP   VSPI_IOMUX_PIN_NUM_WP
-#define SPI3_IOMUX_PIN_NUM_HD   VSPI_IOMUX_PIN_NUM_HD
-
-//Following Macros are deprecated. Please use the Macros above
-#define HSPI_FUNC_NUM           1
-#define HSPI_IOMUX_PIN_NUM_MISO 12
-#define HSPI_IOMUX_PIN_NUM_MOSI 13
-#define HSPI_IOMUX_PIN_NUM_CLK  14
-#define HSPI_IOMUX_PIN_NUM_CS   15
-#define HSPI_IOMUX_PIN_NUM_WP   2
-#define HSPI_IOMUX_PIN_NUM_HD   4
-
-#define VSPI_FUNC_NUM           1
-#define VSPI_IOMUX_PIN_NUM_MISO 19
-#define VSPI_IOMUX_PIN_NUM_MOSI 23
-#define VSPI_IOMUX_PIN_NUM_CLK  18
-#define VSPI_IOMUX_PIN_NUM_CS   5
-#define VSPI_IOMUX_PIN_NUM_WP   22
-#define VSPI_IOMUX_PIN_NUM_HD   21
+#define SPI3_FUNC_NUM           1
+#define SPI3_IOMUX_PIN_NUM_MISO 19
+#define SPI3_IOMUX_PIN_NUM_MOSI 23
+#define SPI3_IOMUX_PIN_NUM_CLK  18
+#define SPI3_IOMUX_PIN_NUM_CS   5
+#define SPI3_IOMUX_PIN_NUM_WP   22
+#define SPI3_IOMUX_PIN_NUM_HD   21

components/soc/esp32/include/soc/spi_pins.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -46,15 +46,15 @@ const spi_signal_conn_t spi_periph_signal[3] = {
         .spihd_in = HSPIHD_IN_IDX,
         .spics_out = {HSPICS0_OUT_IDX, HSPICS1_OUT_IDX, HSPICS2_OUT_IDX},
         .spics_in = HSPICS0_IN_IDX,
-        .spiclk_iomux_pin = HSPI_IOMUX_PIN_NUM_CLK,
-        .spid_iomux_pin = HSPI_IOMUX_PIN_NUM_MOSI,
-        .spiq_iomux_pin = HSPI_IOMUX_PIN_NUM_MISO,
-        .spiwp_iomux_pin = HSPI_IOMUX_PIN_NUM_WP,
-        .spihd_iomux_pin = HSPI_IOMUX_PIN_NUM_HD,
-        .spics0_iomux_pin = HSPI_IOMUX_PIN_NUM_CS,
+        .spiclk_iomux_pin = SPI2_IOMUX_PIN_NUM_CLK,
+        .spid_iomux_pin = SPI2_IOMUX_PIN_NUM_MOSI,
+        .spiq_iomux_pin = SPI2_IOMUX_PIN_NUM_MISO,
+        .spiwp_iomux_pin = SPI2_IOMUX_PIN_NUM_WP,
+        .spihd_iomux_pin = SPI2_IOMUX_PIN_NUM_HD,
+        .spics0_iomux_pin = SPI2_IOMUX_PIN_NUM_CS,
         .irq = ETS_SPI2_INTR_SOURCE,
         .irq_dma = ETS_SPI2_DMA_INTR_SOURCE,
-        .func = HSPI_FUNC_NUM,
+        .func = SPI2_FUNC_NUM,
         .hw = &SPI2
     }, {
         .spiclk_out = VSPICLK_OUT_IDX,
@@ -69,15 +69,15 @@ const spi_signal_conn_t spi_periph_signal[3] = {
         .spihd_in = VSPIHD_IN_IDX,
         .spics_out = {VSPICS0_OUT_IDX, VSPICS1_OUT_IDX, VSPICS2_OUT_IDX},
         .spics_in = VSPICS0_IN_IDX,
-        .spiclk_iomux_pin = VSPI_IOMUX_PIN_NUM_CLK,
-        .spid_iomux_pin = VSPI_IOMUX_PIN_NUM_MOSI,
-        .spiq_iomux_pin = VSPI_IOMUX_PIN_NUM_MISO,
-        .spiwp_iomux_pin = VSPI_IOMUX_PIN_NUM_WP,
-        .spihd_iomux_pin = VSPI_IOMUX_PIN_NUM_HD,
-        .spics0_iomux_pin = VSPI_IOMUX_PIN_NUM_CS,
+        .spiclk_iomux_pin = SPI3_IOMUX_PIN_NUM_CLK,
+        .spid_iomux_pin = SPI3_IOMUX_PIN_NUM_MOSI,
+        .spiq_iomux_pin = SPI3_IOMUX_PIN_NUM_MISO,
+        .spiwp_iomux_pin = SPI3_IOMUX_PIN_NUM_WP,
+        .spihd_iomux_pin = SPI3_IOMUX_PIN_NUM_HD,
+        .spics0_iomux_pin = SPI3_IOMUX_PIN_NUM_CS,
         .irq = ETS_SPI3_INTR_SOURCE,
         .irq_dma = ETS_SPI3_DMA_INTR_SOURCE,
-        .func = VSPI_FUNC_NUM,
+        .func = SPI3_FUNC_NUM,
         .hw = &SPI3
     }
 };

components/soc/esp32/spi_periph.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -46,12 +46,3 @@
 #define SPI2_IOMUX_PIN_NUM_IO7_OCT  13
 
 //SPI3 has no iomux pins
-
-//Following Macros are deprecated. Please use the Macros above
-#define FSPI_FUNC_NUM           SPI2_FUNC_NUM
-#define FSPI_IOMUX_PIN_NUM_HD   SPI2_IOMUX_PIN_NUM_HD
-#define FSPI_IOMUX_PIN_NUM_CS   SPI2_IOMUX_PIN_NUM_CS
-#define FSPI_IOMUX_PIN_NUM_MOSI SPI2_IOMUX_PIN_NUM_MOSI
-#define FSPI_IOMUX_PIN_NUM_CLK  SPI2_IOMUX_PIN_NUM_CLK
-#define FSPI_IOMUX_PIN_NUM_MISO SPI2_IOMUX_PIN_NUM_MISO
-#define FSPI_IOMUX_PIN_NUM_WP   SPI2_IOMUX_PIN_NUM_WP

components/soc/esp32s2/include/soc/spi_pins.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -56,16 +56,16 @@ const spi_signal_conn_t spi_periph_signal[SOC_SPI_PERIPH_NUM] = {
         .spid7_in = FSPIIO7_IN_IDX,
         .spics_out = {FSPICS0_OUT_IDX, FSPICS1_OUT_IDX, FSPICS2_OUT_IDX, FSPICS3_OUT_IDX, FSPICS4_OUT_IDX, FSPICS5_OUT_IDX},
         .spics_in = FSPICS0_IN_IDX,
-        .spiclk_iomux_pin = FSPI_IOMUX_PIN_NUM_CLK,
-        .spid_iomux_pin = FSPI_IOMUX_PIN_NUM_MOSI,
-        .spiq_iomux_pin = FSPI_IOMUX_PIN_NUM_MISO,
-        .spiwp_iomux_pin = FSPI_IOMUX_PIN_NUM_WP,
-        .spihd_iomux_pin = FSPI_IOMUX_PIN_NUM_HD,
-        .spics0_iomux_pin = FSPI_IOMUX_PIN_NUM_CS,
+        .spiclk_iomux_pin = SPI2_IOMUX_PIN_NUM_CLK,
+        .spid_iomux_pin = SPI2_IOMUX_PIN_NUM_MOSI,
+        .spiq_iomux_pin = SPI2_IOMUX_PIN_NUM_MISO,
+        .spiwp_iomux_pin = SPI2_IOMUX_PIN_NUM_WP,
+        .spihd_iomux_pin = SPI2_IOMUX_PIN_NUM_HD,
+        .spics0_iomux_pin = SPI2_IOMUX_PIN_NUM_CS,
         .irq = ETS_SPI2_INTR_SOURCE,
         .irq_dma = ETS_SPI2_DMA_INTR_SOURCE,
         .hw = &GPSPI2,
-        .func = FSPI_FUNC_NUM,
+        .func = SPI2_FUNC_NUM,
     }, {
         .spiclk_out = SPI3_CLK_OUT_MUX_IDX,
         .spiclk_in = SPI3_CLK_IN_IDX,