allsoc: ospi: fix pointer usage in driver

Shivank Sharma · Shivank Sharma · commit 05d3aebbc8d6 · 2025-10-16T15:59:06.000+05:30
- fix void pointer usage

- ospi dma integration cleanup

Fixes: MCUSDK-14635

Signed-off-by: Shivank Sharma &lt;s-sharma6@ti.com&gt;
diff --git a/examples/drivers/ospi/ospi_flash_dma_lld/ospi_flash_dma_lld.c b/examples/drivers/ospi/ospi_flash_dma_lld/ospi_flash_dma_lld.c
@@ -75,7 +75,7 @@ void ospi_flash_dma_lld(void *args)
 
 #if defined (SOC_AM64X)
 /* The OSPI Controller will be configured in 8s-8s-8s mode */
-    OSPI_setProtocol(gOspiHandle,525320);
+    OSPI_lld_setProtocol(gOspiHandle,525320);
 #endif
 
     OSPI_lld_configResetPin(gOspiHandle,2);
diff --git a/source/board/flash/ospi/flash_nor_ospi.c b/source/board/flash/ospi/flash_nor_ospi.c
@@ -299,7 +299,7 @@ static int32_t Flash_norOspiSet4ByteAddrMode(Flash_Config *config)
     return status;
 }
 
-static int32_t Flash_norOspiSetAddressBytes(Flash_Config *config, void *ospiHandle)
+static int32_t Flash_norOspiSetAddressBytes(Flash_Config *config, OSPI_Handle ospiHandle)
 {
     int32_t status = SystemP_SUCCESS;
     Flash_DevConfig *devCfg = config->devConfig;
@@ -504,7 +504,7 @@ static int32_t Flash_setOeBit(Flash_Config *config, uint8_t oeType)
     return status;
 }
 
-static int32_t Flash_norOspiSetModeDummy(Flash_Config *config, void *ospiHandle)
+static int32_t Flash_norOspiSetModeDummy(Flash_Config *config, OSPI_Handle ospiHandle)
 {
     int32_t status = SystemP_SUCCESS;
     Flash_DevConfig *devCfg = config->devConfig;
@@ -546,7 +546,7 @@ static int32_t Flash_norOspiSetModeDummy(Flash_Config *config, void *ospiHandle)
     return status;
 }
 
-static int32_t Flash_norOspiSetDTR(Flash_Config *config, void *ospiHandle)
+static int32_t Flash_norOspiSetDTR(Flash_Config *config, OSPI_Handle ospiHandle)
 {
     int32_t status = SystemP_SUCCESS;
 
@@ -727,11 +727,11 @@ static int32_t Flash_set888mode(Flash_Config *config, uint8_t seq)
     return status;
 }
 
