hal_nxp: Replace the dmamux driver with an older version

The latest version of the dmamux driver causes build
issues on the s32 platform, using an older version for now,
and have contacted the SDK driver owner to resolve the issue.

Signed-off-by: Zhaoxiang Jin <[email protected]>

Author: ZhaoxiangJin

mcux/mcux-sdk-ng/drivers/dmamux/CMakeLists.txt

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 if(CONFIG_MCUX_COMPONENT_driver.dmamux)
-    mcux_component_version(2.1.2)
+    mcux_component_version(2.1.0)
 
     mcux_add_source(SOURCES fsl_dmamux.h fsl_dmamux.c)
 

mcux/mcux-sdk-ng/drivers/dmamux/fsl_dmamux.c

@@ -21,28 +21,31 @@
  * Prototypes
  ******************************************************************************/
 
+#if !(defined(FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL) && FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL)
 /*!
  * @brief Get instance number for DMAMUX.
  *
  * @param base DMAMUX peripheral base address.
  */
 static uint32_t DMAMUX_GetInstance(DMAMUX_Type *base);
+#endif
 
 /*******************************************************************************
  * Variables
  ******************************************************************************/
 
+#if !(defined(FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL) && FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL)
 /*! @brief Array to map DMAMUX instance number to base pointer. */
 static DMAMUX_Type *const s_dmamuxBases[] = DMAMUX_BASE_PTRS;
 
-#if !(defined(FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL) && FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL)
 /*! @brief Array to map DMAMUX instance number to clock name. */
 static const clock_ip_name_t s_dmamuxClockName[] = DMAMUX_CLOCKS;
 #endif /* FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL */
 
 /*******************************************************************************
  * Code
  ******************************************************************************/
+#if !(defined(FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL) && FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL)
 static uint32_t DMAMUX_GetInstance(DMAMUX_Type *base)
 {
     uint32_t instance;
@@ -60,6 +63,7 @@ static uint32_t DMAMUX_GetInstance(DMAMUX_Type *base)
 
     return instance;
 }
+#endif
 
 /*!
  * brief Initializes the DMAMUX peripheral.

mcux/mcux-sdk-ng/drivers/dmamux/fsl_dmamux.h

@@ -22,20 +22,10 @@
 
 /*! @name Driver version */
 /*! @{ */
-/*! @brief DMAMUX driver version 2.1.1. */
-#define FSL_DMAMUX_DRIVER_VERSION (MAKE_VERSION(2, 1, 2))
+/*! @brief DMAMUX driver version 2.1.0. */
+#define FSL_DMAMUX_DRIVER_VERSION (MAKE_VERSION(2, 1, 0))
 /*! @} */
 
-#if (defined(FSL_FEATURE_DMAMUX_CHANNEL_NEEDS_ENDIAN_CONVERT) && FSL_FEATURE_DMAMUX_CHANNEL_NEEDS_ENDIAN_CONVERT)
-/*!@brief Macro used for dmamux channel endian convert. */
-#define DMAMUX_CHANNEL_ENDIAN_CONVERTn(channel) (channel ^ 3U)
-#endif
-
-#if (defined(FSL_FEATURE_EDMA_MODULE_CHANNEL) && \
-     (FSL_FEATURE_EDMA_MODULE_CHANNEL != FSL_FEATURE_DMAMUX_MODULE_CHANNEL))
-/*!@brief Macro used for dmamux channel number canculate. */
-#define FSL_DMAMUX_CHANNEL_NUM(channel) ((channel) %  FSL_FEATURE_DMAMUX_MODULE_CHANNEL)
-#endif
 /*******************************************************************************
  * API
  ******************************************************************************/
