Skip to content
Open
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
30 changes: 8 additions & 22 deletions boards/espressif/esp32_devkitc/esp32_devkitc-pinctrl.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -81,33 +81,19 @@

i2s0_default: i2s0_default {
group1 {
pinmux = <I2S0_O_WS_GPIO5>,
<I2S0_O_BCK_GPIO6>,
<I2S0_O_SD_GPIO7>,
<I2S0_I_WS_GPIO15>,
<I2S0_I_BCK_GPIO16>;
output-enable;
};

group2 {
pinmux = <I2S0_I_SD_GPIO17>;
input-enable;
pinmux = <I2S0_O_WS_GPIO33>,
<I2S0_O_BCK_GPIO32>,
<I2S0_O_SD_GPIO25>,
<I2S0_I_SD_GPIO17>;
};
};

i2s1_default: i2s1_default {
group1 {
pinmux = <I2S1_O_WS_GPIO8>,
<I2S1_O_BCK_GPIO3>,
<I2S1_O_SD_GPIO9>,
<I2S1_I_WS_GPIO10>,
<I2S1_I_BCK_GPIO11>;
output-enable;
};

group2 {
pinmux = <I2S1_I_SD_GPIO12>;
input-enable;
pinmux = <I2S1_O_WS_GPIO5>,
<I2S1_O_BCK_GPIO18>,
<I2S1_O_SD_GPIO19>,
<I2S1_I_SD_GPIO11>;
};
};
};
2 changes: 0 additions & 2 deletions boards/espressif/esp32_devkitc/esp32_devkitc_procpu.dts
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,11 @@
&i2s0 {
pinctrl-0 = <&i2s0_default>;
pinctrl-names = "default";
status = "disabled";
};

&i2s1 {
pinctrl-0 = <&i2s1_default>;
pinctrl-names = "default";
status = "disabled";
};

&spi2 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,33 +43,19 @@

i2s0_default: i2s0_default {
group1 {
pinmux = <I2S0_O_WS_GPIO5>,
<I2S0_O_BCK_GPIO6>,
<I2S0_O_SD_GPIO7>,
<I2S0_I_WS_GPIO15>,
<I2S0_I_BCK_GPIO16>;
output-enable;
};

group2 {
pinmux = <I2S0_I_SD_GPIO17>;
input-enable;
pinmux = <I2S0_O_WS_GPIO34>,
<I2S0_O_BCK_GPIO33>,
<I2S0_O_SD_GPIO32>,
<I2S0_I_SD_GPIO39>;
};
};

i2s1_default: i2s1_default {
group1 {
pinmux = <I2S1_O_WS_GPIO8>,
<I2S1_O_BCK_GPIO3>,
<I2S1_O_SD_GPIO9>,
<I2S1_I_WS_GPIO10>,
<I2S1_I_BCK_GPIO11>;
output-enable;
};

group2 {
pinmux = <I2S1_I_SD_GPIO12>;
input-enable;
pinmux = <I2S1_O_WS_GPIO17>,
<I2S1_O_BCK_GPIO16>,
<I2S1_O_SD_GPIO4>,
<I2S1_I_SD_GPIO12>;
};
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,11 @@
&i2s0 {
pinctrl-0 = <&i2s0_default>;
pinctrl-names = "default";
status = "disabled";
};

&i2s1 {
pinctrl-0 = <&i2s1_default>;
pinctrl-names = "default";
status = "disabled";
};

&spi2 {
Expand Down
10 changes: 10 additions & 0 deletions boards/espressif/esp32c3_devkitc/esp32c3_devkitc-pinctrl.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,16 @@
};
};

i2s_default: i2s_default {
group1 {
pinmux = <I2S_MCLK_GPIO19>,
<I2S_O_WS_GPIO6>,
<I2S_O_BCK_GPIO7>,
<I2S_O_SD_GPIO8>,
<I2S_I_SD_GPIO18>;
};
};

