michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: Enable USDHC driver for all RT10xx based boards

Browse source 
Enable new USDHC driver for all RT10xx boards, since those will have
the SDHC driver selected by Kconfig

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
This commit is contained in:
Daniel DeGrasse 2022-02-25 11:21:45 -06:00 • committed by David Leach
commit aef290bb4d
12 changed files with 62 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts
View file

@ -178,13 +178,19 @@ zephyr_udc0: &usb1 {
&usdhc1 { &usdhc1 {
status = "okay"; status = "okay";
cd-gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
no-1-8-v; no-1-8-v;
pinctrl-0 = <&pinmux_usdhc1>; pinctrl-0 = <&pinmux_usdhc1>;
pinctrl-1 = <&pinmux_usdhc1_slow>; pinctrl-1 = <&pinmux_usdhc1_slow>;
pinctrl-2 = <&pinmux_usdhc1_med>; pinctrl-2 = <&pinmux_usdhc1_med>;
pinctrl-3 = <&pinmux_usdhc1_fast>; pinctrl-3 = <&pinmux_usdhc1_fast>;
pinctrl-names = "default", "slow", "med", "fast"; pinctrl-names = "default", "slow", "med", "fast";
cd-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
pwr-gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>;
mmc {
compatible = "zephyr,sdmmc-disk";
status = "okay";
label = "SDMMC_0";
};
}; };
&adc1 { &adc1 {

1
boards/arm/mimxrt1020_evk/mimxrt1020_evk.yaml
View file

@ -24,3 +24,4 @@ supported:
- spi - spi
- usb_device - usb_device
- adc - adc
- sdhc

17
boards/arm/mimxrt1024_evk/mimxrt1024_evk.dts
View file

@ -166,3 +166,20 @@
zephyr_udc0: &usb1 { zephyr_udc0: &usb1 {
status = "okay"; status = "okay";
}; };
&usdhc1 {
status = "okay";
pinctrl-0 = <&pinmux_usdhc1>;
pinctrl-1 = <&pinmux_usdhc1_slow>;
pinctrl-2 = <&pinmux_usdhc1_med>;
pinctrl-3 = <&pinmux_usdhc1_fast>;
pinctrl-names = "default", "slow", "med", "fast";
cd-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
pwr-gpios = <&gpio3 30 GPIO_ACTIVE_HIGH>;
no-1-8-v;
mmc {
compatible = "zephyr,sdmmc-disk";
status = "okay";
label = "SDMMC_0";
};
};

1
boards/arm/mimxrt1024_evk/mimxrt1024_evk.yaml
View file

@ -21,5 +21,6 @@ supported:
- netif:eth - netif:eth
- watchdog - watchdog
- spi - spi
- sdhc
- adc - adc
- usb_device - usb_device

6
boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts
View file

@ -258,7 +258,6 @@ zephyr_udc0: &usb1 {
&usdhc1 { &usdhc1 {
status = "okay"; status = "okay";
no-1-8-v;
pwr-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; pwr-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
cd-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; cd-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
pinctrl-0 = <&pinmux_usdhc1>; pinctrl-0 = <&pinmux_usdhc1>;
@ -266,6 +265,11 @@ zephyr_udc0: &usb1 {
pinctrl-2 = <&pinmux_usdhc1_med>; pinctrl-2 = <&pinmux_usdhc1_med>;
pinctrl-3 = <&pinmux_usdhc1_fast>; pinctrl-3 = <&pinmux_usdhc1_fast>;
pinctrl-names = "default", "slow", "med", "fast"; pinctrl-names = "default", "slow", "med", "fast";
mmc {
compatible = "zephyr,sdmmc-disk";
status = "okay";
label = "SDMMC_0";
};
}; };
&wdog0 { &wdog0 {

7
boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts
View file

@ -217,15 +217,20 @@ zephyr_udc0: &usb1 {
&usdhc1 { &usdhc1 {
status = "okay"; status = "okay";
power-delay-ms = <1000>;
pwr-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; pwr-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
cd-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; cd-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
no-1-8-v;
status = "okay"; status = "okay";
pinctrl-0 = <&pinmux_usdhc1>; pinctrl-0 = <&pinmux_usdhc1>;
pinctrl-1 = <&pinmux_usdhc1_slow>; pinctrl-1 = <&pinmux_usdhc1_slow>;
pinctrl-2 = <&pinmux_usdhc1_med>; pinctrl-2 = <&pinmux_usdhc1_med>;
pinctrl-3 = <&pinmux_usdhc1_fast>; pinctrl-3 = <&pinmux_usdhc1_fast>;
pinctrl-names = "default", "slow", "med", "fast"; pinctrl-names = "default", "slow", "med", "fast";
mmc {
compatible = "zephyr,sdmmc-disk";
status = "okay";
label = "SDMMC_0";
};
}; };
&edma0 { &edma0 {

3
boards/arm/mimxrt1064_evk/Kconfig.defconfig
View file

@ -15,9 +15,6 @@ endchoice
config DISK_DRIVER_SDMMC config DISK_DRIVER_SDMMC
default y if DISK_DRIVERS default y if DISK_DRIVERS
config IMX_USDHC
default y if SDHC
config FLASH_MCUX_FLEXSPI_NOR config FLASH_MCUX_FLEXSPI_NOR
default y if FLASH default y if FLASH

8
boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts
View file

@ -286,14 +286,18 @@ zephyr_udc0: &usb1 {
&usdhc1 { &usdhc1 {
status = "okay"; status = "okay";
no-1-8-v; pwr-gpios = <&gpio1 19 GPIO_ACTIVE_HIGH>;
pwr-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
cd-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; cd-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
pinctrl-0 = <&pinmux_usdhc1>; pinctrl-0 = <&pinmux_usdhc1>;
pinctrl-1 = <&pinmux_usdhc1_slow>; pinctrl-1 = <&pinmux_usdhc1_slow>;
pinctrl-2 = <&pinmux_usdhc1_med>; pinctrl-2 = <&pinmux_usdhc1_med>;
pinctrl-3 = <&pinmux_usdhc1_fast>; pinctrl-3 = <&pinmux_usdhc1_fast>;
pinctrl-names = "default", "slow", "med", "fast"; pinctrl-names = "default", "slow", "med", "fast";
mmc {
compatible = "zephyr,sdmmc-disk";
status = "okay";
label = "SDMMC_0";
};
}; };
&edma0 { &edma0 {

5
boards/arm/mm_swiftio/mm_swiftio.dts
View file

@ -184,6 +184,11 @@
pinctrl-2 = <&pinmux_usdhc1_med>; pinctrl-2 = <&pinmux_usdhc1_med>;
pinctrl-3 = <&pinmux_usdhc1_fast>; pinctrl-3 = <&pinmux_usdhc1_fast>;
pinctrl-names = "default", "slow", "med", "fast"; pinctrl-names = "default", "slow", "med", "fast";
mmc {
compatible = "zephyr,sdmmc-disk";
status = "okay";
label = "SDMMC_0";
};
}; };
&csi { &csi {

11
boards/arm/teensy4/teensy41.dts
View file

@ -28,5 +28,14 @@
&usdhc1 { &usdhc1 {
status = "okay"; status = "okay";
no-1-8-v; no-1-8-v;
detect-dat3; pinctrl-0 = <&pinmux_usdhc1>;
pinctrl-1 = <&pinmux_usdhc1_slow>;
pinctrl-2 = <&pinmux_usdhc1_med>;
pinctrl-3 = <&pinmux_usdhc1_fast>;
pinctrl-names = "default", "slow", "med", "fast";
mmc {
compatible = "zephyr,sdmmc-disk";
status = "okay";
label = "SDMMC_0";
};
}; };

4
soc/arm/nxp_imx/rt/Kconfig.defconfig.series
View file

@ -56,6 +56,10 @@ config UART_MCUX_LPUART
default y if HAS_MCUX_LPUART default y if HAS_MCUX_LPUART
depends on SERIAL depends on SERIAL
config IMX_USDHC
default y if (HAS_MCUX_USDHC1 || HAS_MCUX_USDHC2)
depends on SDHC
if FLASH_MCUX_FLEXSPI_XIP if FLASH_MCUX_FLEXSPI_XIP
# Avoid RWW hazards by defaulting logging to disabled # Avoid RWW hazards by defaulting logging to disabled

4
soc/arm/nxp_imx/rt/Kconfig.soc
View file

@ -24,8 +24,6 @@ config SOC_MIMXRT1011
select CPU_HAS_ARM_MPU select CPU_HAS_ARM_MPU
select INIT_ENET_PLL select INIT_ENET_PLL
select HAS_MCUX_USB_EHCI select HAS_MCUX_USB_EHCI
select HAS_MCUX_USDHC1
select HAS_MCUX_USDHC2
select HAS_MCUX_EDMA select HAS_MCUX_EDMA
select HAS_MCUX_GPC select HAS_MCUX_GPC
select HAS_MCUX_DCDC select HAS_MCUX_DCDC
@ -49,8 +47,6 @@ config SOC_MIMXRT1015
select CPU_HAS_ARM_MPU select CPU_HAS_ARM_MPU
select INIT_ENET_PLL select INIT_ENET_PLL
select HAS_MCUX_USB_EHCI select HAS_MCUX_USB_EHCI
select HAS_MCUX_USDHC1
select HAS_MCUX_USDHC2
select HAS_MCUX_EDMA select HAS_MCUX_EDMA
select HAS_MCUX_GPC select HAS_MCUX_GPC
select HAS_MCUX_DCDC select HAS_MCUX_DCDC