IMX93 USDHC

arch/arm64/src/imx9/Kconfig

@@ -54,6 +54,99 @@ config IMX9_EDMA
 	default n
 	select ARCH_DMA
 
+menu "USDHC"
+
+config IMX9_USDHC
+	bool
+	default n
+	select ARCH_HAVE_SDIO_PREFLIGHT
+
+config IMX9_USDHC1
+	bool "USDHC1"
+	default n
+	select ARCH_HAVE_SDIO
+	select IMX9_USDHC
+	---help---
+		Support USDHC host controller 1
+
+config IMX9_USDHC2
+	bool "USDHC2"
+	default n
+	select ARCH_HAVE_SDIO
+	select IMX9_USDHC
+	---help---
+		Support USDHC host controller 2
+
+menu "USDHC Configuration"
+	depends on IMX9_USDHC
+
+config IMX9_USDHC_DMA
+	bool "Support DMA data transfers"
+	default y
+	select SDIO_DMA
+	---help---
+		Support DMA data transfers.
+		Enable SD card DMA data transfers.  This is marginally optional.
+		For most usages, SD accesses will cause data overruns if used without
+		DMA.
+
+choice
+	prompt "Bus width for USDHC1"
+	default IMX9_USDHC1_WIDTH_D1_ONLY
+	depends on IMX9_USDHC1
+
+config IMX9_USDHC1_WIDTH_D1_ONLY
+	bool "One bit"
+
+config IMX9_USDHC1_WIDTH_D1_D4
+	bool "Four bit"
+
+config IMX9_USDHC1_WIDTH_D1_D8
+	bool "Eight bit"
+
+endchoice
+
+config IMX9_USDHC1_INVERT_CD
+	bool "Invert the USDHC1 CD"
+	default n
+	depends on IMX9_USDHC1
+	---help---
+		If the board defines PIN_USDHC1_CD the CD_B input to the USDHC it is
+		assumed to be active low. Selecting IMX9_USDHC1_INVERT_CD will make it
+		active high.
+
+		If the board defines PIN_USDHC1_CD_GPIO it is assumed to be active low.
+		Selecting IMX9_USDHC1_INVERT_CD will make it active high.
+
+choice
+	depends on IMX9_USDHC2
+	prompt "Bus width for USDHC2"
+	default IMX9_USDHC2_WIDTH_D1_D4
+
+config IMX9_USDHC2_WIDTH_D1_ONLY
+	bool "One bit"
+
+config IMX9_USDHC2_WIDTH_D1_D4
+	bool "Four bit"
+
+endchoice
+
+config IMX9_USDHC2_INVERT_CD
+	bool "Invert the USDHC2 CD"
+	default n
+	depends on IMX9_USDHC2
+	---help---
+		If the board defines PIN_USDHC2_CD the CD_B input to the USDHC it is
+		assumed to be active low. Selecting IMX9_USDHC_INVERT_CD will make it
+		active high.
+
+		If the board defines PIN_USDHC2_CD_GPIO it is assumed to be active low.
+		Selecting IMX9_USDHC2_INVERT_CD will make it active high.
+
+endmenu # USDHC Configuration
+
+endmenu # USDHC
+
 menu "LPUART"
 
 config IMX9_LPUART

arch/arm64/src/imx9/Make.defs

@@ -48,7 +48,7 @@ ifeq ($(CONFIG_IMX9_LPI2C),y)
   CHIP_CSRCS += imx9_lpi2c.c
 endif
 
-ifeq ($(CONFIG_IMX9_LPSPI), y)
+ifeq ($(CONFIG_IMX9_LPSPI),y)
   CHIP_CSRCS += imx9_lpspi.c
 endif
 
@@ -61,5 +61,9 @@ ifeq ($(CONFIG_IMX9_DMA_ALLOC),y)
 endif
 
 ifeq ($(CONFIG_IMX9_ENET),y)
-CHIP_CSRCS += imx9_enet.c
+  CHIP_CSRCS += imx9_enet.c
+endif
+
+ifeq ($(CONFIG_IMX9_USDHC),y)
+  CHIP_CSRCS += imx9_usdhc.c
 endif

arch/arm64/src/imx9/imx9_dma_alloc.c

@@ -142,4 +142,16 @@ void imx9_dma_free(void *memory, size_t size)
   gran_free(dma_allocator, memory, size);
 }
 
+#ifdef CONFIG_FAT_DMAMEMORY
+FAR void *fat_dma_alloc(size_t size)
+{
+  return imx9_dma_alloc(size);
+}
+
+void fat_dma_free(FAR void *memory, size_t size)
+{
+  imx9_dma_free(memory, size);
+}
+#endif
+
 #endif /* CONFIG_IMX9_DMA_ALLOC */

arch/arm64/src/imx9/imx9_dma_alloc.h

@@ -80,9 +80,4 @@ void *imx9_dma_alloc(size_t size);
 
 void imx9_dma_free(void *memory, size_t size);
 
-#ifdef CONFIG_FAT_DMAMEMORY
-#  define fat_dma_alloc(s)  imx9_dma_alloc(s)
-#  define fat_dma_free(m,s) imx9_dma_free(m,s)
-#endif
-
 #endif /* __ARCH_ARM64_SRC_IMX9_IMX9_DMA_ALLOC_H */