twai_default: twai_default {
group1 {
pinmux = <TWAI_TX_GPIO4>,
Expand Down
5 changes: 5 additions & 0 deletions boards/espressif/esp32c3_devkitc/esp32c3_devkitc.dts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@
pinctrl-names = "default";
};

&i2s {
pinctrl-0 = <&i2s_default>;
pinctrl-names = "default";
};

&trng0 {
status = "okay";
};
Expand Down
1 change: 1 addition & 0 deletions boards/espressif/esp32c3_devkitc/esp32c3_devkitc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ supported:
- adc
- gpio
- i2c
- i2s
- watchdog
- uart
- dma
Expand Down
15 changes: 5 additions & 10 deletions boards/espressif/esp32c3_devkitm/esp32c3_devkitm-pinctrl.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,11 @@

i2s_default: i2s_default {
group1 {
pinmux = <I2S_MCLK_GPIO6>,
<I2S_O_WS_GPIO5>,
<I2S_O_BCK_GPIO4>,
<I2S_O_SD_GPIO18>;
output-enable;
};

group2 {
pinmux = <I2S_I_SD_GPIO19>;
input-enable;
pinmux = <I2S_MCLK_GPIO19>,
<I2S_O_WS_GPIO6>,
<I2S_O_BCK_GPIO7>,
<I2S_O_SD_GPIO8>,
<I2S_I_SD_GPIO18>;
};
};

Expand Down
1 change: 0 additions & 1 deletion boards/espressif/esp32c3_devkitm/esp32c3_devkitm.dts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
&i2s {
pinctrl-0 = <&i2s_default>;
pinctrl-names = "default";
status = "disabled";
};

&trng0 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,14 @@
output-high;
};
};

i2s_default: i2s_default {
group1 {
pinmux = <I2S_MCLK_GPIO5>,
<I2S_O_WS_GPIO6>,
<I2S_O_BCK_GPIO7>,
<I2S_O_SD_GPIO8>,
<I2S_I_SD_GPIO23>;
};
};
};
5 changes: 5 additions & 0 deletions boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore.dts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@
pinctrl-names = "default";
};

&i2s {
pinctrl-0 = <&i2s_default>;
pinctrl-names = "default";
};

&spi2 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down
11 changes: 2 additions & 9 deletions boards/espressif/esp32s2_devkitc/esp32s2_devkitc-pinctrl.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,8 @@
pinmux = <I2S0_MCLK_GPIO4>,
<I2S0_O_WS_GPIO5>,
<I2S0_O_BCK_GPIO6>,
<I2S0_O_SD_GPIO7>,
<I2S0_I_WS_GPIO15>,
<I2S0_I_BCK_GPIO16>;
output-enable;
};

group2 {
pinmux = <I2S0_I_SD_GPIO17>;
input-enable;
<I2S0_O_SD_GPIO18>,
<I2S0_I_SD_GPIO17>;
};
};
};
1 change: 0 additions & 1 deletion boards/espressif/esp32s2_devkitc/esp32s2_devkitc.dts
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@
&i2s0 {
pinctrl-0 = <&i2s0_default>;
pinctrl-names = "default";
status = "disabled";
};

&trng0 {
Expand Down
11 changes: 2 additions & 9 deletions boards/espressif/esp32s2_saola/esp32s2_saola-pinctrl.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,8 @@
pinmux = <I2S0_MCLK_GPIO4>,
<I2S0_O_WS_GPIO5>,
<I2S0_O_BCK_GPIO6>,
<I2S0_O_SD_GPIO7>,
<I2S0_I_WS_GPIO15>,
<I2S0_I_BCK_GPIO16>;
output-enable;
};

group2 {
pinmux = <I2S0_I_SD_GPIO17>;
input-enable;
<I2S0_O_SD_GPIO18>,
<I2S0_I_SD_GPIO17>;
};
};
};
1 change: 0 additions & 1 deletion boards/espressif/esp32s2_saola/esp32s2_saola.dts
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@
&i2s0 {
pinctrl-0 = <&i2s0_default>;
pinctrl-names = "default";
status = "disabled";
};

