Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

esp32 & esp32s2: i2s support #413

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions zephyr/esp32/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,11 @@ if(CONFIG_SOC_SERIES_ESP32)
../../components/hal/i2c_hal.c
)

zephyr_sources_ifdef(
CONFIG_I2S_ESP32
../../components/hal/i2s_hal.c
)

if (CONFIG_ESP_SPIRAM)
zephyr_compile_definitions(CONFIG_SPIRAM)
zephyr_sources(
Expand Down
5 changes: 5 additions & 0 deletions zephyr/esp32s2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,11 @@ if(CONFIG_SOC_SERIES_ESP32S2)
../../components/hal/i2c_hal.c
)

zephyr_sources_ifdef(
CONFIG_I2S_ESP32
../../components/hal/i2s_hal.c
)

zephyr_sources_ifdef(
CONFIG_UART_ESP32
../../components/hal/uart_hal.c
Expand Down
52 changes: 19 additions & 33 deletions zephyr/port/pincfgs/esp32.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
# Copyright (c) 2022-2025 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
#
# Notes:
Expand Down Expand Up @@ -121,66 +121,52 @@ i2c1:
gpio: [[0, 23], [25, 27], [32, 33]]

i2s0:
mclk:
sigo: i2s0_mclk_out
gpio: [0, 1, 3]
i_bck:
sigi: i2s0i_bck_in
sigo: i2s0i_bck_out
gpio: [[0, 23], [25, 27], [32, 33]]
gpio: [[0, 23], [25, 27], [32, 39]]
i_ws:
sigi: i2s0i_ws_in
sigo: i2s0i_ws_out
gpio: [[0, 23], [25, 27], [32, 33]]
gpio: [[0, 23], [25, 27], [32, 39]]
i_sd:
sigi: i2s0i_data_in0
sigi: i2s0i_data_in15
gpio: [[0, 23], [25, 27], [32, 39]]
o_bck:
sigi: i2s0o_bck_in
sigo: i2s0o_bck_out
gpio: [[0, 23], [25, 27], [32, 33]]
gpio: [[0, 23], [25, 27], [32, 39]]
o_ws:
sigi: i2s0o_ws_in
sigo: i2s0o_ws_out
gpio: [[0, 23], [25, 27], [32, 33]]
gpio: [[0, 23], [25, 27], [32, 39]]
o_sd:
sigo: i2s0o_data_out0
sigo: i2s0o_data_out23
gpio: [[0, 23], [25, 27], [32, 33]]

i2s1:
mclk:
sigo: i2s1_mclk_out
gpio: [0, 1, 3]
i_bck_in:
gpio: [[0, 23], [25, 27], [32, 39]]
i_bck_out:
i_bck:
sigi: i2s1i_bck_in
sigo: i2s1i_bck_out
gpio: [[0, 23], [25, 27], [32, 33]]
i_ws_in:
sigi: i2s1i_ws_in
gpio: [[0, 23], [25, 27], [32, 39]]
i_ws_out:
i_ws:
sigi: i2s1i_ws_in
sigo: i2s1i_ws_out
gpio: [[0, 23], [25, 27], [32, 33]]
gpio: [[0, 23], [25, 27], [32, 39]]
i_sd:
sigi: i2s1i_data_in0
gpio: [[0, 23], [25, 27], [32, 33]]
o_bck_in:
sigi: i2s1o_bck_in
sigi: i2s1i_data_in15
gpio: [[0, 23], [25, 27], [32, 39]]
o_bck_out:
o_bck:
sigi: i2s1o_bck_in
sigo: i2s1o_bck_out
gpio: [[0, 23], [25, 27], [32, 33]]
o_ws_in:
sigi: i2s1o_ws_in
gpio: [[0, 23], [25, 27], [32, 39]]
o_ws_out:
o_ws:
sigi: i2s1o_ws_in
sigo: i2s1o_ws_out
gpio: [[0, 23], [25, 27], [32, 33]]
o_sd:
sigo: i2s1o_data_out0
gpio: [[0, 23], [25, 27], [32, 39]]
o_sd:
sigo: i2s1o_data_out23
gpio: [[0, 23], [25, 27], [32, 33]]

twai:
rx:
Expand Down
20 changes: 10 additions & 10 deletions zephyr/port/pincfgs/esp32s2.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
# Copyright (c) 2022-2025 Espressif Systems (Shanghai) Co., Ltd.
# SPDX-License-Identifier: Apache-2.0
#
# Notes:
Expand Down Expand Up @@ -116,29 +116,29 @@ i2c1:

i2s0:
mclk:
sigo: i2s0_mclk_out
gpio: [[0, 21], [26, 45]]
sigo: clk_i2s
gpio: [[0, 21], [26, 46]]
i_bck:
sigi: i2s0i_bck_in
sigo: i2s0i_bck_out
gpio: [[0, 21], [26, 45]]
gpio: [[0, 21], [26, 46]]
i_ws:
sigi: i2s0i_ws_in
sigo: i2s0i_ws_out
gpio: [[0, 21], [26, 45]]
gpio: [[0, 21], [26, 46]]
i_sd:
sigi: i2s0i_data_in0
gpio: [[0, 21], [26, 45]]
sigi: i2s0i_data_in15
gpio: [[0, 21], [26, 46]]
o_bck:
sigi: i2s0o_bck_in
sigo: i2s0o_bck_out
gpio: [[0, 21], [26, 45]]
gpio: [[0, 21], [26, 46]]
o_ws:
sigi: i2s0o_ws_in
sigo: i2s0o_ws_out
gpio: [[0, 21], [26, 45]]
gpio: [[0, 21], [26, 46]]
o_sd:
sigo: i2s0o_data_out0
sigo: i2s0o_data_out23
gpio: [[0, 21], [26, 45]]

twai:
Expand Down