Skip to content

Commit ffa6c43

Browse files
wmrsouzawmrsouza
committed
boards: esp32: rework i2s pin config on dtsi, dts, and overlay files
Reworks i2s entries on esp32 pinctrl.dtsi and .dts board files and adequates overlay files regarding to i2s samples Signed-off-by: Marcio Ribeiro <[email protected]>
1 parent dfe0923 commit ffa6c43

33 files changed

+173
-197
lines changed

‎boards/espressif/esp32_devkitc/esp32_devkitc-pinctrl.dtsi‎

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -81,33 +81,19 @@
8181

8282
i2s0_default: i2s0_default {
8383
group1 {
84-
pinmux = <I2S0_O_WS_GPIO5>,
85-
<I2S0_O_BCK_GPIO6>,
86-
<I2S0_O_SD_GPIO7>,
87-
<I2S0_I_WS_GPIO15>,
88-
<I2S0_I_BCK_GPIO16>;
89-
output-enable;
90-
};
91-
92-
group2 {
93-
pinmux = <I2S0_I_SD_GPIO17>;
94-
input-enable;
84+
pinmux = <I2S0_O_WS_GPIO33>,
85+
<I2S0_O_BCK_GPIO32>,
86+
<I2S0_O_SD_GPIO25>,
87+
<I2S0_I_SD_GPIO17>;
9588
};
9689
};
9790

9891
i2s1_default: i2s1_default {
9992
group1 {
100-
pinmux = <I2S1_O_WS_GPIO8>,
101-
<I2S1_O_BCK_GPIO3>,
102-
<I2S1_O_SD_GPIO9>,
103-
<I2S1_I_WS_GPIO10>,
104-
<I2S1_I_BCK_GPIO11>;
105-
output-enable;
106-
};
107-
108-
group2 {
109-
pinmux = <I2S1_I_SD_GPIO12>;
110-
input-enable;
93+
pinmux = <I2S1_O_WS_GPIO5>,
94+
<I2S1_O_BCK_GPIO18>,
95+
<I2S1_O_SD_GPIO19>,
96+
<I2S1_I_SD_GPIO11>;
11197
};
11298
};
11399
};

‎boards/espressif/esp32_devkitc/esp32_devkitc_procpu.dts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,11 @@
9393
&i2s0 {
9494
pinctrl-0 = <&i2s0_default>;
9595
pinctrl-names = "default";
96-
status = "disabled";
9796
};
9897

9998
&i2s1 {
10099
pinctrl-0 = <&i2s1_default>;
101100
pinctrl-names = "default";
102-
status = "disabled";
103101
};
104102

105103
&spi2 {

‎boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit-pinctrl.dtsi‎

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -43,33 +43,19 @@
4343

4444
i2s0_default: i2s0_default {
4545
group1 {
46-
pinmux = <I2S0_O_WS_GPIO5>,
47-
<I2S0_O_BCK_GPIO6>,
48-
<I2S0_O_SD_GPIO7>,
49-
<I2S0_I_WS_GPIO15>,
50-
<I2S0_I_BCK_GPIO16>;
51-
output-enable;
52-
};
53-
54-
group2 {
55-
pinmux = <I2S0_I_SD_GPIO17>;
56-
input-enable;
46+
pinmux = <I2S0_O_WS_GPIO34>,
47+
<I2S0_O_BCK_GPIO33>,
48+
<I2S0_O_SD_GPIO32>,
49+
<I2S0_I_SD_GPIO39>;
5750
};
5851
};
5952

6053
i2s1_default: i2s1_default {
6154
group1 {
62-
pinmux = <I2S1_O_WS_GPIO8>,
63-
<I2S1_O_BCK_GPIO3>,
64-
<I2S1_O_SD_GPIO9>,
65-
<I2S1_I_WS_GPIO10>,
66-
<I2S1_I_BCK_GPIO11>;
67-
output-enable;
68-
};
69-
70-
group2 {
71-
pinmux = <I2S1_I_SD_GPIO12>;
72-
input-enable;
55+
pinmux = <I2S1_O_WS_GPIO17>,
56+
<I2S1_O_BCK_GPIO16>,
57+
<I2S1_O_SD_GPIO4>,
58+
<I2S1_I_SD_GPIO12>;
7359
};
7460
};
7561
};

‎boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.dts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,11 @@
4646
&i2s0 {
4747
pinctrl-0 = <&i2s0_default>;
4848
pinctrl-names = "default";
49-
status = "disabled";
5049
};
5150

5251
&i2s1 {
5352
pinctrl-0 = <&i2s1_default>;
5453
pinctrl-names = "default";
55-
status = "disabled";
5654
};
5755

5856
&spi2 {

‎boards/espressif/esp32c3_devkitc/esp32c3_devkitc-pinctrl.dtsi‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,16 @@
4444
};
4545
};
4646

47+
i2s_default: i2s_default {
48+
group1 {
49+
pinmux = <I2S_MCLK_GPIO19>,
50+
<I2S_O_WS_GPIO6>,
51+
<I2S_O_BCK_GPIO7>,
52+
<I2S_O_SD_GPIO8>,
53+
<I2S_I_SD_GPIO18>;
54+
};
55+
};
56+
4757
twai_default: twai_default {
4858
group1 {
4959
pinmux = <TWAI_TX_GPIO4>,

‎boards/espressif/esp32c3_devkitc/esp32c3_devkitc.dts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@
6060
pinctrl-names = "default";
6161
};
6262

63+
&i2s {
64+
pinctrl-0 = <&i2s_default>;
65+
pinctrl-names = "default";
66+
};
67+
6368
&trng0 {
6469
status = "okay";
6570
};

‎boards/espressif/esp32c3_devkitc/esp32c3_devkitc.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ supported:
88
- adc
99
- gpio
1010
- i2c
11+
- i2s
1112
- watchdog
1213
- uart
1314
- dma

‎boards/espressif/esp32c3_devkitm/esp32c3_devkitm-pinctrl.dtsi‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,11 @@
4646

4747
i2s_default: i2s_default {
4848
group1 {
49-
pinmux = <I2S_MCLK_GPIO6>,
50-
<I2S_O_WS_GPIO5>,
51-
<I2S_O_BCK_GPIO4>,
52-
<I2S_O_SD_GPIO18>;
53-
output-enable;
54-
};
55-
56-
group2 {
57-
pinmux = <I2S_I_SD_GPIO19>;
58-
input-enable;
49+
pinmux = <I2S_MCLK_GPIO19>,
50+
<I2S_O_WS_GPIO6>,
51+
<I2S_O_BCK_GPIO7>,
52+
<I2S_O_SD_GPIO8>,
53+
<I2S_I_SD_GPIO18>;
5954
};
6055
};
6156

‎boards/espressif/esp32c3_devkitm/esp32c3_devkitm.dts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
&i2s {
6464
pinctrl-0 = <&i2s_default>;
6565
pinctrl-names = "default";
66-
status = "disabled";
6766
};
6867

6968
&trng0 {

‎boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore-pinctrl.dtsi‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,14 @@
4343
output-high;
4444
};
4545
};
46+
47+
i2s_default: i2s_default {
48+
group1 {
49+
pinmux = <I2S_MCLK_GPIO5>,
50+
<I2S_O_WS_GPIO6>,
51+
<I2S_O_BCK_GPIO7>,
52+
<I2S_O_SD_GPIO8>,
53+
<I2S_I_SD_GPIO23>;
54+
};
55+
};
4656
};

0 commit comments

Comments
 (0)