This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit dd7ac7e57d2a84e98c250a968f3fb9436b55367f
Author: Eren Terzioglu <eren.terzio...@espressif.com>
AuthorDate: Fri Mar 28 16:45:25 2025 +0100
boards/xtensa: Remove legacy I2S implementation for esp32[-|-s2|s3]
Remove legacy I2S implementation without breaking defconfigs for Xtensa
based Espressif devices
Signed-off-by: Eren Terzioglu <eren.terzio...@espressif.com>
---
boards/xtensa/esp32/common/src/Make.defs | 4 ---
.../xtensa/esp32/common/src/esp32_board_i2sdev.c | 16 +++------
boards/xtensa/esp32/common/src/esp32_cs4344.c | 8 ++---
boards/xtensa/esp32/common/src/esp32_es8388.c | 8 ++---
.../esp32/esp32-audio-kit/configs/audio/defconfig | 15 ++++-----
.../esp32/esp32-audio-kit/src/esp32-audio-kit.h | 4 +--
.../esp32/esp32-audio-kit/src/esp32_bringup.c | 20 ++++++------
.../esp32/esp32-devkitc/configs/audio/defconfig | 9 ++---
.../esp32/esp32-devkitc/configs/i2schar/defconfig | 9 ++---
.../esp32/esp32-devkitc/configs/nxlooper/defconfig | 14 +++-----
.../xtensa/esp32/esp32-devkitc/src/esp32-devkitc.h | 4 +--
.../xtensa/esp32/esp32-devkitc/src/esp32_bringup.c | 36 ++++++++++----------
.../esp32/esp32-lyrat/configs/audio/defconfig | 15 ++++-----
.../esp32/esp32-lyrat/configs/nxrecorder/defconfig | 15 ++++-----
.../esp32/esp32-lyrat/configs/rtptools/defconfig | 15 ++++-----
boards/xtensa/esp32/esp32-lyrat/src/esp32-lyrat.h | 4 +--
.../xtensa/esp32/esp32-lyrat/src/esp32_bringup.c | 20 ++++++------
.../esp32/esp32-pico-kit/src/esp32-pico-kit.h | 2 +-
.../esp32/esp32-pico-kit/src/esp32_bringup.c | 38 +++++++++++-----------
.../esp32-sparrow-kit/configs/mqttc/defconfig | 14 ++++----
.../esp32/esp32-sparrow-kit/configs/nsh/defconfig | 14 ++++----
.../esp32/esp32-sparrow-kit/configs/wifi/defconfig | 14 ++++----
.../esp32-sparrow-kit/src/esp32-sparrow-kit.h | 2 +-
.../esp32/esp32-sparrow-kit/src/esp32_bringup.c | 14 ++++----
boards/xtensa/esp32s2/common/src/Make.defs | 4 ---
.../esp32s2/common/src/esp32s2_board_i2sdev.c | 14 ++------
boards/xtensa/esp32s2/common/src/esp32s2_cs4344.c | 8 ++---
boards/xtensa/esp32s2/common/src/esp32s2_es8311.c | 8 ++---
.../esp32s2-kaluga-1/configs/audio/defconfig | 18 +++++-----
.../esp32s2-kaluga-1/configs/nxlooper/defconfig | 18 +++++-----
.../esp32s2-kaluga-1/src/esp32s2-kaluga-1.h | 2 +-
.../esp32s2/esp32s2-kaluga-1/src/esp32s2_bringup.c | 8 ++---
.../esp32s2-saola-1/configs/audio/defconfig | 8 ++---
.../esp32s2-saola-1/configs/i2schar/defconfig | 6 ++--
.../esp32s2-saola-1/configs/nxlooper/defconfig | 6 ++--
.../esp32s2/esp32s2-saola-1/src/esp32s2-saola-1.h | 2 +-
.../esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c | 12 +++----
boards/xtensa/esp32s3/common/src/Make.defs | 4 ---
.../xtensa/esp32s3/common/src/esp32s3_board_i2s.c | 14 +++-----
boards/xtensa/esp32s3/common/src/esp32s3_cs4344.c | 8 ++---
boards/xtensa/esp32s3/common/src/esp32s3_es8311.c | 8 ++---
.../esp32s3/esp32s3-devkit/configs/audio/defconfig | 15 ++++-----
.../esp32s3-devkit/configs/nxlooper/defconfig | 27 ++++++++-------
.../esp32s3/esp32s3-devkit/src/esp32s3-devkit.h | 2 +-
.../esp32s3/esp32s3-devkit/src/esp32s3_bringup.c | 32 +++++++++---------
.../esp32s3-korvo-2/configs/audio/defconfig | 15 ++++-----
.../esp32s3-korvo-2/configs/rtptools/defconfig | 15 ++++-----
.../esp32s3/esp32s3-korvo-2/src/esp32s3_bringup.c | 38 +++++++++++-----------
.../esp32s3/esp32s3-lcd-ev/configs/audio/defconfig | 15 ++++-----
.../esp32s3/esp32s3-lcd-ev/src/esp32s3_bringup.c | 38 +++++++++++-----------
.../esp32s3/lckfb-szpi-esp32s3/src/esp32s3-szpi.h | 2 +-
.../lckfb-szpi-esp32s3/src/esp32s3_bringup.c | 34 +++++++++----------
52 files changed, 310 insertions(+), 385 deletions(-)
diff --git a/boards/xtensa/esp32/common/src/Make.defs
b/boards/xtensa/esp32/common/src/Make.defs
index b9ce85089c..98d871f142 100644
--- a/boards/xtensa/esp32/common/src/Make.defs
+++ b/boards/xtensa/esp32/common/src/Make.defs
@@ -34,10 +34,6 @@ ifeq ($(CONFIG_I2C_DRIVER),y)
CSRCS += esp32_board_i2c.c
endif
-ifeq ($(CONFIG_ESP32_I2S),y)
- CSRCS += esp32_board_i2sdev.c
-endif
-
ifeq ($(CONFIG_ESPRESSIF_I2S),y)
CSRCS += esp32_board_i2sdev.c
endif
diff --git a/boards/xtensa/esp32/common/src/esp32_board_i2sdev.c
b/boards/xtensa/esp32/common/src/esp32_board_i2sdev.c
index a4fb9d439a..ddca4f72d7 100644
--- a/boards/xtensa/esp32/common/src/esp32_board_i2sdev.c
+++ b/boards/xtensa/esp32/common/src/esp32_board_i2sdev.c
@@ -37,16 +37,12 @@
#include <arch/board/board.h>
-#ifdef CONFIG_ESP32_I2S
-# include "esp32_i2s.h"
-#endif
-
#ifdef CONFIG_ESPRESSIF_I2S
# include "espressif/esp_i2s.h"
#endif
-#if defined(CONFIG_ESP32_I2S0) && !defined(CONFIG_AUDIO_CS4344) || \
- defined(CONFIG_ESP32_I2S1) || defined(CONFIG_ESPRESSIF_I2S)
+#if defined(CONFIG_ESPRESSIF_I2S0) && !defined(CONFIG_AUDIO_CS4344) || \
+ defined(CONFIG_ESPRESSIF_I2S1)
/****************************************************************************
* Public Functions
@@ -81,11 +77,7 @@ int board_i2sdev_initialize(int port, bool enable_tx, bool
enable_rx)
ainfo("Initializing I2S\n");
-#ifdef CONFIG_ESP32_I2S
- i2s = esp32_i2sbus_initialize(port);
-#else
i2s = esp_i2sbus_initialize(port);
-#endif
#ifdef CONFIG_AUDIO_I2SCHAR
ret = i2schar_register(i2s, port);
@@ -166,5 +158,5 @@ int board_i2sdev_initialize(int port, bool enable_tx, bool
enable_rx)
return ret;
}
-#endif /* CONFIG_ESP32_I2S0 && !CONFIG_AUDIO_CS4344 && \ *
- * !CONFIG_AUDIO_ES8388 || CONFIG_ESP32_I2S1 */
+#endif /* CONFIG_ESPRESSIF_I2S0 && !CONFIG_AUDIO_CS4344 && \ *
+ * !CONFIG_AUDIO_ES8388 || CONFIG_ESPRESSIF_I2S1 */
diff --git a/boards/xtensa/esp32/common/src/esp32_cs4344.c
b/boards/xtensa/esp32/common/src/esp32_cs4344.c
index fc821e9490..dd669f75ca 100644
--- a/boards/xtensa/esp32/common/src/esp32_cs4344.c
+++ b/boards/xtensa/esp32/common/src/esp32_cs4344.c
@@ -39,9 +39,9 @@
#include <arch/board/board.h>
-#include "esp32_i2s.h"
+#include "espressif/esp_i2s.h"
-#if defined CONFIG_ESP32_I2S && defined CONFIG_AUDIO_CS4344
+#if defined CONFIG_ESPRESSIF_I2S && defined CONFIG_AUDIO_CS4344
/****************************************************************************
* Public Functions
@@ -87,7 +87,7 @@ int esp32_cs4344_initialize(int port)
{
/* Get an instance of the I2S interface for the CS4344 data channel */
- i2s = esp32_i2sbus_initialize(port);
+ i2s = esp_i2sbus_initialize(port);
if (!i2s)
{
auderr("ERROR: Failed to initialize I2S%d\n", port);
@@ -165,4 +165,4 @@ errout:
return ret;
}
-#endif /* CONFIG_ESP32_I2S && CONFIG_AUDIO_CS4344 */
+#endif /* CONFIG_ESPRESSIF_I2S && CONFIG_AUDIO_CS4344 */
diff --git a/boards/xtensa/esp32/common/src/esp32_es8388.c
b/boards/xtensa/esp32/common/src/esp32_es8388.c
index 2eb98b61ce..7cfdfe8312 100644
--- a/boards/xtensa/esp32/common/src/esp32_es8388.c
+++ b/boards/xtensa/esp32/common/src/esp32_es8388.c
@@ -43,9 +43,9 @@
#include "esp32_board_i2c.h"
#include "esp32_i2c.h"
-#include "esp32_i2s.h"
+#include "espressif/esp_i2s.h"
-#if defined(CONFIG_ESP32_I2S) && defined(CONFIG_AUDIO_ES8388)
+#if defined(CONFIG_ESPRESSIF_I2S) && defined(CONFIG_AUDIO_ES8388)
/****************************************************************************
* Private Data
@@ -104,7 +104,7 @@ int esp32_es8388_initialize(int i2c_port, uint8_t i2c_addr,
int i2c_freq,
{
/* Get an instance of the I2S interface for the ES8388 data channel */
- i2s = esp32_i2sbus_initialize(i2s_port);
+ i2s = esp_i2sbus_initialize(i2s_port);
if (i2s == NULL)
{
auderr("ERROR: Failed to initialize I2S%d\n", i2s_port);
@@ -219,4 +219,4 @@ errout:
return ret;
}
-#endif /* CONFIG_ESP32_I2S && CONFIG_AUDIO_ES8388 */
+#endif /* CONFIG_ESPRESSIF_I2S && CONFIG_AUDIO_ES8388 */
diff --git a/boards/xtensa/esp32/esp32-audio-kit/configs/audio/defconfig
b/boards/xtensa/esp32/esp32-audio-kit/configs/audio/defconfig
index 089b9c85bf..6c5b8b9d82 100644
--- a/boards/xtensa/esp32/esp32-audio-kit/configs/audio/defconfig
+++ b/boards/xtensa/esp32/esp32-audio-kit/configs/audio/defconfig
@@ -6,7 +6,7 @@
# modifications.
#
# CONFIG_ARCH_LEDS is not set
-# CONFIG_ESP32_I2S0_RX is not set
+# CONFIG_ESPRESSIF_I2S0_RX is not set
# CONFIG_NDEBUG is not set
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
@@ -43,17 +43,15 @@ CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32_I2C0=y
CONFIG_ESP32_I2C0_SCLPIN=32
CONFIG_ESP32_I2C0_SDAPIN=33
-CONFIG_ESP32_I2S0=y
-CONFIG_ESP32_I2S0_BCLKPIN=27
-CONFIG_ESP32_I2S0_DATA_BIT_WIDTH_16BIT=y
-CONFIG_ESP32_I2S0_DOUTPIN=26
-CONFIG_ESP32_I2S0_MCLK=y
-CONFIG_ESP32_I2S0_WSPIN=25
-CONFIG_ESP32_I2S=y
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_SPIFLASH_SPIFFS=y
CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
CONFIG_ESP32_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_BCLKPIN=27
+CONFIG_ESPRESSIF_I2S0_DOUTPIN=26
+CONFIG_ESPRESSIF_I2S0_MCLK=y
+CONFIG_ESPRESSIF_I2S0_WSPIN=25
CONFIG_ESPRESSIF_WIFI=y
CONFIG_EXAMPLES_I2SCHAR=y
CONFIG_EXAMPLES_I2SCHAR_TX=y
@@ -99,7 +97,6 @@ CONFIG_PTHREAD_MUTEX_TYPES=y
CONFIG_RAM_SIZE=114688
CONFIG_RAM_START=0x20000000
CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_HPWORKSTACKSIZE=2048
CONFIG_SCHED_LPWORK=y
CONFIG_SCHED_WAITPID=y
diff --git a/boards/xtensa/esp32/esp32-audio-kit/src/esp32-audio-kit.h
b/boards/xtensa/esp32/esp32-audio-kit/src/esp32-audio-kit.h
index 589134ae4b..1ecd025e3a 100644
--- a/boards/xtensa/esp32/esp32-audio-kit/src/esp32-audio-kit.h
+++ b/boards/xtensa/esp32/esp32-audio-kit/src/esp32-audio-kit.h
@@ -147,8 +147,8 @@ int esp32_es8388_initialize(int i2c_port, uint8_t i2c_addr,
int i2c_freq,
*
****************************************************************************/
-#if defined CONFIG_ESP32_I2S0 && !defined CONFIG_AUDIO_ES8388 || \
- defined CONFIG_ESP32_I2S1
+#if defined CONFIG_ESPRESSIF_I2S0 && !defined CONFIG_AUDIO_ES8388 || \
+ defined CONFIG_ESPRESSIF_I2S1
int board_i2sdev_initialize(int port);
#endif
diff --git a/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c
b/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c
index 8f18bdca14..4f5b71ddca 100644
--- a/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c
@@ -76,8 +76,8 @@
# include "esp32_board_i2c.h"
#endif
-#ifdef CONFIG_ESP32_I2S
-# include "esp32_i2s.h"
+#ifdef CONFIG_ESPRESSIF_I2S
+# include "espressif/esp_i2s.h"
#endif
#ifdef CONFIG_SENSORS_BMP180
@@ -334,9 +334,9 @@ int esp32_bringup(void)
#endif
-#ifdef CONFIG_ESP32_I2S
+#ifdef CONFIG_ESPRESSIF_I2S
-#ifdef CONFIG_ESP32_I2S0
+#ifdef CONFIG_ESPRESSIF_I2S0
/* Configure I2S0 */
@@ -361,13 +361,13 @@ int esp32_bringup(void)
if (ret < 0)
{
syslog(LOG_ERR, "Failed to initialize I2S%d driver: %d\n",
- CONFIG_ESP32_I2S0, ret);
+ CONFIG_ESPRESSIF_I2S0, ret);
}
#endif /* CONFIG_AUDIO_ES8388 */
-#endif /* CONFIG_ESP32_I2S0 */
+#endif /* CONFIG_ESPRESSIF_I2S0 */
-#ifdef CONFIG_ESP32_I2S1
+#ifdef CONFIG_ESPRESSIF_I2S1
/* Configure I2S generic audio on I2S1 */
@@ -375,12 +375,12 @@ int esp32_bringup(void)
if (ret < 0)
{
syslog(LOG_ERR, "Failed to initialize I2S%d driver: %d\n",
- CONFIG_ESP32_I2S0, ret);
+ CONFIG_ESPRESSIF_I2S0, ret);
}
-#endif /* CONFIG_ESP32_I2S1 */
+#endif /* CONFIG_ESPRESSIF_I2S1 */
-#endif /* CONFIG_ESP32_I2S */
+#endif /* CONFIG_ESPRESSIF_I2S */
#ifdef CONFIG_SENSORS_BMP180
/* Try to register BMP180 device in I2C0 */
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/audio/defconfig
b/boards/xtensa/esp32/esp32-devkitc/configs/audio/defconfig
index b36bde109d..b1bfdbdc56 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/audio/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/audio/defconfig
@@ -6,7 +6,7 @@
# modifications.
#
# CONFIG_ARCH_LEDS is not set
-# CONFIG_ESP32_I2S0_RX is not set
+# CONFIG_ESPRESSIF_I2S0_RX is not set
# CONFIG_NDEBUG is not set
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
@@ -44,14 +44,12 @@ CONFIG_DEV_URANDOM=y
CONFIG_DRIVERS_AUDIO=y
CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
-CONFIG_ESP32_I2S0=y
-CONFIG_ESP32_I2S0_DATA_BIT_WIDTH_16BIT=y
-CONFIG_ESP32_I2S0_MCLK=y
-CONFIG_ESP32_I2S=y
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_SPIFLASH_SPIFFS=y
CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
CONFIG_ESP32_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_MCLK=y
CONFIG_ESPRESSIF_WIFI=y
CONFIG_EXAMPLES_I2SCHAR=y
CONFIG_EXAMPLES_I2SCHAR_TX=y
@@ -102,7 +100,6 @@ CONFIG_PTHREAD_STACK_DEFAULT=2048
CONFIG_RAM_SIZE=114688
CONFIG_RAM_START=0x20000000
CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_HPWORKSTACKSIZE=2048
CONFIG_SCHED_LPWORK=y
CONFIG_SCHED_WAITPID=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/i2schar/defconfig
b/boards/xtensa/esp32/esp32-devkitc/configs/i2schar/defconfig
index c3e8a7c427..c3811d2def 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/i2schar/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/i2schar/defconfig
@@ -24,12 +24,10 @@ CONFIG_AUDIO_I2SCHAR=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DRIVERS_AUDIO=y
-CONFIG_ESP32_I2S0=y
-CONFIG_ESP32_I2S0_DATA_BIT_WIDTH_16BIT=y
-CONFIG_ESP32_I2S0_MCLK=y
-CONFIG_ESP32_I2S1=y
-CONFIG_ESP32_I2S=y
CONFIG_ESP32_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_MCLK=y
+CONFIG_ESPRESSIF_I2S1=y
CONFIG_EXAMPLES_I2SCHAR=y
CONFIG_EXAMPLES_I2SCHAR_BUFSIZE=1024
CONFIG_EXAMPLES_I2SCHAR_RX=y
@@ -55,7 +53,6 @@ CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=114688
CONFIG_RAM_START=0x20000000
CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_LPWORK=y
CONFIG_SCHED_WAITPID=y
CONFIG_START_DAY=6
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/nxlooper/defconfig
b/boards/xtensa/esp32/esp32-devkitc/configs/nxlooper/defconfig
index 688b1e340c..6d29359697 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/nxlooper/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/nxlooper/defconfig
@@ -6,8 +6,8 @@
# modifications.
#
# CONFIG_ARCH_LEDS is not set
-# CONFIG_ESP32_I2S0_RX is not set
-# CONFIG_ESP32_I2S1_TX is not set
+# CONFIG_ESPRESSIF_I2S0_RX is not set
+# CONFIG_ESPRESSIF_I2S1_TX is not set
# CONFIG_NDEBUG is not set
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
@@ -40,16 +40,13 @@ CONFIG_DEV_URANDOM=y
CONFIG_DRIVERS_AUDIO=y
CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
-CONFIG_ESP32_I2S0=y
-CONFIG_ESP32_I2S0_DATA_BIT_WIDTH_16BIT=y
-CONFIG_ESP32_I2S0_MCLK=y
-CONFIG_ESP32_I2S1=y
-CONFIG_ESP32_I2S1_DATA_BIT_WIDTH_16BIT=y
-CONFIG_ESP32_I2S=y
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_SPIFLASH_SPIFFS=y
CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
CONFIG_ESP32_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_MCLK=y
+CONFIG_ESPRESSIF_I2S1=y
CONFIG_ESPRESSIF_WIFI=y
CONFIG_EXAMPLES_I2SCHAR=y
CONFIG_EXAMPLES_I2SCHAR_BUFSIZE=960
@@ -104,7 +101,6 @@ CONFIG_PTHREAD_STACK_DEFAULT=2048
CONFIG_RAM_SIZE=114688
CONFIG_RAM_START=0x20000000
CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_HPWORKSTACKSIZE=2048
CONFIG_SCHED_LPWORK=y
CONFIG_SCHED_WAITPID=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32-devkitc.h
b/boards/xtensa/esp32/esp32-devkitc/src/esp32-devkitc.h
index e98c16cb77..aa4399f0cf 100644
--- a/boards/xtensa/esp32/esp32-devkitc/src/esp32-devkitc.h
+++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32-devkitc.h
@@ -190,8 +190,8 @@ int esp32_twai_setup(void);
*
****************************************************************************/
-#if defined(CONFIG_ESP32_I2S0) && !defined(CONFIG_AUDIO_CS4344) || \
- defined(CONFIG_ESP32_I2S1) || defined(CONFIG_ESPRESSIF_I2S)
+#if defined(CONFIG_ESPRESSIF_I2S0) && !defined(CONFIG_AUDIO_CS4344) || \
+ defined(CONFIG_ESPRESSIF_I2S1)
int board_i2sdev_initialize(int port, bool enable_tx, bool enable_rx);
#endif
diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
b/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
index 37f0220faa..b42fdd759d 100644
--- a/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
@@ -86,8 +86,8 @@
# include "esp32_board_i2c.h"
#endif
-#ifdef CONFIG_ESP32_I2S
-# include "esp32_i2s.h"
+#ifdef CONFIG_ESPRESSIF_I2S
+# include "espressif/esp_i2s.h"
#endif
#ifdef CONFIG_ESPRESSIF_I2S
@@ -554,15 +554,15 @@ int esp32_bringup(void)
}
#endif
-#if defined(CONFIG_ESP32_I2S) || defined(CONFIG_ESPRESSIF_I2S)
+#if defined(CONFIG_ESPRESSIF_I2S) || defined(CONFIG_ESPRESSIF_I2S)
-#if defined(CONFIG_ESP32_I2S0) && !defined(CONFIG_AUDIO_CS4344) || \
- defined(CONFIG_ESP32_I2S1) || defined(CONFIG_ESPRESSIF_I2S)
+#if defined(CONFIG_ESPRESSIF_I2S0) && !defined(CONFIG_AUDIO_CS4344) || \
+ defined(CONFIG_ESPRESSIF_I2S1)
bool i2s_enable_tx;
bool i2s_enable_rx;
#endif
-#if defined(CONFIG_ESP32_I2S0) || defined(CONFIG_ESPRESSIF_I2S0)
+#if defined(CONFIG_ESPRESSIF_I2S0) || defined(CONFIG_ESPRESSIF_I2S0)
/* Configure I2S0 */
@@ -577,17 +577,17 @@ int esp32_bringup(void)
}
#else
-#if defined(CONFIG_ESP32_I2S0_TX) || defined (CONFIG_ESPRESSIF_I2S0_TX)
+#if defined(CONFIG_ESPRESSIF_I2S0_TX) || defined (CONFIG_ESPRESSIF_I2S0_TX)
i2s_enable_tx = true;
#else
i2s_enable_tx = false;
-#endif /* CONFIG_ESP32_I2S0_TX || CONFIG_ESPRESSIF_I2S0_TX */
+#endif /* CONFIG_ESPRESSIF_I2S0_TX || CONFIG_ESPRESSIF_I2S0_TX */
-#if defined(CONFIG_ESP32_I2S0_RX) || defined (CONFIG_ESPRESSIF_I2S0_RX)
+#if defined(CONFIG_ESPRESSIF_I2S0_RX) || defined (CONFIG_ESPRESSIF_I2S0_RX)
i2s_enable_rx = true;
#else
i2s_enable_rx = false;
-#endif /* CONFIG_ESP32_I2S0_RX || CONFIG_ESPRESSIF_I2S0_RX */
+#endif /* CONFIG_ESPRESSIF_I2S0_RX || CONFIG_ESPRESSIF_I2S0_RX */
/* Configure I2S generic audio on I2S0 */
@@ -600,21 +600,21 @@ int esp32_bringup(void)
#endif /* CONFIG_AUDIO_CS4344 */
-#endif /* CONFIG_ESP32_I2S0 || CONFIG_ESPRESSIF_I2S0 */
+#endif /* CONFIG_ESPRESSIF_I2S0 || CONFIG_ESPRESSIF_I2S0 */
-#if defined(CONFIG_ESP32_I2S1) || defined(CONFIG_ESPRESSIF_I2S1)
+#if defined(CONFIG_ESPRESSIF_I2S1) || defined(CONFIG_ESPRESSIF_I2S1)
-#if defined(CONFIG_ESP32_I2S1_TX) || defined (CONFIG_ESPRESSIF_I2S1_TX)
+#if defined(CONFIG_ESPRESSIF_I2S1_TX) || defined (CONFIG_ESPRESSIF_I2S1_TX)
i2s_enable_tx = true;
#else
i2s_enable_tx = false;
-#endif /* CONFIG_ESP32_I2S1_TX || CONFIG_ESPRESSIF_I2S1_TX */
+#endif /* CONFIG_ESPRESSIF_I2S1_TX || CONFIG_ESPRESSIF_I2S1_TX */
-#if defined(CONFIG_ESP32_I2S1_RX) || defined (CONFIG_ESPRESSIF_I2S1_RX)
+#if defined(CONFIG_ESPRESSIF_I2S1_RX) || defined (CONFIG_ESPRESSIF_I2S1_RX)
i2s_enable_rx = true;
#else
i2s_enable_rx = false;
-#endif /* CONFIG_ESP32_I2S1_RX || CONFIG_ESPRESSIF_I2S1_RX */
+#endif /* CONFIG_ESPRESSIF_I2S1_RX || CONFIG_ESPRESSIF_I2S1_RX */
/* Configure I2S generic audio on I2S1 */
@@ -625,9 +625,9 @@ int esp32_bringup(void)
ESP32_I2S1, ret);
}
-#endif /* CONFIG_ESP32_I2S1 || CONFIG_ESPRESSIF_I2S1 */
+#endif /* CONFIG_ESPRESSIF_I2S1 || CONFIG_ESPRESSIF_I2S1 */
-#endif /* CONFIG_ESP32_I2S || CONFIG_ESPRESSIF_I2S */
+#endif /* CONFIG_ESPRESSIF_I2S || CONFIG_ESPRESSIF_I2S */
#ifdef CONFIG_SENSORS_SHT3X
/* Try to register SHT3x device in I2C0 */
diff --git a/boards/xtensa/esp32/esp32-lyrat/configs/audio/defconfig
b/boards/xtensa/esp32/esp32-lyrat/configs/audio/defconfig
index 90e5bb1c17..2c7536016e 100644
--- a/boards/xtensa/esp32/esp32-lyrat/configs/audio/defconfig
+++ b/boards/xtensa/esp32/esp32-lyrat/configs/audio/defconfig
@@ -6,7 +6,7 @@
# modifications.
#
# CONFIG_ARCH_LEDS is not set
-# CONFIG_ESP32_I2S0_RX is not set
+# CONFIG_ESPRESSIF_I2S0_RX is not set
# CONFIG_NDEBUG is not set
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
@@ -41,16 +41,14 @@ CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32_I2C0=y
CONFIG_ESP32_I2C0_SCLPIN=23
CONFIG_ESP32_I2C0_SDAPIN=18
-CONFIG_ESP32_I2S0=y
-CONFIG_ESP32_I2S0_BCLKPIN=5
-CONFIG_ESP32_I2S0_DATA_BIT_WIDTH_16BIT=y
-CONFIG_ESP32_I2S0_DOUTPIN=26
-CONFIG_ESP32_I2S0_MCLK=y
-CONFIG_ESP32_I2S0_WSPIN=25
-CONFIG_ESP32_I2S=y
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
CONFIG_ESP32_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_BCLKPIN=5
+CONFIG_ESPRESSIF_I2S0_DOUTPIN=26
+CONFIG_ESPRESSIF_I2S0_MCLK=y
+CONFIG_ESPRESSIF_I2S0_WSPIN=25
CONFIG_ESPRESSIF_WIFI=y
CONFIG_EXAMPLES_I2SCHAR=y
CONFIG_EXAMPLES_I2SCHAR_TX=y
@@ -102,7 +100,6 @@ CONFIG_PTHREAD_STACK_DEFAULT=2048
CONFIG_RAM_SIZE=114688
CONFIG_RAM_START=0x20000000
CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_HPWORKSTACKSIZE=2048
CONFIG_SCHED_LPWORK=y
CONFIG_SCHED_WAITPID=y
diff --git a/boards/xtensa/esp32/esp32-lyrat/configs/nxrecorder/defconfig
b/boards/xtensa/esp32/esp32-lyrat/configs/nxrecorder/defconfig
index 97283a1ac7..cc890fb76d 100644
--- a/boards/xtensa/esp32/esp32-lyrat/configs/nxrecorder/defconfig
+++ b/boards/xtensa/esp32/esp32-lyrat/configs/nxrecorder/defconfig
@@ -7,8 +7,8 @@
#
# CONFIG_ARCH_LEDS is not set
# CONFIG_AUDIO_FORMAT_MP3 is not set
-# CONFIG_ESP32_I2S0_TX is not set
# CONFIG_ESP32_SPI2_DMA is not set
+# CONFIG_ESPRESSIF_I2S0_TX is not set
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ALLOW_BSD_COMPONENTS=y
@@ -38,18 +38,16 @@ CONFIG_DRIVERS_AUDIO=y
CONFIG_ESP32_I2C0=y
CONFIG_ESP32_I2C0_SCLPIN=23
CONFIG_ESP32_I2C0_SDAPIN=18
-CONFIG_ESP32_I2S0=y
-CONFIG_ESP32_I2S0_BCLKPIN=5
-CONFIG_ESP32_I2S0_DATA_BIT_WIDTH_16BIT=y
-CONFIG_ESP32_I2S0_DINPIN=35
-CONFIG_ESP32_I2S0_MCLK=y
-CONFIG_ESP32_I2S0_WSPIN=25
-CONFIG_ESP32_I2S=y
CONFIG_ESP32_SPI2=y
CONFIG_ESP32_SPI2_CSPIN=13
CONFIG_ESP32_SPI2_MISOPIN=2
CONFIG_ESP32_SPI2_MOSIPIN=15
CONFIG_ESP32_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_BCLKPIN=5
+CONFIG_ESPRESSIF_I2S0_DINPIN=35
+CONFIG_ESPRESSIF_I2S0_MCLK=y
+CONFIG_ESPRESSIF_I2S0_WSPIN=25
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
@@ -79,7 +77,6 @@ CONFIG_PTHREAD_STACK_DEFAULT=2048
CONFIG_RAM_SIZE=114688
CONFIG_RAM_START=0x20000000
CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_HPWORKSTACKSIZE=2048
CONFIG_SCHED_LPWORK=y
CONFIG_SCHED_WAITPID=y
diff --git a/boards/xtensa/esp32/esp32-lyrat/configs/rtptools/defconfig
b/boards/xtensa/esp32/esp32-lyrat/configs/rtptools/defconfig
index c8f9374e8a..9bb1566c06 100644
--- a/boards/xtensa/esp32/esp32-lyrat/configs/rtptools/defconfig
+++ b/boards/xtensa/esp32/esp32-lyrat/configs/rtptools/defconfig
@@ -6,7 +6,7 @@
# modifications.
#
# CONFIG_ARCH_LEDS is not set
-# CONFIG_ESP32_I2S0_RX is not set
+# CONFIG_ESPRESSIF_I2S0_RX is not set
# CONFIG_NDEBUG is not set
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
@@ -43,14 +43,12 @@ CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32_I2C0=y
CONFIG_ESP32_I2C0_SCLPIN=23
CONFIG_ESP32_I2C0_SDAPIN=18
-CONFIG_ESP32_I2S0=y
-CONFIG_ESP32_I2S0_BCLKPIN=5
-CONFIG_ESP32_I2S0_DATA_BIT_WIDTH_16BIT=y
-CONFIG_ESP32_I2S0_DOUTPIN=26
-CONFIG_ESP32_I2S0_MCLK=y
-CONFIG_ESP32_I2S0_WSPIN=25
-CONFIG_ESP32_I2S=y
CONFIG_ESP32_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_BCLKPIN=5
+CONFIG_ESPRESSIF_I2S0_DOUTPIN=26
+CONFIG_ESPRESSIF_I2S0_MCLK=y
+CONFIG_ESPRESSIF_I2S0_WSPIN=25
CONFIG_ESPRESSIF_WIFI=y
CONFIG_ESPRESSIF_WIFI_DYNAMIC_RXBUF_NUM=64
CONFIG_ESPRESSIF_WIFI_DYNAMIC_TXBUF_NUM=64
@@ -111,7 +109,6 @@ CONFIG_PTHREAD_STACK_DEFAULT=2048
CONFIG_RAM_SIZE=114688
CONFIG_RAM_START=0x20000000
CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_HPWORKSTACKSIZE=2048
CONFIG_SCHED_LPWORK=y
CONFIG_SCHED_WAITPID=y
diff --git a/boards/xtensa/esp32/esp32-lyrat/src/esp32-lyrat.h
b/boards/xtensa/esp32/esp32-lyrat/src/esp32-lyrat.h
index ec8feb4c60..ff95d9ba26 100644
--- a/boards/xtensa/esp32/esp32-lyrat/src/esp32-lyrat.h
+++ b/boards/xtensa/esp32/esp32-lyrat/src/esp32-lyrat.h
@@ -143,8 +143,8 @@ int esp32_es8388_initialize(int i2c_port, uint8_t i2c_addr,
int i2c_freq,
*
****************************************************************************/
-#if defined CONFIG_ESP32_I2S0 && !defined CONFIG_AUDIO_ES8388 || \
- defined CONFIG_ESP32_I2S1
+#if defined CONFIG_ESPRESSIF_I2S0 && !defined CONFIG_AUDIO_ES8388 || \
+ defined CONFIG_ESPRESSIF_I2S1
int board_i2sdev_initialize(int port);
#endif
diff --git a/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c
b/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c
index 8b1fb1250e..4efe5397ec 100644
--- a/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c
@@ -76,8 +76,8 @@
# include "esp32_board_i2c.h"
#endif
-#ifdef CONFIG_ESP32_I2S
-# include "esp32_i2s.h"
+#ifdef CONFIG_ESPRESSIF_I2S
+# include "espressif/esp_i2s.h"
#endif
#ifdef CONFIG_SENSORS_BMP180
@@ -335,9 +335,9 @@ int esp32_bringup(void)
#endif
-#ifdef CONFIG_ESP32_I2S
+#ifdef CONFIG_ESPRESSIF_I2S
-#ifdef CONFIG_ESP32_I2S0
+#ifdef CONFIG_ESPRESSIF_I2S0
/* Configure I2S0 */
@@ -362,13 +362,13 @@ int esp32_bringup(void)
if (ret < 0)
{
syslog(LOG_ERR, "Failed to initialize I2S%d driver: %d\n",
- CONFIG_ESP32_I2S0, ret);
+ CONFIG_ESPRESSIF_I2S0, ret);
}
#endif /* CONFIG_AUDIO_ES8388 */
-#endif /* CONFIG_ESP32_I2S0 */
+#endif /* CONFIG_ESPRESSIF_I2S0 */
-#ifdef CONFIG_ESP32_I2S1
+#ifdef CONFIG_ESPRESSIF_I2S1
/* Configure I2S generic audio on I2S1 */
@@ -376,12 +376,12 @@ int esp32_bringup(void)
if (ret < 0)
{
syslog(LOG_ERR, "Failed to initialize I2S%d driver: %d\n",
- CONFIG_ESP32_I2S0, ret);
+ CONFIG_ESPRESSIF_I2S0, ret);
}
-#endif /* CONFIG_ESP32_I2S1 */
+#endif /* CONFIG_ESPRESSIF_I2S1 */
-#endif /* CONFIG_ESP32_I2S */
+#endif /* CONFIG_ESPRESSIF_I2S */
#ifdef CONFIG_SENSORS_BMP180
/* Try to register BMP180 device in I2C0 */
diff --git a/boards/xtensa/esp32/esp32-pico-kit/src/esp32-pico-kit.h
b/boards/xtensa/esp32/esp32-pico-kit/src/esp32-pico-kit.h
index 10504f9117..9b4a79cd17 100644
--- a/boards/xtensa/esp32/esp32-pico-kit/src/esp32-pico-kit.h
+++ b/boards/xtensa/esp32/esp32-pico-kit/src/esp32-pico-kit.h
@@ -168,7 +168,7 @@ int esp32_twai_setup(void);
*
****************************************************************************/
-#if defined(CONFIG_ESP32_I2S0) || defined(CONFIG_ESP32_I2S1)
+#if defined(CONFIG_ESPRESSIF_I2S0) || defined(CONFIG_ESPRESSIF_I2S1)
int board_i2sdev_initialize(int port, bool enable_tx, bool enable_rx);
#endif
diff --git a/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c
b/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c
index 7bb7992c2c..fad4100294 100644
--- a/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c
@@ -79,8 +79,8 @@
# include "esp32_board_i2c.h"
#endif
-#ifdef CONFIG_ESP32_I2S
-# include "esp32_i2s.h"
+#ifdef CONFIG_ESPRESSIF_I2S
+# include "espressif/esp_i2s.h"
#endif
#ifdef CONFIG_ESP32_AES_ACCELERATOR
@@ -356,28 +356,28 @@ int esp32_bringup(void)
#endif
-#ifdef CONFIG_ESP32_I2S
+#ifdef CONFIG_ESPRESSIF_I2S
-#if defined(CONFIG_ESP32_I2S0) && || defined(CONFIG_ESP32_I2S1)
+#if defined(CONFIG_ESPRESSIF_I2S0) && || defined(CONFIG_ESPRESSIF_I2S1)
bool i2s_enable_tx;
bool i2s_enable_rx;
#endif
-#ifdef CONFIG_ESP32_I2S0
+#ifdef CONFIG_ESPRESSIF_I2S0
/* Configure I2S0 */
-#ifdef CONFIG_ESP32_I2S0_TX
+#ifdef CONFIG_ESPRESSIF_I2S0_TX
i2s_enable_tx = true;
#else
i2s_enable_tx = false;
-#endif /* CONFIG_ESP32_I2S0_TX */
+#endif /* CONFIG_ESPRESSIF_I2S0_TX */
-#ifdef CONFIG_ESP32_I2S0_RX
+#ifdef CONFIG_ESPRESSIF_I2S0_RX
i2s_enable_rx = true;
#else
i2s_enable_rx = false;
-#endif /* CONFIG_ESP32_I2S0_RX */
+#endif /* CONFIG_ESPRESSIF_I2S0_RX */
/* Configure I2S generic audio on I2S0 */
@@ -385,24 +385,24 @@ int esp32_bringup(void)
if (ret < 0)
{
syslog(LOG_ERR, "Failed to initialize I2S%d driver: %d\n",
- CONFIG_ESP32_I2S0, ret);
+ CONFIG_ESPRESSIF_I2S0, ret);
}
-#endif /* CONFIG_ESP32_I2S0 */
+#endif /* CONFIG_ESPRESSIF_I2S0 */
-#ifdef CONFIG_ESP32_I2S1
+#ifdef CONFIG_ESPRESSIF_I2S1
-#ifdef CONFIG_ESP32_I2S1_TX
+#ifdef CONFIG_ESPRESSIF_I2S1_TX
i2s_enable_tx = true;
#else
i2s_enable_tx = false;
-#endif /* CONFIG_ESP32_I2S1_TX */
+#endif /* CONFIG_ESPRESSIF_I2S1_TX */
-#ifdef CONFIG_ESP32_I2S1_RX
+#ifdef CONFIG_ESPRESSIF_I2S1_RX
i2s_enable_rx = true;
#else
i2s_enable_rx = false;
-#endif /* CONFIG_ESP32_I2S1_RX */
+#endif /* CONFIG_ESPRESSIF_I2S1_RX */
/* Configure I2S generic audio on I2S1 */
@@ -410,12 +410,12 @@ int esp32_bringup(void)
if (ret < 0)
{
syslog(LOG_ERR, "Failed to initialize I2S%d driver: %d\n",
- CONFIG_ESP32_I2S1, ret);
+ CONFIG_ESPRESSIF_I2S1, ret);
}
-#endif /* CONFIG_ESP32_I2S1 */
+#endif /* CONFIG_ESPRESSIF_I2S1 */
-#endif /* CONFIG_ESP32_I2S */
+#endif /* CONFIG_ESPRESSIF_I2S */
#ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */
diff --git a/boards/xtensa/esp32/esp32-sparrow-kit/configs/mqttc/defconfig
b/boards/xtensa/esp32/esp32-sparrow-kit/configs/mqttc/defconfig
index 996b8aa6f7..ff14f90956 100644
--- a/boards/xtensa/esp32/esp32-sparrow-kit/configs/mqttc/defconfig
+++ b/boards/xtensa/esp32/esp32-sparrow-kit/configs/mqttc/defconfig
@@ -34,13 +34,6 @@ CONFIG_DRIVERS_VIDEO=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32_I2C0=y
CONFIG_ESP32_I2C0_SDAPIN=21
-CONFIG_ESP32_I2S0=y
-CONFIG_ESP32_I2S0_BCLKPIN=25
-CONFIG_ESP32_I2S0_DATA_BIT_WIDTH_24BIT=y
-CONFIG_ESP32_I2S0_DINPIN=26
-CONFIG_ESP32_I2S0_SAMPLE_RATE=8000
-CONFIG_ESP32_I2S0_WSPIN=27
-CONFIG_ESP32_I2S=y
CONFIG_ESP32_LEDC=y
CONFIG_ESP32_LEDC_CHANNEL0_PIN=14
CONFIG_ESP32_LEDC_CHANNEL1_PIN=13
@@ -56,6 +49,12 @@ CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_SPIFLASH_SPIFFS=y
CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
CONFIG_ESP32_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_BCLKPIN=25
+CONFIG_ESPRESSIF_I2S0_DATA_BIT_WIDTH_24BIT=y
+CONFIG_ESPRESSIF_I2S0_DINPIN=26
+CONFIG_ESPRESSIF_I2S0_SAMPLE_RATE=8000
+CONFIG_ESPRESSIF_I2S0_WSPIN=27
CONFIG_ESPRESSIF_WIFI=y
CONFIG_EXAMPLES_MQTTC=y
CONFIG_FAT_LCNAMES=y
@@ -108,7 +107,6 @@ CONFIG_PWM_NCHANNELS=3
CONFIG_RAM_SIZE=114688
CONFIG_RAM_START=0x20000000
CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_LPWORK=y
CONFIG_SCHED_WAITPID=y
CONFIG_SENSORS=y
diff --git a/boards/xtensa/esp32/esp32-sparrow-kit/configs/nsh/defconfig
b/boards/xtensa/esp32/esp32-sparrow-kit/configs/nsh/defconfig
index 714712c878..e7b6b91107 100644
--- a/boards/xtensa/esp32/esp32-sparrow-kit/configs/nsh/defconfig
+++ b/boards/xtensa/esp32/esp32-sparrow-kit/configs/nsh/defconfig
@@ -35,13 +35,6 @@ CONFIG_DRIVERS_AUDIO=y
CONFIG_DRIVERS_VIDEO=y
CONFIG_ESP32_I2C0=y
CONFIG_ESP32_I2C0_SDAPIN=21
-CONFIG_ESP32_I2S0=y
-CONFIG_ESP32_I2S0_BCLKPIN=25
-CONFIG_ESP32_I2S0_DATA_BIT_WIDTH_24BIT=y
-CONFIG_ESP32_I2S0_DINPIN=26
-CONFIG_ESP32_I2S0_SAMPLE_RATE=8000
-CONFIG_ESP32_I2S0_WSPIN=27
-CONFIG_ESP32_I2S=y
CONFIG_ESP32_LEDC=y
CONFIG_ESP32_LEDC_CHANNEL0_PIN=14
CONFIG_ESP32_LEDC_CHANNEL1_PIN=13
@@ -55,6 +48,12 @@ CONFIG_ESP32_SPI2_MISOPIN=19
CONFIG_ESP32_SPI2_MOSIPIN=23
CONFIG_ESP32_TIMER0=y
CONFIG_ESP32_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_BCLKPIN=25
+CONFIG_ESPRESSIF_I2S0_DATA_BIT_WIDTH_24BIT=y
+CONFIG_ESPRESSIF_I2S0_DINPIN=26
+CONFIG_ESPRESSIF_I2S0_SAMPLE_RATE=8000
+CONFIG_ESPRESSIF_I2S0_WSPIN=27
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
@@ -91,7 +90,6 @@ CONFIG_RGBLED_INVERT=y
CONFIG_RGBLED_LIGHTNESS_CORRECTION=y
CONFIG_RGBLED_PWM_FREQ=200
CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_WAITPID=y
CONFIG_SENSORS=y
CONFIG_SENSORS_BME680=y
diff --git a/boards/xtensa/esp32/esp32-sparrow-kit/configs/wifi/defconfig
b/boards/xtensa/esp32/esp32-sparrow-kit/configs/wifi/defconfig
index e63303a4c3..0bac39bb3d 100644
--- a/boards/xtensa/esp32/esp32-sparrow-kit/configs/wifi/defconfig
+++ b/boards/xtensa/esp32/esp32-sparrow-kit/configs/wifi/defconfig
@@ -37,13 +37,6 @@ CONFIG_DRIVERS_VIDEO=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32_I2C0=y
CONFIG_ESP32_I2C0_SDAPIN=21
-CONFIG_ESP32_I2S0=y
-CONFIG_ESP32_I2S0_BCLKPIN=25
-CONFIG_ESP32_I2S0_DATA_BIT_WIDTH_24BIT=y
-CONFIG_ESP32_I2S0_DINPIN=26
-CONFIG_ESP32_I2S0_SAMPLE_RATE=8000
-CONFIG_ESP32_I2S0_WSPIN=27
-CONFIG_ESP32_I2S=y
CONFIG_ESP32_LEDC=y
CONFIG_ESP32_LEDC_CHANNEL0_PIN=14
CONFIG_ESP32_LEDC_CHANNEL1_PIN=13
@@ -59,6 +52,12 @@ CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_SPIFLASH_SPIFFS=y
CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
CONFIG_ESP32_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_BCLKPIN=25
+CONFIG_ESPRESSIF_I2S0_DATA_BIT_WIDTH_24BIT=y
+CONFIG_ESPRESSIF_I2S0_DINPIN=26
+CONFIG_ESPRESSIF_I2S0_SAMPLE_RATE=8000
+CONFIG_ESPRESSIF_I2S0_WSPIN=27
CONFIG_ESPRESSIF_WIFI=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
@@ -110,7 +109,6 @@ CONFIG_PWM_NCHANNELS=3
CONFIG_RAM_SIZE=114688
CONFIG_RAM_START=0x20000000
CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_LPWORK=y
CONFIG_SCHED_WAITPID=y
CONFIG_SENSORS=y
diff --git a/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32-sparrow-kit.h
b/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32-sparrow-kit.h
index 65d22e3181..61ab018c68 100644
--- a/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32-sparrow-kit.h
+++ b/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32-sparrow-kit.h
@@ -126,7 +126,7 @@ int esp32_spiflash_init(void);
*
****************************************************************************/
-#if defined CONFIG_ESP32_I2S0 || defined CONFIG_ESP32_I2S1
+#if defined CONFIG_ESPRESSIF_I2S0 || defined CONFIG_ESPRESSIF_I2S1
int board_i2sdev_initialize(int port);
#endif
diff --git a/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_bringup.c
b/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_bringup.c
index 0234c3cd50..a7a404f356 100644
--- a/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_bringup.c
@@ -79,8 +79,8 @@
# include "esp32_board_i2c.h"
#endif
-#ifdef CONFIG_ESP32_I2S
-# include "esp32_i2s.h"
+#ifdef CONFIG_ESPRESSIF_I2S
+# include "espressif/esp_i2s.h"
#endif
#ifdef CONFIG_SENSORS_BMP180
@@ -346,9 +346,9 @@ int esp32_bringup(void)
#endif
-#ifdef CONFIG_ESP32_I2S
+#ifdef CONFIG_ESPRESSIF_I2S
-#ifdef CONFIG_ESP32_I2S0
+#ifdef CONFIG_ESPRESSIF_I2S0
/* Configure I2S generic audio on I2S0 */
@@ -356,12 +356,12 @@ int esp32_bringup(void)
if (ret < 0)
{
syslog(LOG_ERR, "Failed to initialize I2S%d driver: %d\n",
- CONFIG_ESP32_I2S0, ret);
+ CONFIG_ESPRESSIF_I2S0, ret);
}
-#endif /* CONFIG_ESP32_I2S0 */
+#endif /* CONFIG_ESPRESSIF_I2S0 */
-#endif /* CONFIG_ESP32_I2S */
+#endif /* CONFIG_ESPRESSIF_I2S */
#ifdef CONFIG_SENSORS_BMP180
/* Try to register BMP180 device in I2C0 */
diff --git a/boards/xtensa/esp32s2/common/src/Make.defs
b/boards/xtensa/esp32s2/common/src/Make.defs
index cff6e94a28..a981111359 100644
--- a/boards/xtensa/esp32s2/common/src/Make.defs
+++ b/boards/xtensa/esp32s2/common/src/Make.defs
@@ -50,10 +50,6 @@ ifeq ($(CONFIG_SENSORS_MAX6675),y)
CSRCS += esp32s2_max6675.c
endif
-ifeq ($(CONFIG_ESP32S2_I2S),y)
- CSRCS += esp32s2_board_i2sdev.c
-endif
-
ifeq ($(CONFIG_ESPRESSIF_I2S),y)
CSRCS += esp32s2_board_i2sdev.c
endif
diff --git a/boards/xtensa/esp32s2/common/src/esp32s2_board_i2sdev.c
b/boards/xtensa/esp32s2/common/src/esp32s2_board_i2sdev.c
index 5be603c983..2446ca4e97 100644
--- a/boards/xtensa/esp32s2/common/src/esp32s2_board_i2sdev.c
+++ b/boards/xtensa/esp32s2/common/src/esp32s2_board_i2sdev.c
@@ -37,16 +37,12 @@
#include <arch/board/board.h>
-#ifdef CONFIG_ESP32S2_I2S
-# include "esp32s2_i2s.h"
-#endif
-
#ifdef CONFIG_ESPRESSIF_I2S
# include "espressif/esp_i2s.h"
#endif
-#if (defined(CONFIG_ESP32S2_I2S) && !defined(CONFIG_AUDIO_CS4344) && \
- !defined(CONFIG_AUDIO_ES8311)) || defined(CONFIG_ESPRESSIF_I2S)
+#if (defined(CONFIG_ESPRESSIF_I2S) && !defined(CONFIG_AUDIO_CS4344) && \
+ !defined(CONFIG_AUDIO_ES8311))
/****************************************************************************
* Public Functions
@@ -80,11 +76,7 @@ int board_i2sdev_initialize(bool enable_tx, bool enable_rx)
ainfo("Initializing I2S\n");
-#ifdef CONFIG_ESP32S2_I2S
- i2s = esp32s2_i2sbus_initialize();
-#else
i2s = esp_i2sbus_initialize(0);
-#endif
#ifdef CONFIG_AUDIO_I2SCHAR
ret = i2schar_register(i2s, 0);
@@ -165,5 +157,5 @@ int board_i2sdev_initialize(bool enable_tx, bool enable_rx)
return ret;
}
-#endif /* (CONFIG_ESP32S2_I2S) && !(CONFIG_AUDIO_CS4344) *
+#endif /* (CONFIG_ESPRESSIF_I2S) && !(CONFIG_AUDIO_CS4344) *
* !(CONFIG_AUDIO_ES8311) */
diff --git a/boards/xtensa/esp32s2/common/src/esp32s2_cs4344.c
b/boards/xtensa/esp32s2/common/src/esp32s2_cs4344.c
index 0112a12611..3c300e2388 100644
--- a/boards/xtensa/esp32s2/common/src/esp32s2_cs4344.c
+++ b/boards/xtensa/esp32s2/common/src/esp32s2_cs4344.c
@@ -39,9 +39,9 @@
#include <arch/board/board.h>
-#include "esp32s2_i2s.h"
+#include "espressif/esp_i2s.h"
-#if defined(CONFIG_ESP32S2_I2S) && defined(CONFIG_AUDIO_CS4344)
+#if defined(CONFIG_ESPRESSIF_I2S) && defined(CONFIG_AUDIO_CS4344)
/****************************************************************************
* Public Functions
@@ -81,7 +81,7 @@ int esp32s2_cs4344_initialize(void)
{
/* Get an instance of the I2S interface for the CS4344 data channel */
- i2s = esp32s2_i2sbus_initialize();
+ i2s = esp_i2sbus_initialize(0);
if (!i2s)
{
auderr("ERROR: Failed to initialize I2S0\n");
@@ -159,4 +159,4 @@ errout:
return ret;
}
-#endif /* CONFIG_ESP32S2_I2S && CONFIG_AUDIO_CS4344 */
+#endif /* CONFIG_ESPRESSIF_I2S && CONFIG_AUDIO_CS4344 */
diff --git a/boards/xtensa/esp32s2/common/src/esp32s2_es8311.c
b/boards/xtensa/esp32s2/common/src/esp32s2_es8311.c
index 8de9fa9e80..557e6b1acf 100644
--- a/boards/xtensa/esp32s2/common/src/esp32s2_es8311.c
+++ b/boards/xtensa/esp32s2/common/src/esp32s2_es8311.c
@@ -42,9 +42,9 @@
#include <arch/board/board.h>
#include "esp32s2_i2c.h"
-#include "esp32s2_i2s.h"
+#include "espressif/esp_i2s.h"
-#if defined(CONFIG_ESP32S2_I2S) && defined(CONFIG_AUDIO_ES8311)
+#if defined(CONFIG_ESPRESSIF_I2S) && defined(CONFIG_AUDIO_ES8311)
/****************************************************************************
* Private Data
@@ -97,7 +97,7 @@ int esp32s2_es8311_initialize(int i2c_port, uint8_t i2c_addr,
int i2c_freq)
{
/* Get an instance of the I2S interface for the ES8311 data channel */
- i2s = esp32s2_i2sbus_initialize();
+ i2s = esp_i2sbus_initialize(0);
if (i2s == NULL)
{
auderr("ERROR: Failed to initialize I2S\n");
@@ -211,4 +211,4 @@ errout:
return ret;
}
-#endif /* CONFIG_ESP32S2_I2S && CONFIG_AUDIO_ES8311 */
+#endif /* CONFIG_ESPRESSIF_I2S && CONFIG_AUDIO_ES8311 */
diff --git a/boards/xtensa/esp32s2/esp32s2-kaluga-1/configs/audio/defconfig
b/boards/xtensa/esp32s2/esp32s2-kaluga-1/configs/audio/defconfig
index bde881e3a7..878454eebf 100644
--- a/boards/xtensa/esp32s2/esp32s2-kaluga-1/configs/audio/defconfig
+++ b/boards/xtensa/esp32s2/esp32s2-kaluga-1/configs/audio/defconfig
@@ -7,7 +7,7 @@
#
# CONFIG_ARCH_LEDS is not set
# CONFIG_AUDIO_FORMAT_MP3 is not set
-# CONFIG_ESP32S2_I2S_RX is not set
+# CONFIG_ESPRESSIF_I2S0_RX is not set
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ARCH="xtensa"
@@ -34,15 +34,14 @@ CONFIG_ES8311_SRC_BCLK=y
CONFIG_ESP32S2_I2C0=y
CONFIG_ESP32S2_I2C0_SCLPIN=7
CONFIG_ESP32S2_I2C0_SDAPIN=8
-CONFIG_ESP32S2_I2S=y
-CONFIG_ESP32S2_I2S_BCLKPIN=18
-CONFIG_ESP32S2_I2S_DATA_BIT_WIDTH_16BIT=y
-CONFIG_ESP32S2_I2S_DOUTPIN=12
-CONFIG_ESP32S2_I2S_MCLK=y
-CONFIG_ESP32S2_I2S_MCLKPIN=35
-CONFIG_ESP32S2_I2S_SAMPLE_RATE=48000
-CONFIG_ESP32S2_I2S_WSPIN=17
CONFIG_ESP32S2_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_BCLKPIN=18
+CONFIG_ESPRESSIF_I2S0_DOUTPIN=12
+CONFIG_ESPRESSIF_I2S0_MCLK=y
+CONFIG_ESPRESSIF_I2S0_MCLKPIN=35
+CONFIG_ESPRESSIF_I2S0_SAMPLE_RATE=48000
+CONFIG_ESPRESSIF_I2S0_WSPIN=17
CONFIG_EXAMPLES_ROMFS=y
CONFIG_FS_PROCFS=y
CONFIG_FS_ROMFS=y
@@ -67,7 +66,6 @@ CONFIG_PTHREAD_STACK_DEFAULT=2048
CONFIG_RAM_SIZE=114688
CONFIG_RAM_START=0x20000000
CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_LPWORK=y
CONFIG_SCHED_WAITPID=y
CONFIG_START_DAY=6
diff --git a/boards/xtensa/esp32s2/esp32s2-kaluga-1/configs/nxlooper/defconfig
b/boards/xtensa/esp32s2/esp32s2-kaluga-1/configs/nxlooper/defconfig
index 02d985371d..17ac1d91ec 100644
--- a/boards/xtensa/esp32s2/esp32s2-kaluga-1/configs/nxlooper/defconfig
+++ b/boards/xtensa/esp32s2/esp32s2-kaluga-1/configs/nxlooper/defconfig
@@ -33,16 +33,15 @@ CONFIG_ES8311_SRC_BCLK=y
CONFIG_ESP32S2_I2C0=y
CONFIG_ESP32S2_I2C0_SCLPIN=7
CONFIG_ESP32S2_I2C0_SDAPIN=8
-CONFIG_ESP32S2_I2S=y
-CONFIG_ESP32S2_I2S_BCLKPIN=18
-CONFIG_ESP32S2_I2S_DATA_BIT_WIDTH_16BIT=y
-CONFIG_ESP32S2_I2S_DINPIN=34
-CONFIG_ESP32S2_I2S_DOUTPIN=12
-CONFIG_ESP32S2_I2S_MCLK=y
-CONFIG_ESP32S2_I2S_MCLKPIN=35
-CONFIG_ESP32S2_I2S_SAMPLE_RATE=48000
-CONFIG_ESP32S2_I2S_WSPIN=17
CONFIG_ESP32S2_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_BCLKPIN=18
+CONFIG_ESPRESSIF_I2S0_DINPIN=34
+CONFIG_ESPRESSIF_I2S0_DOUTPIN=12
+CONFIG_ESPRESSIF_I2S0_MCLK=y
+CONFIG_ESPRESSIF_I2S0_MCLKPIN=35
+CONFIG_ESPRESSIF_I2S0_SAMPLE_RATE=48000
+CONFIG_ESPRESSIF_I2S0_WSPIN=17
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
@@ -65,7 +64,6 @@ CONFIG_PTHREAD_STACK_DEFAULT=2048
CONFIG_RAM_SIZE=114688
CONFIG_RAM_START=0x20000000
CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_LPWORK=y
CONFIG_SCHED_WAITPID=y
CONFIG_START_DAY=6
diff --git a/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2-kaluga-1.h
b/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2-kaluga-1.h
index 9830d9e226..bc8eb010f0 100644
--- a/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2-kaluga-1.h
+++ b/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2-kaluga-1.h
@@ -164,7 +164,7 @@ int board_i2c_init(void);
*
****************************************************************************/
-#if (defined(CONFIG_ESP32S2_I2S) && !defined(CONFIG_AUDIO_ES8311)) || \
+#if (defined(CONFIG_ESPRESSIF_I2S) && !defined(CONFIG_AUDIO_ES8311)) || \
defined(CONFIG_ESPRESSIF_I2S)
int board_i2sdev_initialize(void);
#endif
diff --git a/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2_bringup.c
b/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2_bringup.c
index 888744276d..5309e3abe7 100644
--- a/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2_bringup.c
+++ b/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2_bringup.c
@@ -57,8 +57,8 @@
# include "esp32s2_i2c.h"
#endif
-#ifdef CONFIG_ESP32_I2S
-# include "esp32s2_i2s.h"
+#ifdef CONFIG_ESPRESSIF_I2S
+# include "espressif/esp_i2s.h"
#endif
#ifdef CONFIG_ESP32S2_RT_TIMER
@@ -294,7 +294,7 @@ int esp32s2_bringup(void)
}
#endif
-#ifdef CONFIG_ESP32S2_I2S
+#ifdef CONFIG_ESPRESSIF_I2S
/* Configure I2S0 */
@@ -314,7 +314,7 @@ int esp32s2_bringup(void)
#endif /* CONFIG_AUDIO_ES8311 */
-#endif /* CONFIG_ESP32S2_I2S */
+#endif /* CONFIG_ESPRESSIF_I2S */
#ifdef CONFIG_RTC_DRIVER
/* Instantiate the ESP32 RTC driver */
diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/audio/defconfig
b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/audio/defconfig
index 31e36435a4..652f5053c0 100644
--- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/audio/defconfig
+++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/audio/defconfig
@@ -6,7 +6,7 @@
# modifications.
#
# CONFIG_ARCH_LEDS is not set
-# CONFIG_ESP32S2_I2S_RX is not set
+# CONFIG_ESPRESSIF_I2S0_RX is not set
# CONFIG_NDEBUG is not set
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
@@ -36,10 +36,9 @@ CONFIG_CS4344_NUM_BUFFERS=2
CONFIG_CS4344_WORKER_STACKSIZE=4096
CONFIG_DEFAULT_TASK_STACKSIZE=4096
CONFIG_DRIVERS_AUDIO=y
-CONFIG_ESP32S2_I2S=y
-CONFIG_ESP32S2_I2S_DATA_BIT_WIDTH_16BIT=y
-CONFIG_ESP32S2_I2S_MCLK=y
CONFIG_ESP32S2_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_MCLK=y
CONFIG_EXAMPLES_I2SCHAR=y
CONFIG_EXAMPLES_I2SCHAR_TX=y
CONFIG_EXAMPLES_I2SCHAR_TXBUFFERS=2
@@ -66,7 +65,6 @@ CONFIG_PTHREAD_STACK_DEFAULT=2048
CONFIG_RAM_SIZE=114688
CONFIG_RAM_START=0x20000000
CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_HPWORKSTACKSIZE=2048
CONFIG_SCHED_LPWORK=y
CONFIG_SCHED_LPWORKSTACKSIZE=2048
diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/i2schar/defconfig
b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/i2schar/defconfig
index 83be6d5c11..c28c6bb869 100644
--- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/i2schar/defconfig
+++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/i2schar/defconfig
@@ -24,10 +24,9 @@ CONFIG_AUDIO_I2SCHAR=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DRIVERS_AUDIO=y
-CONFIG_ESP32S2_I2S=y
-CONFIG_ESP32S2_I2S_DATA_BIT_WIDTH_16BIT=y
-CONFIG_ESP32S2_I2S_MCLK=y
CONFIG_ESP32S2_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_MCLK=y
CONFIG_EXAMPLES_I2SCHAR=y
CONFIG_EXAMPLES_I2SCHAR_BUFSIZE=1024
CONFIG_EXAMPLES_I2SCHAR_RX=y
@@ -50,7 +49,6 @@ CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=114688
CONFIG_RAM_START=0x20000000
CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_LPWORK=y
CONFIG_SCHED_WAITPID=y
CONFIG_START_DAY=6
diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/nxlooper/defconfig
b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/nxlooper/defconfig
index 7dd2c797cc..fe51edb47c 100644
--- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/nxlooper/defconfig
+++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/nxlooper/defconfig
@@ -30,10 +30,9 @@ CONFIG_AUDIO_NUM_BUFFERS=4
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DRIVERS_AUDIO=y
-CONFIG_ESP32S2_I2S=y
-CONFIG_ESP32S2_I2S_DATA_BIT_WIDTH_16BIT=y
-CONFIG_ESP32S2_I2S_MCLK=y
CONFIG_ESP32S2_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_MCLK=y
CONFIG_EXAMPLES_I2SCHAR=y
CONFIG_EXAMPLES_I2SCHAR_BUFSIZE=1024
CONFIG_EXAMPLES_I2SCHAR_RX=y
@@ -56,7 +55,6 @@ CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=114688
CONFIG_RAM_START=0x20000000
CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_LPWORK=y
CONFIG_SCHED_WAITPID=y
CONFIG_START_DAY=6
diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2-saola-1.h
b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2-saola-1.h
index b0fdefceec..fac2a2ca18 100644
--- a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2-saola-1.h
+++ b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2-saola-1.h
@@ -198,7 +198,7 @@ int board_bmp180_initialize(int devno, int busno);
*
****************************************************************************/
-#if (defined(CONFIG_ESP32S2_I2S) && !defined(CONFIG_AUDIO_ES8311)) || \
+#if (defined(CONFIG_ESPRESSIF_I2S) && !defined(CONFIG_AUDIO_ES8311)) || \
defined(CONFIG_ESPRESSIF_I2S)
int board_i2sdev_initialize(bool enable_tx, bool enable_rx);
#endif
diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c
b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c
index 07005b0db1..70ea3dd7d3 100644
--- a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c
+++ b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_bringup.c
@@ -357,7 +357,7 @@ int esp32s2_bringup(void)
}
#endif
-#if defined(CONFIG_ESP32S2_I2S) || defined(CONFIG_ESPRESSIF_I2S)
+#if defined(CONFIG_ESPRESSIF_I2S) || defined(CONFIG_ESPRESSIF_I2S)
#ifdef CONFIG_AUDIO_CS4344
@@ -373,17 +373,17 @@ int esp32s2_bringup(void)
bool i2s_enable_tx;
bool i2s_enable_rx;
-#if defined(CONFIG_ESP32S2_I2S_TX) || defined(CONFIG_ESPRESSIF_I2S0_TX)
+#if defined(CONFIG_ESPRESSIF_I2S_TX) || defined(CONFIG_ESPRESSIF_I2S0_TX)
i2s_enable_tx = true;
#else
i2s_enable_tx = false;
-#endif /* CONFIG_ESP32S2_I2S_TX || CONFIG_ESPRESSIF_I2S0_TX */
+#endif /* CONFIG_ESPRESSIF_I2S_TX || CONFIG_ESPRESSIF_I2S0_TX */
-#if defined(CONFIG_ESP32S2_I2S_RX) || defined(CONFIG_ESPRESSIF_I2S0_RX)
+#if defined(CONFIG_ESPRESSIF_I2S_RX) || defined(CONFIG_ESPRESSIF_I2S0_RX)
i2s_enable_rx = true;
#else
i2s_enable_rx = false;
-#endif /* CONFIG_ESP32S2_I2S_RX || CONFIG_ESPRESSIF_I2S0_RX */
+#endif /* CONFIG_ESPRESSIF_I2S_RX || CONFIG_ESPRESSIF_I2S0_RX */
/* Configure I2S generic audio on I2S0 */
@@ -394,7 +394,7 @@ int esp32s2_bringup(void)
}
#endif /* CONFIG_AUDIO_CS4344 */
-#endif /* CONFIG_ESP32S2_I2S || CONFIG_ESPRESSIF_I2S */
+#endif /* CONFIG_ESPRESSIF_I2S || CONFIG_ESPRESSIF_I2S */
#ifdef CONFIG_ESP_RMT
ret = board_rmt_txinitialize(RMT_TXCHANNEL, RMT_OUTPUT_PIN);
diff --git a/boards/xtensa/esp32s3/common/src/Make.defs
b/boards/xtensa/esp32s3/common/src/Make.defs
index 976e921fa7..81248118dc 100644
--- a/boards/xtensa/esp32s3/common/src/Make.defs
+++ b/boards/xtensa/esp32s3/common/src/Make.defs
@@ -46,10 +46,6 @@ ifeq ($(CONFIG_I2C_DRIVER),y)
CSRCS += esp32s3_board_i2c.c
endif
-ifeq ($(CONFIG_ESP32S3_I2S),y)
- CSRCS += esp32s3_board_i2s.c
-endif
-
ifeq ($(CONFIG_ESPRESSIF_I2S),y)
CSRCS += esp32s3_board_i2s.c
endif
diff --git a/boards/xtensa/esp32s3/common/src/esp32s3_board_i2s.c
b/boards/xtensa/esp32s3/common/src/esp32s3_board_i2s.c
index 73b42a3fe4..8b9ffb0e73 100644
--- a/boards/xtensa/esp32s3/common/src/esp32s3_board_i2s.c
+++ b/boards/xtensa/esp32s3/common/src/esp32s3_board_i2s.c
@@ -37,14 +37,14 @@
#include <arch/board/board.h>
-#ifdef CONFIG_ESP32S3_I2S
-#include "esp32s3_i2s.h"
+#ifdef CONFIG_ESPRESSIF_I2S
+#include "espressif/esp_i2s.h"
#else
#include "espressif/esp_i2s.h"
#endif
-#if (defined(CONFIG_ESP32S3_I2S0) && !defined(CONFIG_AUDIO_CS4344)) || \
- defined(CONFIG_ESP32S3_I2S1) || defined(CONFIG_ESPRESSIF_I2S)
+#if (defined(CONFIG_ESPRESSIF_I2S0) && !defined(CONFIG_AUDIO_CS4344)) || \
+ defined(CONFIG_ESPRESSIF_I2S1)
/****************************************************************************
* Public Functions
@@ -79,11 +79,7 @@ int board_i2sdev_initialize(int port, bool enable_tx, bool
enable_rx)
ainfo("Initializing I2S\n");
-#ifdef CONFIG_ESP32S3_I2S
- i2s = esp32s3_i2sbus_initialize(port);
-#else
i2s = esp_i2sbus_initialize(port);
-#endif
#ifdef CONFIG_AUDIO_I2SCHAR
ret = i2schar_register(i2s, port);
@@ -164,4 +160,4 @@ int board_i2sdev_initialize(int port, bool enable_tx, bool
enable_rx)
return ret;
}
-#endif /* (CONFIG_ESP32S3_I2S) && !(CONFIG_AUDIO_CS4344) */
+#endif /* (CONFIG_ESPRESSIF_I2S) && !(CONFIG_AUDIO_CS4344) */
diff --git a/boards/xtensa/esp32s3/common/src/esp32s3_cs4344.c
b/boards/xtensa/esp32s3/common/src/esp32s3_cs4344.c
index d9fc8709ad..08f5f38f87 100644
--- a/boards/xtensa/esp32s3/common/src/esp32s3_cs4344.c
+++ b/boards/xtensa/esp32s3/common/src/esp32s3_cs4344.c
@@ -39,9 +39,9 @@
#include <arch/board/board.h>
-#include "esp32s3_i2s.h"
+#include "espressif/esp_i2s.h"
-#if defined(CONFIG_ESP32S3_I2S) && defined(CONFIG_AUDIO_CS4344)
+#if defined(CONFIG_ESPRESSIF_I2S) && defined(CONFIG_AUDIO_CS4344)
/****************************************************************************
* Public Functions
@@ -80,7 +80,7 @@ int esp32s3_cs4344_initialize(int port)
{
/* Get an instance of the I2S interface for the CS4344 data channel */
- i2s = esp32s3_i2sbus_initialize(port);
+ i2s = esp_i2sbus_initialize(port);
if (!i2s)
{
auderr("ERROR: Failed to initialize I2S%d\n", port);
@@ -150,4 +150,4 @@ errout:
return ret;
}
-#endif /* CONFIG_ESP32S3_I2S && CONFIG_AUDIO_CS4344 */
+#endif /* CONFIG_ESPRESSIF_I2S && CONFIG_AUDIO_CS4344 */
diff --git a/boards/xtensa/esp32s3/common/src/esp32s3_es8311.c
b/boards/xtensa/esp32s3/common/src/esp32s3_es8311.c
index a4721fb5a9..7fa65e2cb8 100644
--- a/boards/xtensa/esp32s3/common/src/esp32s3_es8311.c
+++ b/boards/xtensa/esp32s3/common/src/esp32s3_es8311.c
@@ -42,9 +42,9 @@
#include <arch/board/board.h>
#include "esp32s3_i2c.h"
-#include "esp32s3_i2s.h"
+#include "espressif/esp_i2s.h"
-#if defined(CONFIG_ESP32S3_I2S) && defined(CONFIG_AUDIO_ES8311)
+#if defined(CONFIG_ESPRESSIF_I2S) && defined(CONFIG_AUDIO_ES8311)
/****************************************************************************
* Private Data
@@ -99,7 +99,7 @@ int esp32s3_es8311_initialize(int i2c_port, uint8_t i2c_addr,
int i2c_freq,
{
/* Get an instance of the I2S interface for the ES8311 data channel */
- i2s = esp32s3_i2sbus_initialize(i2s_port);
+ i2s = esp_i2sbus_initialize(i2s_port);
if (i2s == NULL)
{
auderr("ERROR: Failed to initialize I2S\n");
@@ -213,4 +213,4 @@ errout:
return ret;
}
-#endif /* CONFIG_ESP32S3_I2S && CONFIG_AUDIO_ES8311 */
+#endif /* CONFIG_ESPRESSIF_I2S && CONFIG_AUDIO_ES8311 */
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/audio/defconfig
b/boards/xtensa/esp32s3/esp32s3-devkit/configs/audio/defconfig
index 8187bedad6..b63b94b913 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/audio/defconfig
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/audio/defconfig
@@ -6,7 +6,7 @@
# modifications.
#
# CONFIG_ARCH_LEDS is not set
-# CONFIG_ESP32S3_I2S0_RX is not set
+# CONFIG_ESPRESSIF_I2S0_RX is not set
# CONFIG_NDEBUG is not set
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
@@ -37,16 +37,15 @@ CONFIG_CS4344_WORKER_STACKSIZE=2048
CONFIG_DRIVERS_AUDIO=y
CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
-CONFIG_ESP32S3_I2S0=y
-CONFIG_ESP32S3_I2S0_BCLKPIN=16
-CONFIG_ESP32S3_I2S0_DOUTPIN=6
-CONFIG_ESP32S3_I2S0_MCLK=y
-CONFIG_ESP32S3_I2S0_MCLKPIN=5
-CONFIG_ESP32S3_I2S0_WSPIN=7
-CONFIG_ESP32S3_I2S=y
CONFIG_ESP32S3_SPIFLASH=y
CONFIG_ESP32S3_SPIFLASH_SPIFFS=y
CONFIG_ESP32S3_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_BCLKPIN=16
+CONFIG_ESPRESSIF_I2S0_DOUTPIN=6
+CONFIG_ESPRESSIF_I2S0_MCLK=y
+CONFIG_ESPRESSIF_I2S0_MCLKPIN=5
+CONFIG_ESPRESSIF_I2S0_WSPIN=7
CONFIG_ESPRESSIF_WIFI=y
CONFIG_EXAMPLES_RANDOM=y
CONFIG_FS_PROCFS=y
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/nxlooper/defconfig
b/boards/xtensa/esp32s3/esp32s3-devkit/configs/nxlooper/defconfig
index 4022a0e871..3552dc5d8a 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/nxlooper/defconfig
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/nxlooper/defconfig
@@ -6,8 +6,8 @@
# modifications.
#
# CONFIG_ARCH_LEDS is not set
-# CONFIG_ESP32S3_I2S0_RX is not set
-# CONFIG_ESP32S3_I2S1_TX is not set
+# CONFIG_ESPRESSIF_I2S0_RX is not set
+# CONFIG_ESPRESSIF_I2S1_TX is not set
# CONFIG_NDEBUG is not set
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
@@ -34,19 +34,18 @@ CONFIG_AUDIO_NUM_BUFFERS=4
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DRIVERS_AUDIO=y
-CONFIG_ESP32S3_I2S0=y
-CONFIG_ESP32S3_I2S0_BCLKPIN=16
-CONFIG_ESP32S3_I2S0_DOUTPIN=6
-CONFIG_ESP32S3_I2S0_MCLK=y
-CONFIG_ESP32S3_I2S0_MCLKPIN=5
-CONFIG_ESP32S3_I2S0_WSPIN=7
-CONFIG_ESP32S3_I2S1=y
-CONFIG_ESP32S3_I2S1_BCLKPIN=18
-CONFIG_ESP32S3_I2S1_DINPIN=15
-CONFIG_ESP32S3_I2S1_ROLE_SLAVE=y
-CONFIG_ESP32S3_I2S1_WSPIN=17
-CONFIG_ESP32S3_I2S=y
CONFIG_ESP32S3_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_BCLKPIN=16
+CONFIG_ESPRESSIF_I2S0_DOUTPIN=6
+CONFIG_ESPRESSIF_I2S0_MCLK=y
+CONFIG_ESPRESSIF_I2S0_MCLKPIN=5
+CONFIG_ESPRESSIF_I2S0_WSPIN=7
+CONFIG_ESPRESSIF_I2S1=y
+CONFIG_ESPRESSIF_I2S1_BCLKPIN=18
+CONFIG_ESPRESSIF_I2S1_DINPIN=15
+CONFIG_ESPRESSIF_I2S1_ROLE_SLAVE=y
+CONFIG_ESPRESSIF_I2S1_WSPIN=17
CONFIG_FS_LARGEFILE=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3-devkit.h
b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3-devkit.h
index 663d715252..215722a6b6 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3-devkit.h
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3-devkit.h
@@ -179,7 +179,7 @@ int board_bmp180_initialize(int devno, int busno);
*
****************************************************************************/
-#if defined(CONFIG_ESP32S3_I2S) || defined(CONFIG_ESPRESSIF_I2S)
+#if defined(CONFIG_ESPRESSIF_I2S)
int board_i2sdev_initialize(int port, bool enable_tx, bool enable_rx);
#endif
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c
b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c
index 27c0d267f9..c8a63fe627 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c
@@ -64,8 +64,8 @@
# include "esp32s3_i2c.h"
#endif
-#ifdef CONFIG_ESP32S3_I2S
-# include "esp32s3_i2s.h"
+#ifdef CONFIG_ESPRESSIF_I2S
+# include "espressif/esp_i2s.h"
#endif
#ifdef CONFIG_ESPRESSIF_I2S
@@ -164,8 +164,8 @@
int esp32s3_bringup(void)
{
int ret;
-#if (defined(CONFIG_ESP32S3_I2S0) && !defined(CONFIG_AUDIO_CS4344)) || \
- defined(CONFIG_ESP32S3_I2S1) || defined(CONFIG_ESPRESSIF_I2S)
+#if (defined(CONFIG_ESPRESSIF_I2S0) && !defined(CONFIG_AUDIO_CS4344)) || \
+ defined(CONFIG_ESPRESSIF_I2S1)
bool i2s_enable_tx;
bool i2s_enable_rx;
#endif
@@ -354,7 +354,7 @@ int esp32s3_bringup(void)
}
#endif
-#if defined(CONFIG_ESP32S3_I2S) || defined(CONFIG_ESPRESSIF_I2S)
+#if defined(CONFIG_ESPRESSIF_I2S)
#ifdef CONFIG_AUDIO_CS4344
@@ -367,17 +367,17 @@ int esp32s3_bringup(void)
}
#else
-#if defined(CONFIG_ESP32S3_I2S0_TX) || defined(CONFIG_ESPRESSIF_I2S0_TX)
+#if defined(CONFIG_ESPRESSIF_I2S0_TX)
i2s_enable_tx = true;
#else
i2s_enable_tx = false;
-#endif /* CONFIG_ESP32S3_I2S0_TX || CONFIG_ESPRESSIF_I2S0_TX */
+#endif /* CONFIG_ESPRESSIF_I2S0_TX */
-#if defined(CONFIG_ESP32S3_I2S0_RX) || defined(CONFIG_ESPRESSIF_I2S0_RX)
+#if defined(CONFIG_ESPRESSIF_I2S0_RX)
i2s_enable_rx = true;
#else
i2s_enable_rx = false;
-#endif /* CONFIG_ESP32S3_I2S0_RX || CONFIG_ESPRESSIF_I2S0_RX */
+#endif /* CONFIG_ESPRESSIF_I2S0_RX */
/* Configure I2S generic audio on I2S0 */
@@ -388,19 +388,19 @@ int esp32s3_bringup(void)
}
#endif /* CONFIG_AUDIO_CS4344 */
-#if defined(CONFIG_ESP32S3_I2S1) || defined(CONFIG_ESPRESSIF_I2S1)
+#if defined(CONFIG_ESPRESSIF_I2S1)
-#if defined(CONFIG_ESP32S3_I2S1_TX) || defined(CONFIG_ESPRESSIF_I2S1_TX)
+#if defined(CONFIG_ESPRESSIF_I2S1_TX)
i2s_enable_tx = true;
#else
i2s_enable_tx = false;
-#endif /* CONFIG_ESP32S3_I2S1_TX */
+#endif /* CONFIG_ESPRESSIF_I2S1_TX */
-#if defined(CONFIG_ESP32S3_I2S1_RX) || defined(CONFIG_ESPRESSIF_I2S1_RX)
+#if defined(CONFIG_ESPRESSIF_I2S1_RX)
i2s_enable_rx = true;
#else
i2s_enable_rx = false;
-#endif /* CONFIG_ESP32S3_I2S1_RX || CONFIG_ESPRESSIF_I2S1_RX */
+#endif /* CONFIG_ESPRESSIF_I2S1_RX */
/* Configure I2S generic audio on I2S1 */
@@ -411,9 +411,9 @@ int esp32s3_bringup(void)
ESP32S3_I2S1, ret);
}
-#endif /* CONFIG_ESP32S3_I2S1 || CONFIG_ESPRESSIF_I2S1 */
+#endif /* CONFIG_ESPRESSIF_I2S1 */
-#endif /* CONFIG_ESP32S3_I2S || CONFIG_ESPRESSIF_I2S */
+#endif /* CONFIG_ESPRESSIF_I2S */
#ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */
diff --git a/boards/xtensa/esp32s3/esp32s3-korvo-2/configs/audio/defconfig
b/boards/xtensa/esp32s3/esp32s3-korvo-2/configs/audio/defconfig
index 5a39f01b5c..1344700e4c 100644
--- a/boards/xtensa/esp32s3/esp32s3-korvo-2/configs/audio/defconfig
+++ b/boards/xtensa/esp32s3/esp32s3-korvo-2/configs/audio/defconfig
@@ -8,7 +8,7 @@
# CONFIG_ARCH_LEDS is not set
# CONFIG_AUDIO_FORMAT_MP3 is not set
# CONFIG_AUDIO_FORMAT_SBC is not set
-# CONFIG_ESP32S3_I2S0_RX is not set
+# CONFIG_ESPRESSIF_I2S0_RX is not set
# CONFIG_NDEBUG is not set
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
@@ -40,18 +40,17 @@ CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32S3_I2C0=y
CONFIG_ESP32S3_I2C0_SCLPIN=18
CONFIG_ESP32S3_I2C0_SDAPIN=17
-CONFIG_ESP32S3_I2S0=y
-CONFIG_ESP32S3_I2S0_BCLKPIN=9
-CONFIG_ESP32S3_I2S0_DOUTPIN=8
-CONFIG_ESP32S3_I2S0_MCLK=y
-CONFIG_ESP32S3_I2S0_MCLKPIN=16
-CONFIG_ESP32S3_I2S0_WSPIN=45
-CONFIG_ESP32S3_I2S=y
CONFIG_ESP32S3_SPIFLASH=y
CONFIG_ESP32S3_SPIFLASH_SPIFFS=y
CONFIG_ESP32S3_SPIRAM=y
CONFIG_ESP32S3_SPIRAM_MODE_OCT=y
CONFIG_ESP32S3_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_BCLKPIN=9
+CONFIG_ESPRESSIF_I2S0_DOUTPIN=8
+CONFIG_ESPRESSIF_I2S0_MCLK=y
+CONFIG_ESPRESSIF_I2S0_MCLKPIN=16
+CONFIG_ESPRESSIF_I2S0_WSPIN=45
CONFIG_ESPRESSIF_WIFI=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
diff --git a/boards/xtensa/esp32s3/esp32s3-korvo-2/configs/rtptools/defconfig
b/boards/xtensa/esp32s3/esp32s3-korvo-2/configs/rtptools/defconfig
index 9f549da732..00ca96559b 100644
--- a/boards/xtensa/esp32s3/esp32s3-korvo-2/configs/rtptools/defconfig
+++ b/boards/xtensa/esp32s3/esp32s3-korvo-2/configs/rtptools/defconfig
@@ -8,7 +8,7 @@
# CONFIG_ARCH_LEDS is not set
# CONFIG_AUDIO_FORMAT_MP3 is not set
# CONFIG_AUDIO_FORMAT_SBC is not set
-# CONFIG_ESP32S3_I2S0_RX is not set
+# CONFIG_ESPRESSIF_I2S0_RX is not set
# CONFIG_NDEBUG is not set
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
@@ -41,18 +41,17 @@ CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32S3_I2C0=y
CONFIG_ESP32S3_I2C0_SCLPIN=18
CONFIG_ESP32S3_I2C0_SDAPIN=17
-CONFIG_ESP32S3_I2S0=y
-CONFIG_ESP32S3_I2S0_BCLKPIN=9
-CONFIG_ESP32S3_I2S0_DOUTPIN=8
-CONFIG_ESP32S3_I2S0_MCLK=y
-CONFIG_ESP32S3_I2S0_MCLKPIN=16
-CONFIG_ESP32S3_I2S0_WSPIN=45
-CONFIG_ESP32S3_I2S=y
CONFIG_ESP32S3_SPIFLASH=y
CONFIG_ESP32S3_SPIFLASH_SPIFFS=y
CONFIG_ESP32S3_SPIRAM=y
CONFIG_ESP32S3_SPIRAM_MODE_OCT=y
CONFIG_ESP32S3_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_BCLKPIN=9
+CONFIG_ESPRESSIF_I2S0_DOUTPIN=8
+CONFIG_ESPRESSIF_I2S0_MCLK=y
+CONFIG_ESPRESSIF_I2S0_MCLKPIN=16
+CONFIG_ESPRESSIF_I2S0_WSPIN=45
CONFIG_ESPRESSIF_WIFI=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
diff --git a/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_bringup.c
b/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_bringup.c
index e29f8e0df2..d56ae1f468 100644
--- a/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_bringup.c
@@ -65,8 +65,8 @@
# include "esp32s3_i2c.h"
#endif
-#ifdef CONFIG_ESP32S3_I2S
-# include "esp32s3_i2s.h"
+#ifdef CONFIG_ESPRESSIF_I2S
+# include "espressif/esp_i2s.h"
#endif
#ifdef CONFIG_WATCHDOG
@@ -141,8 +141,8 @@
int esp32s3_bringup(void)
{
int ret;
-#if (defined(CONFIG_ESP32S3_I2S0) && !defined(CONFIG_AUDIO_CS4344) && \
- !defined(CONFIG_AUDIO_ES8311)) || defined(CONFIG_ESP32S3_I2S1)
+#if (defined(CONFIG_ESPRESSIF_I2S0) && !defined(CONFIG_AUDIO_CS4344) && \
+ !defined(CONFIG_AUDIO_ES8311)) || defined(CONFIG_ESPRESSIF_I2S1)
bool i2s_enable_tx;
bool i2s_enable_rx;
#endif
@@ -302,8 +302,8 @@ int esp32s3_bringup(void)
}
#endif
-#ifdef CONFIG_ESP32S3_I2S
-# ifdef CONFIG_ESP32S3_I2S0
+#ifdef CONFIG_ESPRESSIF_I2S
+# ifdef CONFIG_ESPRESSIF_I2S0
# ifdef CONFIG_AUDIO_ES8311
/* Configure ES8311 audio on I2C0 and I2S0 */
@@ -319,17 +319,17 @@ int esp32s3_bringup(void)
}
# else
-# ifdef CONFIG_ESP32S3_I2S0_TX
+# ifdef CONFIG_ESPRESSIF_I2S0_TX
i2s_enable_tx = true;
# else
i2s_enable_tx = false;
-# endif /* CONFIG_ESP32S3_I2S0_TX */
+# endif /* CONFIG_ESPRESSIF_I2S0_TX */
-# ifdef CONFIG_ESP32S3_I2S0_RX
+# ifdef CONFIG_ESPRESSIF_I2S0_RX
i2s_enable_rx = true;
# else
i2s_enable_rx = false;
-# endif /* CONFIG_ESP32S3_I2S0_RX */
+# endif /* CONFIG_ESPRESSIF_I2S0_RX */
/* Configure I2S generic audio on I2S0 */
@@ -340,20 +340,20 @@ int esp32s3_bringup(void)
}
# endif /* CONFIG_AUDIO_ES8311 */
-# endif /* CONFIG_ESP32S3_I2S0 */
+# endif /* CONFIG_ESPRESSIF_I2S0 */
-# ifdef CONFIG_ESP32S3_I2S1
-# ifdef CONFIG_ESP32S3_I2S1_TX
+# ifdef CONFIG_ESPRESSIF_I2S1
+# ifdef CONFIG_ESPRESSIF_I2S1_TX
i2s_enable_tx = true;
# else
i2s_enable_tx = false;
-# endif /* CONFIG_ESP32S3_I2S1_TX */
+# endif /* CONFIG_ESPRESSIF_I2S1_TX */
-# ifdef CONFIG_ESP32S3_I2S1_RX
+# ifdef CONFIG_ESPRESSIF_I2S1_RX
i2s_enable_rx = true;
# else
i2s_enable_rx = false;
-# endif /* CONFIG_ESP32S3_I2S1_RX */
+# endif /* CONFIG_ESPRESSIF_I2S1_RX */
/* Configure I2S generic audio on I2S1 */
@@ -361,11 +361,11 @@ int esp32s3_bringup(void)
if (ret < 0)
{
syslog(LOG_ERR, "Failed to initialize I2S%d driver: %d\n",
- CONFIG_ESP32S3_I2S1, ret);
+ CONFIG_ESPRESSIF_I2S1, ret);
}
-# endif /* CONFIG_ESP32S3_I2S1 */
-#endif /* CONFIG_ESP32S3_I2S */
+# endif /* CONFIG_ESPRESSIF_I2S1 */
+#endif /* CONFIG_ESPRESSIF_I2S */
#ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */
diff --git a/boards/xtensa/esp32s3/esp32s3-lcd-ev/configs/audio/defconfig
b/boards/xtensa/esp32s3/esp32s3-lcd-ev/configs/audio/defconfig
index ed0a1645dc..cc4a261477 100644
--- a/boards/xtensa/esp32s3/esp32s3-lcd-ev/configs/audio/defconfig
+++ b/boards/xtensa/esp32s3/esp32s3-lcd-ev/configs/audio/defconfig
@@ -8,7 +8,7 @@
# CONFIG_ARCH_LEDS is not set
# CONFIG_AUDIO_FORMAT_MP3 is not set
# CONFIG_AUDIO_FORMAT_SBC is not set
-# CONFIG_ESP32S3_I2S0_RX is not set
+# CONFIG_ESPRESSIF_I2S0_RX is not set
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
CONFIG_ALLOW_BSD_COMPONENTS=y
@@ -38,16 +38,15 @@ CONFIG_DRIVERS_AUDIO=y
CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32S3_I2C0=y
-CONFIG_ESP32S3_I2S0=y
-CONFIG_ESP32S3_I2S0_BCLKPIN=9
-CONFIG_ESP32S3_I2S0_DOUTPIN=8
-CONFIG_ESP32S3_I2S0_MCLK=y
-CONFIG_ESP32S3_I2S0_MCLKPIN=16
-CONFIG_ESP32S3_I2S0_WSPIN=45
-CONFIG_ESP32S3_I2S=y
CONFIG_ESP32S3_SPIFLASH=y
CONFIG_ESP32S3_SPIFLASH_SPIFFS=y
CONFIG_ESP32S3_UART0=y
+CONFIG_ESPRESSIF_I2S0=y
+CONFIG_ESPRESSIF_I2S0_BCLKPIN=9
+CONFIG_ESPRESSIF_I2S0_DOUTPIN=8
+CONFIG_ESPRESSIF_I2S0_MCLK=y
+CONFIG_ESPRESSIF_I2S0_MCLKPIN=16
+CONFIG_ESPRESSIF_I2S0_WSPIN=45
CONFIG_ESPRESSIF_WIFI=y
CONFIG_EXAMPLES_RANDOM=y
CONFIG_FS_PROCFS=y
diff --git a/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_bringup.c
b/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_bringup.c
index e725def3c5..6bbad14c0f 100644
--- a/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_bringup.c
@@ -61,8 +61,8 @@
# include "esp32s3_i2c.h"
#endif
-#ifdef CONFIG_ESP32S3_I2S
-# include "esp32s3_i2s.h"
+#ifdef CONFIG_ESPRESSIF_I2S
+# include "espressif/esp_i2s.h"
#endif
#ifdef CONFIG_ESP32S3_RT_TIMER
@@ -112,8 +112,8 @@
int esp32s3_bringup(void)
{
int ret;
-#if (defined(CONFIG_ESP32S3_I2S0) && !defined(CONFIG_AUDIO_CS4344) && \
- !defined(CONFIG_AUDIO_ES8311)) || defined(CONFIG_ESP32S3_I2S1)
+#if (defined(CONFIG_ESPRESSIF_I2S0) && !defined(CONFIG_AUDIO_CS4344) && \
+ !defined(CONFIG_AUDIO_ES8311)) || defined(CONFIG_ESPRESSIF_I2S1)
bool i2s_enable_tx;
bool i2s_enable_rx;
#endif
@@ -186,8 +186,8 @@ int esp32s3_bringup(void)
}
#endif
-#ifdef CONFIG_ESP32S3_I2S
-# ifdef CONFIG_ESP32S3_I2S0
+#ifdef CONFIG_ESPRESSIF_I2S
+# ifdef CONFIG_ESPRESSIF_I2S0
# ifdef CONFIG_AUDIO_ES8311
/* Configure ES8311 audio on I2C0 and I2S0 */
@@ -203,17 +203,17 @@ int esp32s3_bringup(void)
}
# else
-# ifdef CONFIG_ESP32S3_I2S0_TX
+# ifdef CONFIG_ESPRESSIF_I2S0_TX
i2s_enable_tx = true;
# else
i2s_enable_tx = false;
-# endif /* CONFIG_ESP32S3_I2S0_TX */
+# endif /* CONFIG_ESPRESSIF_I2S0_TX */
-# ifdef CONFIG_ESP32S3_I2S0_RX
+# ifdef CONFIG_ESPRESSIF_I2S0_RX
i2s_enable_rx = true;
# else
i2s_enable_rx = false;
-# endif /* CONFIG_ESP32S3_I2S0_RX */
+# endif /* CONFIG_ESPRESSIF_I2S0_RX */
/* Configure I2S generic audio on I2S0 */
@@ -224,20 +224,20 @@ int esp32s3_bringup(void)
}
# endif /* CONFIG_AUDIO_ES8311 */
-# endif /* CONFIG_ESP32S3_I2S0 */
+# endif /* CONFIG_ESPRESSIF_I2S0 */
-# ifdef CONFIG_ESP32S3_I2S1
-# ifdef CONFIG_ESP32S3_I2S1_TX
+# ifdef CONFIG_ESPRESSIF_I2S1
+# ifdef CONFIG_ESPRESSIF_I2S1_TX
i2s_enable_tx = true;
# else
i2s_enable_tx = false;
-# endif /* CONFIG_ESP32S3_I2S1_TX */
+# endif /* CONFIG_ESPRESSIF_I2S1_TX */
-# ifdef CONFIG_ESP32S3_I2S1_RX
+# ifdef CONFIG_ESPRESSIF_I2S1_RX
i2s_enable_rx = true;
# else
i2s_enable_rx = false;
-# endif /* CONFIG_ESP32S3_I2S1_RX */
+# endif /* CONFIG_ESPRESSIF_I2S1_RX */
/* Configure I2S generic audio on I2S1 */
@@ -245,11 +245,11 @@ int esp32s3_bringup(void)
if (ret < 0)
{
syslog(LOG_ERR, "Failed to initialize I2S%d driver: %d\n",
- CONFIG_ESP32S3_I2S1, ret);
+ CONFIG_ESPRESSIF_I2S1, ret);
}
-# endif /* CONFIG_ESP32S3_I2S1 */
-#endif /* CONFIG_ESP32S3_I2S */
+# endif /* CONFIG_ESPRESSIF_I2S1 */
+#endif /* CONFIG_ESPRESSIF_I2S */
#ifdef CONFIG_INPUT_BUTTONS
/* Register the BUTTON driver */
diff --git a/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3-szpi.h
b/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3-szpi.h
index cb0724249a..44c1649fd2 100644
--- a/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3-szpi.h
+++ b/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3-szpi.h
@@ -159,7 +159,7 @@ int board_bmp180_initialize(int devno, int busno);
*
****************************************************************************/
-#ifdef CONFIG_ESP32S3_I2S
+#ifdef CONFIG_ESPRESSIF_I2S
int board_i2sdev_initialize(int port, bool enable_tx, bool enable_rx);
#endif
diff --git a/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3_bringup.c
b/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3_bringup.c
index 2eee0df9cf..9be06f7f71 100644
--- a/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3_bringup.c
@@ -65,8 +65,8 @@
# include "esp32s3_i2c.h"
#endif
-#ifdef CONFIG_ESP32S3_I2S
-# include "esp32s3_i2s.h"
+#ifdef CONFIG_ESPRESSIF_I2S
+# include "espressif/esp_i2s.h"
#endif
#ifdef CONFIG_WATCHDOG
@@ -153,8 +153,8 @@
int esp32s3_bringup(void)
{
int ret;
-#if (defined(CONFIG_ESP32S3_I2S0) && !defined(CONFIG_AUDIO_CS4344)) || \
- defined(CONFIG_ESP32S3_I2S1)
+#if (defined(CONFIG_ESPRESSIF_I2S0) && !defined(CONFIG_AUDIO_CS4344)) || \
+ defined(CONFIG_ESPRESSIF_I2S1)
bool i2s_enable_tx;
bool i2s_enable_rx;
#endif
@@ -334,7 +334,7 @@ int esp32s3_bringup(void)
}
#endif
-#ifdef CONFIG_ESP32S3_I2S
+#ifdef CONFIG_ESPRESSIF_I2S
#ifdef CONFIG_AUDIO_CS4344
@@ -347,17 +347,17 @@ int esp32s3_bringup(void)
}
#else
-#ifdef CONFIG_ESP32S3_I2S0_TX
+#ifdef CONFIG_ESPRESSIF_I2S0_TX
i2s_enable_tx = true;
#else
i2s_enable_tx = false;
-#endif /* CONFIG_ESP32S3_I2S0_TX */
+#endif /* CONFIG_ESPRESSIF_I2S0_TX */
-#ifdef CONFIG_ESP32S3_I2S0_RX
+#ifdef CONFIG_ESPRESSIF_I2S0_RX
i2s_enable_rx = true;
#else
i2s_enable_rx = false;
-#endif /* CONFIG_ESP32S3_I2S0_RX */
+#endif /* CONFIG_ESPRESSIF_I2S0_RX */
/* Configure I2S generic audio on I2S0 */
@@ -368,19 +368,19 @@ int esp32s3_bringup(void)
}
#endif /* CONFIG_AUDIO_CS4344 */
-#ifdef CONFIG_ESP32S3_I2S1
+#ifdef CONFIG_ESPRESSIF_I2S1
-#ifdef CONFIG_ESP32S3_I2S1_TX
+#ifdef CONFIG_ESPRESSIF_I2S1_TX
i2s_enable_tx = true;
#else
i2s_enable_tx = false;
-#endif /* CONFIG_ESP32S3_I2S1_TX */
+#endif /* CONFIG_ESPRESSIF_I2S1_TX */
-#ifdef CONFIG_ESP32S3_I2S1_RX
+#ifdef CONFIG_ESPRESSIF_I2S1_RX
i2s_enable_rx = true;
#else
i2s_enable_rx = false;
-#endif /* CONFIG_ESP32S3_I2S1_RX */
+#endif /* CONFIG_ESPRESSIF_I2S1_RX */
/* Configure I2S generic audio on I2S1 */
@@ -388,12 +388,12 @@ int esp32s3_bringup(void)
if (ret < 0)
{
syslog(LOG_ERR, "Failed to initialize I2S%d driver: %d\n",
- CONFIG_ESP32S3_I2S1, ret);
+ CONFIG_ESPRESSIF_I2S1, ret);
}
-#endif /* CONFIG_ESP32S3_I2S1 */
+#endif /* CONFIG_ESPRESSIF_I2S1 */
-#endif /* CONFIG_ESP32S3_I2S */
+#endif /* CONFIG_ESPRESSIF_I2S */
#ifdef CONFIG_ESPRESSIF_WIRELESS