-static int32_t Flash_norOspiSetProtocol(Flash_Config *config, void *ospiHandle, Flash_Params *params)
+static int32_t Flash_norOspiSetProtocol(Flash_Config *config, OSPI_Handle ospiHandle, Flash_Params *params)
 {
     int32_t status = SystemP_SUCCESS;
 
-    if((config == NULL) || (NULL == ospiHandle))
+    if((config == NULL) || (ospiHandle == NULL))
     {
         status = SystemP_FAILURE;
     }
diff --git a/source/drivers/.project/project_am243x.js b/source/drivers/.project/project_am243x.js
@@ -83,7 +83,6 @@ const files_r5f = {
         "ospi_v0_lld.c",
         "ospi_phy_dqs_lld.c",
         "ospi_nor_flash_lld.c",
-        "ospi_lld_dma.c",
         "ospi_udma_lld.c",
         "ospi_phy_tuning.c",
         "pcie.c",
diff --git a/source/drivers/.project/project_am261x.js b/source/drivers/.project/project_am261x.js
@@ -69,7 +69,6 @@ const files_r5f = {
         "ospi_v0_lld.c",
         "ospi_phy_am26x_lld.c",
         "ospi_nor_flash_lld.c",
-        "ospi_lld_dma.c",
 		"ospi_edma_lld.c",
 		"pinmux.c",
 		"pmu.c",
diff --git a/source/drivers/.project/project_am263px.js b/source/drivers/.project/project_am263px.js
@@ -68,7 +68,6 @@ const files_r5f = {
         "ospi_v0_lld.c",
         "ospi_phy_am26x_lld.c",
         "ospi_nor_flash_lld.c",
-        "ospi_lld_dma.c",
 		"ospi_edma_lld.c",
 		"pinmux.c",
 		"pmu.c",
diff --git a/source/drivers/.project/project_am64x.js b/source/drivers/.project/project_am64x.js
@@ -83,7 +83,6 @@ const files_r5f = {
         "ospi_v0_lld.c",
         "ospi_phy_dqs_lld.c",
         "ospi_nor_flash_lld.c",
-        "ospi_lld_dma.c",
         "ospi_udma_lld.c",
         "ospi_phy_tuning.c",
         "pcie.c",
@@ -226,7 +225,7 @@ const files_a53 = {
         "ospi_v0_lld.c",
         "ospi_phy_dqs_lld.c",
         "ospi_nor_flash_lld.c",
-        "ospi_lld_dma.c",
+        //"ospi_lld_dma.c",
         "ospi_udma_lld.c",
         "ospi_phy_tuning.c",
         "pinmux.c",
diff --git a/source/drivers/.project/project_am65x.js b/source/drivers/.project/project_am65x.js
@@ -46,7 +46,6 @@ const files_r5f = {
         "ospi_v0_lld.c",
         "ospi_phy_dqs_lld.c",
         "ospi_nor_flash_lld.c",
-        "ospi_lld_dma.c",
         "ospi_udma_lld.c",
         "pinmux.c",
         "pcie.c",
diff --git a/source/drivers/hw_include/am261x/soc_config.h b/source/drivers/hw_include/am261x/soc_config.h
@@ -95,6 +95,7 @@ extern "C"
 /* Driver DMA integration */
 #define DMA_VERSION_MCSPI_EDMA
 #define DMA_VERSION_UART_EDMA
+#define DMA_VERSION_OSPI_EDMA
 #define DMA_VERSION_GPMC_EDMA
 #define DMA_VERSION_CANFD_EDMA
 
diff --git a/source/drivers/hw_include/am263px/soc_config.h b/source/drivers/hw_include/am263px/soc_config.h
@@ -93,6 +93,7 @@ extern "C"
 
 /* Driver DMA integration */
 #define DMA_VERSION_MCSPI_EDMA
+#define DMA_VERSION_OSPI_EDMA
 #define DMA_VERSION_UART_EDMA
 #define DMA_VERSION_CANFD_EDMA
 
diff --git a/source/drivers/hw_include/am64x_am243x/soc_config.h b/source/drivers/hw_include/am64x_am243x/soc_config.h
@@ -110,6 +110,7 @@ extern "C"
 /* Driver DMA integration */
 #define DMA_VERSION_MCSPI_UDMA
 #define DMA_VERSION_UART_UDMA
+#define DMA_VERSION_OSPI_UDMA
 #define DMA_VERSION_GPMC_UDMA
 #define DMA_VERSION_CANFD_UDMA
 
diff --git a/source/drivers/makefile.am243x.r5f.gcc-armv7.freertos b/source/drivers/makefile.am243x.r5f.gcc-armv7.freertos
@@ -93,7 +93,6 @@ FILES_common := \
     ospi_v0_lld.c \
     ospi_phy_dqs_lld.c \
     ospi_nor_flash_lld.c \
-    ospi_lld_dma.c \
     ospi_udma_lld.c \
     ospi_phy_tuning.c \
     pcie.c \
diff --git a/source/drivers/makefile.am243x.r5f.gcc-armv7.nortos b/source/drivers/makefile.am243x.r5f.gcc-armv7.nortos
@@ -93,7 +93,6 @@ FILES_common := \
     ospi_v0_lld.c \
     ospi_phy_dqs_lld.c \
     ospi_nor_flash_lld.c \
-    ospi_lld_dma.c \
     ospi_udma_lld.c \
     ospi_phy_tuning.c \
     pcie.c \
diff --git a/source/drivers/makefile.am243x.r5f.ti-arm-clang.freertos b/source/drivers/makefile.am243x.r5f.ti-arm-clang.freertos
@@ -93,7 +93,6 @@ FILES_common := \
     ospi_v0_lld.c \
     ospi_phy_dqs_lld.c \
     ospi_nor_flash_lld.c \
-    ospi_lld_dma.c \
     ospi_udma_lld.c \
     ospi_phy_tuning.c \
     pcie.c \
diff --git a/source/drivers/makefile.am243x.r5f.ti-arm-clang.nortos b/source/drivers/makefile.am243x.r5f.ti-arm-clang.nortos
@@ -93,7 +93,6 @@ FILES_common := \
     ospi_v0_lld.c \
     ospi_phy_dqs_lld.c \
     ospi_nor_flash_lld.c \
-    ospi_lld_dma.c \
     ospi_udma_lld.c \
     ospi_phy_tuning.c \
     pcie.c \
diff --git a/source/drivers/makefile.am261x.r5f.ti-arm-clang.freertos b/source/drivers/makefile.am261x.r5f.ti-arm-clang.freertos
@@ -77,7 +77,6 @@ FILES_common := \
     ospi_v0_lld.c \
     ospi_phy_am26x_lld.c \
     ospi_nor_flash_lld.c \
-    ospi_lld_dma.c \
     ospi_edma_lld.c \
     pinmux.c \
     pmu.c \
diff --git a/source/drivers/makefile.am261x.r5f.ti-arm-clang.nortos b/source/drivers/makefile.am261x.r5f.ti-arm-clang.nortos
@@ -77,7 +77,6 @@ FILES_common := \
     ospi_v0_lld.c \
     ospi_phy_am26x_lld.c \
     ospi_nor_flash_lld.c \
-    ospi_lld_dma.c \
     ospi_edma_lld.c \
     pinmux.c \
     pmu.c \
diff --git a/source/drivers/makefile.am263px.r5f.ti-arm-clang.freertos b/source/drivers/makefile.am263px.r5f.ti-arm-clang.freertos
@@ -77,7 +77,6 @@ FILES_common := \
     ospi_v0_lld.c \
     ospi_phy_am26x_lld.c \
     ospi_nor_flash_lld.c \
-    ospi_lld_dma.c \
     ospi_edma_lld.c \
     pinmux.c \
     pmu.c \
diff --git a/source/drivers/makefile.am263px.r5f.ti-arm-clang.freertos_mpu b/source/drivers/makefile.am263px.r5f.ti-arm-clang.freertos_mpu
@@ -77,7 +77,6 @@ FILES_common := \
     ospi_v0_lld.c \
     ospi_phy_am26x_lld.c \
     ospi_nor_flash_lld.c \
-    ospi_lld_dma.c \
     ospi_edma_lld.c \
     pinmux.c \
     pmu.c \
diff --git a/source/drivers/makefile.am263px.r5f.ti-arm-clang.nortos b/source/drivers/makefile.am263px.r5f.ti-arm-clang.nortos
@@ -77,7 +77,6 @@ FILES_common := \
     ospi_v0_lld.c \
     ospi_phy_am26x_lld.c \
     ospi_nor_flash_lld.c \
-    ospi_lld_dma.c \
     ospi_edma_lld.c \
     pinmux.c \
     pmu.c \
diff --git a/source/drivers/makefile.am64x.a53.gcc-aarch64.freertos b/source/drivers/makefile.am64x.a53.gcc-aarch64.freertos
@@ -56,7 +56,6 @@ FILES_common := \
     ospi_v0_lld.c \
     ospi_phy_dqs_lld.c \
     ospi_nor_flash_lld.c \
-    ospi_lld_dma.c \
     ospi_udma_lld.c \
     ospi_phy_tuning.c \
     pinmux.c \
diff --git a/source/drivers/makefile.am64x.a53.gcc-aarch64.freertos-smp b/source/drivers/makefile.am64x.a53.gcc-aarch64.freertos-smp
@@ -56,7 +56,6 @@ FILES_common := \
     ospi_v0_lld.c \
     ospi_phy_dqs_lld.c \
     ospi_nor_flash_lld.c \
-    ospi_lld_dma.c \
     ospi_udma_lld.c \
     ospi_phy_tuning.c \
     pinmux.c \
diff --git a/source/drivers/makefile.am64x.a53.gcc-aarch64.nortos b/source/drivers/makefile.am64x.a53.gcc-aarch64.nortos
@@ -56,7 +56,6 @@ FILES_common := \
     ospi_v0_lld.c \
     ospi_phy_dqs_lld.c \
     ospi_nor_flash_lld.c \
-    ospi_lld_dma.c \
     ospi_udma_lld.c \
     ospi_phy_tuning.c \
     pinmux.c \
diff --git a/source/drivers/makefile.am64x.r5f.gcc-armv7.freertos b/source/drivers/makefile.am64x.r5f.gcc-armv7.freertos
@@ -93,7 +93,6 @@ FILES_common := \
     ospi_v0_lld.c \
     ospi_phy_dqs_lld.c \
     ospi_nor_flash_lld.c \
-    ospi_lld_dma.c \
     ospi_udma_lld.c \
     ospi_phy_tuning.c \
     pcie.c \
diff --git a/source/drivers/makefile.am64x.r5f.gcc-armv7.nortos b/source/drivers/makefile.am64x.r5f.gcc-armv7.nortos
@@ -93,7 +93,6 @@ FILES_common := \
     ospi_v0_lld.c \
     ospi_phy_dqs_lld.c \
     ospi_nor_flash_lld.c \
-    ospi_lld_dma.c \
     ospi_udma_lld.c \
     ospi_phy_tuning.c \
     pcie.c \
diff --git a/source/drivers/makefile.am64x.r5f.ti-arm-clang.freertos b/source/drivers/makefile.am64x.r5f.ti-arm-clang.freertos
@@ -93,7 +93,6 @@ FILES_common := \
     ospi_v0_lld.c \
     ospi_phy_dqs_lld.c \
     ospi_nor_flash_lld.c \
-    ospi_lld_dma.c \
     ospi_udma_lld.c \
     ospi_phy_tuning.c \
     pcie.c \
diff --git a/source/drivers/makefile.am64x.r5f.ti-arm-clang.nortos b/source/drivers/makefile.am64x.r5f.ti-arm-clang.nortos
@@ -93,7 +93,6 @@ FILES_common := \
     ospi_v0_lld.c \
     ospi_phy_dqs_lld.c \
     ospi_nor_flash_lld.c \
-    ospi_lld_dma.c \
     ospi_udma_lld.c \
     ospi_phy_tuning.c \
     pcie.c \
diff --git a/source/drivers/ospi/v0/lld/dma/edma/ospi_edma_lld.c b/source/drivers/ospi/v0/lld/dma/edma/ospi_edma_lld.c
@@ -51,14 +51,6 @@
 static void OSPI_edmaIsrFxn(Edma_IntrHandle intrHandle, void *args);
 void OSPI_EdmaParams_init(void * pvEdmaParams);
 
-OSPI_DmaFxns gOspiDmaEdmaFxns =
-{
-    .dmaOpenFxn = OSPI_edmaInit,
-    .dmaCloseFxn = OSPI_edmaDeInit,
-    .dmaCopyFxn = OSPI_edmaCopy,
-    .dmaItrStatusFxn = OSPI_edmaItrStatus,
-};
-
 void OSPI_EdmaParams_init(void * pvEdmaParams)
 {
     if( pvEdmaParams != NULL)
@@ -75,14 +67,13 @@ void OSPI_EdmaParams_init(void * pvEdmaParams)
     }
 }
 
-int32_t OSPI_edmaInit(OSPI_DmaHandle ospiDmaArgs)
+int32_t OSPI_dmaOpen(OSPILLD_Handle hOspi)
 {
 
     uint32_t baseAddr, regionId, dmaCh, tcc, param,dmaChainCh, chainParam;
     int32_t status = SystemP_FAILURE;
     uint32_t isEdmaInterruptEnabled;
 
-    OSPILLD_Handle hOspi = (OSPILLD_Handle)ospiDmaArgs;
     OspiDma_EdmaArgs *edmaParams = (OspiDma_EdmaArgs*)hOspi->hOspiInit->ospiDmaChConfig;
     Edma_IntrObject *edmaIntrObject = &(edmaParams->edmaIntrObj);
     EDMA_Handle ospiEdmaHandle = EDMA_getHandle(edmaParams->edmaInst);
@@ -182,13 +173,12 @@ int32_t OSPI_edmaInit(OSPI_DmaHandle ospiDmaArgs)
     return status;
 }
 
-int32_t OSPI_edmaDeInit(OSPI_DmaHandle ospiDmaArgs)
+int32_t OSPI_dmaClose(OSPILLD_Handle hOspi)
 {
     int32_t             status = SystemP_SUCCESS;
     int32_t             retVal;
     uint32_t            baseAddr, regionId, dmaCh, tcc, param,dmaChainCh, chainParam;
 
-    OSPILLD_Handle hOspi = (OSPILLD_Handle)ospiDmaArgs;
     OspiDma_EdmaArgs *edmaParams = (OspiDma_EdmaArgs*)hOspi->hOspiInit->ospiDmaChConfig;
     
     EDMA_Handle ospiEdmaHandle = EDMA_getHandle(edmaParams->edmaInst);
@@ -222,13 +212,12 @@ int32_t OSPI_edmaDeInit(OSPI_DmaHandle ospiDmaArgs)
     return status;
 }
 
-int32_t OSPI_edmaCopy(OSPI_DmaHandle ospiDmaArgs, void* dst, void* src, uint32_t length,uint32_t timeout)
+int32_t OSPI_dmaCopy(OSPILLD_Handle hOspi, void* dst, void* src, uint32_t length,uint32_t timeout)
 {
     int32_t         status = SystemP_SUCCESS;
     uint32_t        baseAddr, regionId, dmaCh, tcc, param,dmaChainCh, chainParam, chainOptions;
     uint32_t        edmaStatus;
     uint32_t        startTicks, elapsedTicks = 0;
-    OSPILLD_Handle hOspi = (OSPILLD_Handle)ospiDmaArgs;
     OspiDma_EdmaArgs *edmaParams = (OspiDma_EdmaArgs*)hOspi->hOspiInit->ospiDmaChConfig;
     uint32_t transTimeout = hOspi->Clock_usecToTicks(timeout);
 
@@ -369,11 +358,8 @@ static void OSPI_edmaIsrFxn(Edma_IntrHandle intrHandle, void *args)
     OSPI_lld_readCompleteCallback((OSPILLD_Handle)args);
 }
 
-int32_t OSPI_edmaItrStatus(OSPI_DmaHandle ospiDmaHandle)
-{
-
-    OSPILLD_Handle hOspi = (OSPILLD_Handle)ospiDmaHandle;
-    
+int32_t OSPI_isDmaInterruptEnabled(OSPILLD_Handle hOspi)
+{    
     OspiDma_EdmaArgs *edmaParams = (OspiDma_EdmaArgs*)hOspi->hOspiInit->ospiDmaChConfig;
 
     return (int32_t)edmaParams->isIntEnabled;
diff --git a/source/drivers/ospi/v0/lld/dma/edma/ospi_edma_lld.h b/source/drivers/ospi/v0/lld/dma/edma/ospi_edma_lld.h
diff --git a/source/drivers/ospi/v0/lld/dma/ospi_lld_dma.c b/source/drivers/ospi/v0/lld/dma/ospi_lld_dma.c
diff --git a/source/drivers/ospi/v0/lld/dma/ospi_lld_dma.h b/source/drivers/ospi/v0/lld/dma/ospi_lld_dma.h
diff --git a/source/drivers/ospi/v0/lld/dma/udma/ospi_udma_lld.c b/source/drivers/ospi/v0/lld/dma/udma/ospi_udma_lld.c
diff --git a/source/drivers/ospi/v0/lld/dma/udma/ospi_udma_lld.h b/source/drivers/ospi/v0/lld/dma/udma/ospi_udma_lld.h
diff --git a/source/drivers/ospi/v0/lld/ospi_lld.h b/source/drivers/ospi/v0/lld/ospi_lld.h
diff --git a/source/drivers/ospi/v0/lld/ospi_phy_am26x_lld.c b/source/drivers/ospi/v0/lld/ospi_phy_am26x_lld.c
diff --git a/source/drivers/ospi/v0/lld/ospi_phy_dqs_lld.c b/source/drivers/ospi/v0/lld/ospi_phy_dqs_lld.c
diff --git a/source/drivers/ospi/v0/lld/ospi_v0_lld.c b/source/drivers/ospi/v0/lld/ospi_v0_lld.c
diff --git a/source/drivers/ospi/v0/ospi.h b/source/drivers/ospi/v0/ospi.h
diff --git a/source/drivers/ospi/v0/ospi_v0.c b/source/drivers/ospi/v0/ospi_v0.c
diff --git a/tools/flasher/jtag_uniflash/am243x-evm/r5fss0-0_nortos/example.syscfg b/tools/flasher/jtag_uniflash/am243x-evm/r5fss0-0_nortos/example.syscfg

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ static int32_t Flash_norOspiSet4ByteAddrMode(Flash_Config *config)`
`299`	`299`	`return status;`
`300`	`300`	`}`
`301`	`301`
`302`		`-static int32_t Flash_norOspiSetAddressBytes(Flash_Config config, void ospiHandle)`
	`302`	`+static int32_t Flash_norOspiSetAddressBytes(Flash_Config *config, OSPI_Handle ospiHandle)`
`303`	`303`	`{`
`304`	`304`	`int32_t status = SystemP_SUCCESS;`
`305`	`305`	`Flash_DevConfig *devCfg = config->devConfig;`
`@@ -504,7 +504,7 @@ static int32_t Flash_setOeBit(Flash_Config *config, uint8_t oeType)`
`504`	`504`	`return status;`
`505`	`505`	`}`
`506`	`506`
`507`		`-static int32_t Flash_norOspiSetModeDummy(Flash_Config config, void ospiHandle)`
	`507`	`+static int32_t Flash_norOspiSetModeDummy(Flash_Config *config, OSPI_Handle ospiHandle)`
`508`	`508`	`{`
`509`	`509`	`int32_t status = SystemP_SUCCESS;`
`510`	`510`	`Flash_DevConfig *devCfg = config->devConfig;`
`@@ -546,7 +546,7 @@ static int32_t Flash_norOspiSetModeDummy(Flash_Config config, void ospiHandle)`
`546`	`546`	`return status;`
`547`	`547`	`}`
`548`	`548`
`549`		`-static int32_t Flash_norOspiSetDTR(Flash_Config config, void ospiHandle)`
	`549`	`+static int32_t Flash_norOspiSetDTR(Flash_Config *config, OSPI_Handle ospiHandle)`
`550`	`550`	`{`
`551`	`551`	`int32_t status = SystemP_SUCCESS;`
`552`	`552`
`@@ -727,11 +727,11 @@ static int32_t Flash_set888mode(Flash_Config *config, uint8_t seq)`
`727`	`727`	`return status;`
`728`	`728`	`}`
`729`	`729`
`730`		`-static int32_t Flash_norOspiSetProtocol(Flash_Config config, void ospiHandle, Flash_Params *params)`
	`730`	`+static int32_t Flash_norOspiSetProtocol(Flash_Config config, OSPI_Handle ospiHandle, Flash_Params params)`
`731`	`731`	`{`
`732`	`732`	`int32_t status = SystemP_SUCCESS;`
`733`	`733`
`734`		`- if((config == NULL) \|\| (NULL == ospiHandle))`
	`734`	`+ if((config == NULL) \|\| (ospiHandle == NULL))`
`735`	`735`	`{`
`736`	`736`	`status = SystemP_FAILURE;`
`737`	`737`	`}`