@@ -84,16 +74,7 @@ void DMAMUX_Deinit(DMAMUX_Type *base);
  */
 static inline void DMAMUX_EnableChannel(DMAMUX_Type *base, uint32_t channel)
 {
-#if (defined(FSL_FEATURE_EDMA_MODULE_CHANNEL) && \
-     (FSL_FEATURE_EDMA_MODULE_CHANNEL != FSL_FEATURE_DMAMUX_MODULE_CHANNEL))
-    channel = FSL_DMAMUX_CHANNEL_NUM(channel);
-#endif
-
-assert(channel < (uint32_t)FSL_FEATURE_DMAMUX_MODULE_CHANNEL);
-
-#if (defined(FSL_FEATURE_DMAMUX_CHANNEL_NEEDS_ENDIAN_CONVERT) && FSL_FEATURE_DMAMUX_CHANNEL_NEEDS_ENDIAN_CONVERT)
-    channel = DMAMUX_CHANNEL_ENDIAN_CONVERTn(channel);
-#endif
+    assert(channel < (uint32_t)FSL_FEATURE_DMAMUX_MODULE_CHANNEL);
 
     base->CHCFG[channel] |= DMAMUX_CHCFG_ENBL_MASK;
 }
@@ -109,17 +90,7 @@ assert(channel < (uint32_t)FSL_FEATURE_DMAMUX_MODULE_CHANNEL);
  */
 static inline void DMAMUX_DisableChannel(DMAMUX_Type *base, uint32_t channel)
 {
-
-#if (defined(FSL_FEATURE_EDMA_MODULE_CHANNEL) && \
-     (FSL_FEATURE_EDMA_MODULE_CHANNEL != FSL_FEATURE_DMAMUX_MODULE_CHANNEL))
-    channel = FSL_DMAMUX_CHANNEL_NUM(channel);
-#endif
-
-assert(channel < (uint32_t)FSL_FEATURE_DMAMUX_MODULE_CHANNEL);
-
-#if (defined(FSL_FEATURE_DMAMUX_CHANNEL_NEEDS_ENDIAN_CONVERT) && FSL_FEATURE_DMAMUX_CHANNEL_NEEDS_ENDIAN_CONVERT)
-    channel = DMAMUX_CHANNEL_ENDIAN_CONVERTn(channel);
-#endif
+    assert(channel < (uint32_t)FSL_FEATURE_DMAMUX_MODULE_CHANNEL);
 
 #if defined FSL_FEATURE_DMAMUX_CHCFG_REGISTER_WIDTH && (FSL_FEATURE_DMAMUX_CHCFG_REGISTER_WIDTH == 32U)
     base->CHCFG[channel] &= ~DMAMUX_CHCFG_ENBL_MASK;
@@ -138,17 +109,7 @@ assert(channel < (uint32_t)FSL_FEATURE_DMAMUX_MODULE_CHANNEL);
  */
 static inline void DMAMUX_SetSource(DMAMUX_Type *base, uint32_t channel, int32_t source)
 {
-
-#if (defined(FSL_FEATURE_EDMA_MODULE_CHANNEL) && \
-     (FSL_FEATURE_EDMA_MODULE_CHANNEL != FSL_FEATURE_DMAMUX_MODULE_CHANNEL))
-    channel = FSL_DMAMUX_CHANNEL_NUM(channel);
-#endif
-
-assert(channel < (uint32_t)FSL_FEATURE_DMAMUX_MODULE_CHANNEL);
-
-#if (defined(FSL_FEATURE_DMAMUX_CHANNEL_NEEDS_ENDIAN_CONVERT) && FSL_FEATURE_DMAMUX_CHANNEL_NEEDS_ENDIAN_CONVERT)
-    channel = DMAMUX_CHANNEL_ENDIAN_CONVERTn(channel);
-#endif
+    assert(channel < (uint32_t)FSL_FEATURE_DMAMUX_MODULE_CHANNEL);
 
 #if defined FSL_FEATURE_DMAMUX_CHCFG_REGISTER_WIDTH && (FSL_FEATURE_DMAMUX_CHCFG_REGISTER_WIDTH == 32U)
     base->CHCFG[channel] = ((base->CHCFG[channel] & ~DMAMUX_CHCFG_SOURCE_MASK) | DMAMUX_CHCFG_SOURCE(source));
