Skip to content

Commit e71e755

Browse files
committed
Merge branch 'refactor/remove_legacy_i2s_driver' into 'master'
remove(legacy_i2s): remove legacy i2s driver in IDF v6.0 Closes IDF-13170 See merge request espressif/esp-idf!39681
2 parents 443e871 + 6eb5bfe commit e71e755

File tree

32 files changed

+23
-9305
lines changed

32 files changed

+23
-9305
lines changed

components/driver/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ if(CONFIG_SOC_I2C_SUPPORTED)
3636
list(APPEND srcs "i2c/i2c.c")
3737
endif()
3838

39-
# I2S related source files
40-
if(CONFIG_SOC_I2S_SUPPORTED)
41-
list(APPEND srcs "deprecated/i2s_legacy.c")
42-
endif()
43-
4439
# MCPWM legacy driver
4540
if(CONFIG_SOC_MCPWM_SUPPORTED)
4641
list(APPEND srcs "deprecated/mcpwm_legacy.c")

components/driver/Kconfig

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -119,23 +119,6 @@ menu "Driver Configurations"
119119
This configuration option allows the user to bypass the conflict check mechanism with legacy code.
120120
endmenu # Legacy RMT Driver Configurations
121121

122-
menu "Legacy I2S Driver Configurations"
123-
depends on SOC_I2S_SUPPORTED
124-
config I2S_SUPPRESS_DEPRECATE_WARN
125-
bool "Suppress legacy driver deprecated warning"
126-
default n
127-
help
128-
Whether to suppress the deprecation warnings when using legacy i2s driver (driver/i2s.h).
129-
If you want to continue using the legacy driver, and don't want to see related deprecation warnings,
130-
you can enable this option.
131-
132-
config I2S_SKIP_LEGACY_CONFLICT_CHECK
133-
bool "Skip legacy conflict check"
134-
default n
135-
help
136-
This configuration option allows the user to bypass the conflict check mechanism with legacy code.
137-
endmenu # Legacy I2S Driver Configurationss
138-
139122
menu "Legacy I2C Driver Configurations"
140123
depends on SOC_I2C_SUPPORTED
141124
config I2C_SKIP_LEGACY_CONFLICT_CHECK

0 commit comments

Comments
 (0)