Changeset a39a6a2 in rtems-libbsd

Timestamp:

11/21/22 22:28:09 (2 months ago)

Author:

Aaron Nyholm <aaron.nyholm@…>

Branches:

6-freebsd-12

Children:

84d15c2

Parents:

93b259b

git-author:

Aaron Nyholm <aaron.nyholm@…> (11/21/22 22:28:09)

git-committer:

Chris Johns <chrisj@…> (11/22/22 02:53:27)

Message:

rtemsbsd/versal: Add SDHCI Driver support

Tested on VCK190

Closes #4762

Location:

rtemsbsd/include

Files:

• bsp/nexus-devices.h (modified) (1 diff)
• machine/rtems-bsd-nexus-bus.h (modified) (2 diffs)

rtemsbsd/include/bsp/nexus-devices.h

@@ -131 +131 @@
 RTEMS_BSD_DRIVER_XILINX_VERSAL_CGEM1(VERSAL_IRQ_ETHERNET_1);
 RTEMS_BSD_DRIVER_UKPHY;
+
+RTEMS_BSD_DRIVER_XILINX_VERSAL_SDHCI0;
+RTEMS_BSD_DRIVER_XILINX_VERSAL_SDHCI1;
+RTEMS_BSD_DRIVER_MMC;
 
 #elif defined(LIBBSP_ARM_ATSAM_BSP_H)

rtemsbsd/include/machine/rtems-bsd-nexus-bus.h

@@ -161 +161 @@
 
 /*
- * Xilinx ZynqMP Arasan SDIO Driver.
- */
-#if !defined(RTEMS_BSD_DRIVER_XILINX_ZYNQMP_SDHCI)
-  #define RTEMS_BSD_DRIVER_XILINX_ZYNQMP_SDHCI(_num, _base, _irq)                     \
+ * Xilinx Arasan SDIO Driver.
+ */
+#if !defined(RTEMS_BSD_DRIVER_ARASAN_SDHCI)
+  #define RTEMS_BSD_DRIVER_ARASAN_SDHCI(_num, _base, _irq)                     \
     static const rtems_bsd_device_resource arasan_sdhci ## _num ## _res[] = {       \
       {                                                                             \
@@ -179 +179 @@
                                   RTEMS_ARRAY_SIZE(arasan_sdhci ## _num ## _res),      \
                                   &arasan_sdhci ## _num ## _res[0])
-#endif /* RTEMS_BSD_DRIVER_XILINX_ZYNQMP_SDHCI */
+#endif /* RTEMS_BSD_DRIVER_ARASAN_SDHCI */
 #if !defined(RTEMS_BSD_DRIVER_XILINX_ZYNQMP_SDHCI0)
   #define RTEMS_BSD_DRIVER_XILINX_ZYNQMP_SDHCI0                \
-    RTEMS_BSD_DRIVER_XILINX_ZYNQMP_SDHCI(0, 0xFF160000, 80)
+    RTEMS_BSD_DRIVER_ARASAN_SDHCI(0, 0xFF160000, 80)
 #endif /* RTEMS_BSD_DRIVER_XILINX_ZYNQMP_SDHCI0 */
 #if !defined(RTEMS_BSD_DRIVER_XILINX_ZYNQMP_SDHCI1)
   #define RTEMS_BSD_DRIVER_XILINX_ZYNQMP_SDHCI1                \
-    RTEMS_BSD_DRIVER_XILINX_ZYNQMP_SDHCI(1, 0xFF170000, 81)
+    RTEMS_BSD_DRIVER_ARASAN_SDHCI(1, 0xFF170000, 81)
 #endif /* RTEMS_BSD_DRIVER_XILINX_ZYNQMP_SDHCI1 */
 
-/*
- * Xilinx Zynq Arasan SDIO Driver.
- */
-#if !defined(RTEMS_BSD_DRIVER_XILINX_ZYNQ_SDHCI)
-  #define RTEMS_BSD_DRIVER_XILINX_ZYNQ_SDHCI(_num, _base, _irq)                     \
-    static const rtems_bsd_device_resource arasan_sdhci ## _num ## _res[] = {       \
-      {                                                                             \
-        .type = RTEMS_BSD_RES_MEMORY,                                               \
-        .start_request = 0,                                                         \
-        .start_actual = (_base)                                                     \
-      }, {                                                                          \
-        .type = RTEMS_BSD_RES_IRQ,                                                  \
-        .start_request = 0,                                                         \
-        .start_actual = (_irq)                                                      \
-      }                                                                             \
-    };                                                                              \
-    RTEMS_BSD_DEFINE_NEXUS_DEVICE(arasan_sdhci, _num,                               \
-                                  RTEMS_ARRAY_SIZE(arasan_sdhci ## _num ## _res),      \
-                                  &arasan_sdhci ## _num ## _res[0])
-#endif /* RTEMS_BSD_DRIVER_XILINX_ZYNQ_SDHCI */
 #if !defined(RTEMS_BSD_DRIVER_XILINX_ZYNQ_SDHCI0)
   #define RTEMS_BSD_DRIVER_XILINX_ZYNQ_SDHCI0                \
-    RTEMS_BSD_DRIVER_XILINX_ZYNQ_SDHCI(0, 0xE0100000, 56)
+    RTEMS_BSD_DRIVER_ARASAN_SDHCI(0, 0xE0100000, 56)
 #endif /* RTEMS_BSD_DRIVER_XILINX_ZYNQ_SDHCI0 */
 #if !defined(RTEMS_BSD_DRIVER_XILINX_ZYNQ_SDHCI1)
   #define RTEMS_BSD_DRIVER_XILINX_ZYNQ_SDHCI1                \
-    RTEMS_BSD_DRIVER_XILINX_ZYNQ_SDHCI(1, 0xE0101000, 79)
+    RTEMS_BSD_DRIVER_ARASAN_SDHCI(1, 0xE0101000, 79)
 #endif /* RTEMS_BSD_DRIVER_XILINX_ZYNQ_SDHCI1 */
+
+#if !defined(RTEMS_BSD_DRIVER_XILINX_VERSAL_SDHCI0)
+  #define RTEMS_BSD_DRIVER_XILINX_VERSAL_SDHCI0                \
+    RTEMS_BSD_DRIVER_ARASAN_SDHCI(0, 0xF1040000, 158)
+#endif /* RTEMS_BSD_DRIVER_XILINX_VERSAL_SDHCI0 */
+#if !defined(RTEMS_BSD_DRIVER_XILINX_VERSAL_SDHCI1)
+  #define RTEMS_BSD_DRIVER_XILINX_VERSAL_SDHCI1                \
+    RTEMS_BSD_DRIVER_ARASAN_SDHCI(1, 0xF1050000, 160)
+#endif /* RTEMS_BSD_DRIVER_XILINX_VERSAL_SDHCI1 */
 
 /*