@@ -168,17 +129,7 @@ assert(channel < (uint32_t)FSL_FEATURE_DMAMUX_MODULE_CHANNEL);
  */
 static inline void DMAMUX_EnablePeriodTrigger(DMAMUX_Type *base, uint32_t channel)
 {
-
-#if (defined(FSL_FEATURE_EDMA_MODULE_CHANNEL) && \
-     (FSL_FEATURE_EDMA_MODULE_CHANNEL != FSL_FEATURE_DMAMUX_MODULE_CHANNEL))
-    channel = FSL_DMAMUX_CHANNEL_NUM(channel);
-#endif
-
-assert(channel < (uint32_t)FSL_FEATURE_DMAMUX_MODULE_CHANNEL);
-
-#if (defined(FSL_FEATURE_DMAMUX_CHANNEL_NEEDS_ENDIAN_CONVERT) && FSL_FEATURE_DMAMUX_CHANNEL_NEEDS_ENDIAN_CONVERT)
-    channel = DMAMUX_CHANNEL_ENDIAN_CONVERTn(channel);
-#endif
+    assert(channel < (uint32_t)FSL_FEATURE_DMAMUX_MODULE_CHANNEL);
 
     base->CHCFG[channel] |= DMAMUX_CHCFG_TRIG_MASK;
 }
@@ -193,17 +144,7 @@ assert(channel < (uint32_t)FSL_FEATURE_DMAMUX_MODULE_CHANNEL);
  */
 static inline void DMAMUX_DisablePeriodTrigger(DMAMUX_Type *base, uint32_t channel)
 {
-
-#if (defined(FSL_FEATURE_EDMA_MODULE_CHANNEL) && \
-     (FSL_FEATURE_EDMA_MODULE_CHANNEL != FSL_FEATURE_DMAMUX_MODULE_CHANNEL))
-    channel = FSL_DMAMUX_CHANNEL_NUM(channel);
-#endif
-
-assert(channel < (uint32_t)FSL_FEATURE_DMAMUX_MODULE_CHANNEL);
-
-#if (defined(FSL_FEATURE_DMAMUX_CHANNEL_NEEDS_ENDIAN_CONVERT) && FSL_FEATURE_DMAMUX_CHANNEL_NEEDS_ENDIAN_CONVERT)
-    channel = DMAMUX_CHANNEL_ENDIAN_CONVERTn(channel);
-#endif
+    assert(channel < (uint32_t)FSL_FEATURE_DMAMUX_MODULE_CHANNEL);
 
 #if defined FSL_FEATURE_DMAMUX_CHCFG_REGISTER_WIDTH && (FSL_FEATURE_DMAMUX_CHCFG_REGISTER_WIDTH == 32U)
     base->CHCFG[channel] &= ~DMAMUX_CHCFG_TRIG_MASK;
@@ -225,17 +166,7 @@ assert(channel < (uint32_t)FSL_FEATURE_DMAMUX_MODULE_CHANNEL);
  */
 static inline void DMAMUX_EnableAlwaysOn(DMAMUX_Type *base, uint32_t channel, bool enable)
 {
-
-#if (defined(FSL_FEATURE_EDMA_MODULE_CHANNEL) && \
-     (FSL_FEATURE_EDMA_MODULE_CHANNEL != FSL_FEATURE_DMAMUX_MODULE_CHANNEL))
-    channel = FSL_DMAMUX_CHANNEL_NUM(channel);
-#endif
-
-assert(channel < (uint32_t)FSL_FEATURE_DMAMUX_MODULE_CHANNEL);
-
-#if (defined(FSL_FEATURE_DMAMUX_CHANNEL_NEEDS_ENDIAN_CONVERT) && FSL_FEATURE_DMAMUX_CHANNEL_NEEDS_ENDIAN_CONVERT)
-    channel = DMAMUX_CHANNEL_ENDIAN_CONVERTn(channel);
-#endif
+    assert(channel < (uint32_t)FSL_FEATURE_DMAMUX_MODULE_CHANNEL);
 
     if (enable)
     {