&trng0 {
Expand Down
34 changes: 10 additions & 24 deletions boards/espressif/esp32s3_devkitc/esp32s3_devkitc-pinctrl.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -55,35 +55,21 @@

i2s0_default: i2s0_default {
group1 {
pinmux = <I2S0_MCLK_GPIO4>,
<I2S0_O_WS_GPIO5>,
<I2S0_O_BCK_GPIO6>,
<I2S0_O_SD_GPIO7>,
<I2S0_I_WS_GPIO15>,
<I2S0_I_BCK_GPIO16>;
output-enable;
};

group2 {
pinmux = <I2S0_I_SD_GPIO17>;
input-enable;
pinmux = <I2S0_MCLK_GPIO42>,
<I2S0_O_WS_GPIO36>,
<I2S0_O_BCK_GPIO37>,
<I2S0_O_SD_GPIO38>,
<I2S0_I_SD_GPIO41>;
};
};

i2s1_default: i2s1_default {
group1 {
pinmux = <I2S1_MCLK_GPIO18>,
<I2S1_O_WS_GPIO8>,
<I2S1_O_BCK_GPIO3>,
<I2S1_O_SD_GPIO9>,
<I2S1_I_WS_GPIO10>,
<I2S1_I_BCK_GPIO11>;
output-enable;
};

group2 {
pinmux = <I2S1_I_SD_GPIO12>;
input-enable;
pinmux = <I2S1_MCLK_GPIO48>,
<I2S1_O_WS_GPIO4>,
<I2S1_O_BCK_GPIO5>,
<I2S1_O_SD_GPIO6>,
<I2S1_I_SD_GPIO12>;
};
};

Expand Down
2 changes: 0 additions & 2 deletions boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu.dts
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,11 @@
&i2s0 {
pinctrl-0 = <&i2s0_default>;
pinctrl-names = "default";
status = "disabled";
};

&i2s1 {
pinctrl-0 = <&i2s1_default>;
pinctrl-names = "default";
status = "disabled";
};

&spi2 {
Expand Down
34 changes: 10 additions & 24 deletions boards/espressif/esp32s3_devkitm/esp32s3_devkitm-pinctrl.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -55,35 +55,21 @@

i2s0_default: i2s0_default {
group1 {
pinmux = <I2S0_MCLK_GPIO1>,
<I2S0_O_WS_GPIO2>,
<I2S0_O_BCK_GPIO3>,
<I2S0_O_SD_GPIO4>,
<I2S0_I_WS_GPIO5>,
<I2S0_I_BCK_GPIO6>;
output-enable;
};

group2 {
pinmux = <I2S0_I_SD_GPIO7>;
input-enable;
pinmux = <I2S0_MCLK_GPIO42>,
<I2S0_O_WS_GPIO36>,
<I2S0_O_BCK_GPIO37>,
<I2S0_O_SD_GPIO48>,
<I2S0_I_SD_GPIO41>;
};
};

i2s1_default: i2s1_default {
group1 {
pinmux = <I2S1_MCLK_GPIO8>,
<I2S1_O_WS_GPIO9>,
<I2S1_O_BCK_GPIO10>,
<I2S1_O_SD_GPIO11>,
<I2S1_I_WS_GPIO12>,
<I2S1_I_BCK_GPIO13>;
output-enable;
};

group2 {
pinmux = <I2S1_I_SD_GPIO14>;
input-enable;
pinmux = <I2S1_MCLK_GPIO38>,
<I2S1_O_WS_GPIO4>,
<I2S1_O_BCK_GPIO5>,
<I2S1_O_SD_GPIO6>,
<I2S1_I_SD_GPIO12>;
};
};

Expand Down
2 changes: 0 additions & 2 deletions boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu.dts
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,11 @@
&i2s0 {
pinctrl-0 = <&i2s0_default>;
pinctrl-names = "default";
status = "disabled";
};

&i2s1 {
pinctrl-0 = <&i2s1_default>;
pinctrl-names = "default";
status = "disabled";
};

&spi2 {
Expand Down
8 changes: 7 additions & 1 deletion drivers/i2s/Kconfig.esp32
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ config I2S_ESP32
depends on DT_HAS_ESPRESSIF_ESP32_I2S_ENABLED
select DMA if DT_HAS_ESPRESSIF_ESP32_GDMA_ENABLED
help
Enables the ESP32 I2S driver (GDMA SoCs only).
Enables the ESP32 I2S driver.

if I2S_ESP32

Expand All @@ -31,4 +31,10 @@ config I2S_ESP32_DMA_DESC_NUM_MAX
help
Max number of link descriptor available for DMA transfers on each I2S channel

config I2S_ESP32_ALLOWED_EMPTY_TX_QUEUE_DEFERRAL_TIME_MS
int "ESP32 I2S empty TX queue processing deferral time"
default 0
help
Allowed deferral time for processing an empty tx queue in milliseconds

endif
Loading