Skip to content

Commit aef290b

Browse files
danieldegrassedleach02
danieldegrasse
authored and
dleach02
committed
boards: Enable USDHC driver for all RT10xx based boards
Enable new USDHC driver for all RT10xx boards, since those will have the SDHC driver selected by Kconfig Signed-off-by: Daniel DeGrasse <[email protected]>
1 parent a79f485 commit aef290b

File tree

12 files changed

+62
-13
lines changed

12 files changed

+62
-13
lines changed

‎boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,19 @@ zephyr_udc0: &usb1 {
178178

179179
&usdhc1 {
180180
status = "okay";
181-
cd-gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
182181
no-1-8-v;
183182
pinctrl-0 = <&pinmux_usdhc1>;
184183
pinctrl-1 = <&pinmux_usdhc1_slow>;
185184
pinctrl-2 = <&pinmux_usdhc1_med>;
186185
pinctrl-3 = <&pinmux_usdhc1_fast>;
187186
pinctrl-names = "default", "slow", "med", "fast";
187+
cd-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
188+
pwr-gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>;
189+
mmc {
190+
compatible = "zephyr,sdmmc-disk";
191+
status = "okay";
192+
label = "SDMMC_0";
193+
};
188194
};
189195

190196
&adc1 {

‎boards/arm/mimxrt1020_evk/mimxrt1020_evk.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ supported:
2424
- spi
2525
- usb_device
2626
- adc
27+
- sdhc

‎boards/arm/mimxrt1024_evk/mimxrt1024_evk.dts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,3 +166,20 @@
166166
zephyr_udc0: &usb1 {
167167
status = "okay";
168168
};
169+
170+
&usdhc1 {
171+
status = "okay";
172+
pinctrl-0 = <&pinmux_usdhc1>;
173+
pinctrl-1 = <&pinmux_usdhc1_slow>;
174+
pinctrl-2 = <&pinmux_usdhc1_med>;
175+
pinctrl-3 = <&pinmux_usdhc1_fast>;
176+
pinctrl-names = "default", "slow", "med", "fast";
177+
cd-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
178+
pwr-gpios = <&gpio3 30 GPIO_ACTIVE_HIGH>;
179+
no-1-8-v;
180+
mmc {
181+
compatible = "zephyr,sdmmc-disk";
182+
status = "okay";
183+
label = "SDMMC_0";
184+
};
185+
};

‎boards/arm/mimxrt1024_evk/mimxrt1024_evk.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@ supported:
2121
- netif:eth
2222
- watchdog
2323
- spi
24+
- sdhc
2425
- adc
2526
- usb_device

‎boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,14 +258,18 @@ zephyr_udc0: &usb1 {
258258

259259
&usdhc1 {
260260
status = "okay";
261-
no-1-8-v;
262261
pwr-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
263262
cd-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
264263
pinctrl-0 = <&pinmux_usdhc1>;
265264
pinctrl-1 = <&pinmux_usdhc1_slow>;
266265
pinctrl-2 = <&pinmux_usdhc1_med>;
267266
pinctrl-3 = <&pinmux_usdhc1_fast>;
268267
pinctrl-names = "default", "slow", "med", "fast";
268+
mmc {
269+
compatible = "zephyr,sdmmc-disk";
270+
status = "okay";
271+
label = "SDMMC_0";
272+
};
269273
};
270274

271275
&wdog0 {

‎boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,15 +217,20 @@ zephyr_udc0: &usb1 {
217217

218218
&usdhc1 {
219219
status = "okay";
220+
power-delay-ms = <1000>;
220221
pwr-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
221222
cd-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
222-
no-1-8-v;
223223
status = "okay";
224224
pinctrl-0 = <&pinmux_usdhc1>;
225225
pinctrl-1 = <&pinmux_usdhc1_slow>;
226226
pinctrl-2 = <&pinmux_usdhc1_med>;
227227
pinctrl-3 = <&pinmux_usdhc1_fast>;
228228
pinctrl-names = "default", "slow", "med", "fast";
229+
mmc {
230+
compatible = "zephyr,sdmmc-disk";
231+
status = "okay";
232+
label = "SDMMC_0";
233+
};
229234
};
230235

231236
&edma0 {

‎boards/arm/mimxrt1064_evk/Kconfig.defconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ endchoice
1515
config DISK_DRIVER_SDMMC
1616
default y if DISK_DRIVERS
1717

18-
config IMX_USDHC
19-
default y if SDHC
20-
2118
config FLASH_MCUX_FLEXSPI_NOR
2219
default y if FLASH
2320

‎boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,14 +286,18 @@ zephyr_udc0: &usb1 {
286286

287287
&usdhc1 {
288288
status = "okay";
289-
no-1-8-v;
290-
pwr-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
289+
pwr-gpios = <&gpio1 19 GPIO_ACTIVE_HIGH>;
291290
cd-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
292291
pinctrl-0 = <&pinmux_usdhc1>;
293292
pinctrl-1 = <&pinmux_usdhc1_slow>;
294293
pinctrl-2 = <&pinmux_usdhc1_med>;
295294
pinctrl-3 = <&pinmux_usdhc1_fast>;
296295
pinctrl-names = "default", "slow", "med", "fast";
296+
mmc {
297+
compatible = "zephyr,sdmmc-disk";
298+
status = "okay";
299+
label = "SDMMC_0";
300+
};
297301
};
298302

299303
&edma0 {

‎boards/arm/mm_swiftio/mm_swiftio.dts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,11 @@
184184
pinctrl-2 = <&pinmux_usdhc1_med>;
185185
pinctrl-3 = <&pinmux_usdhc1_fast>;
186186
pinctrl-names = "default", "slow", "med", "fast";
187+
mmc {
188+
compatible = "zephyr,sdmmc-disk";
189+
status = "okay";
190+
label = "SDMMC_0";
191+
};
187192
};
188193

189194
&csi {

‎boards/arm/teensy4/teensy41.dts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,14 @@
2828
&usdhc1 {
2929
status = "okay";
3030
no-1-8-v;
31-
detect-dat3;
31+
pinctrl-0 = <&pinmux_usdhc1>;
32+
pinctrl-1 = <&pinmux_usdhc1_slow>;
33+
pinctrl-2 = <&pinmux_usdhc1_med>;
34+
pinctrl-3 = <&pinmux_usdhc1_fast>;
35+
pinctrl-names = "default", "slow", "med", "fast";
36+
mmc {
37+
compatible = "zephyr,sdmmc-disk";
38+
status = "okay";
39+
label = "SDMMC_0";
40+
};
3241
};

0 commit comments

Comments
 (0)