Skip to content

Commit a97694b

Browse files
committed
hal_nxp: Update dmamux, sai, flexcan driver to the SDK latest
Signed-off-by: Zhaoxiang Jin <[email protected]>
1 parent df48c81 commit a97694b

File tree

9 files changed

+647
-306
lines changed

9 files changed

+647
-306
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: BSD-3-Clause
44

55
if(CONFIG_MCUX_COMPONENT_driver.dmamux)
6-
mcux_component_version(2.1.2)
6+
mcux_component_version(2.1.3)
77

88
mcux_add_source(SOURCES fsl_dmamux.h fsl_dmamux.c)
99

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,31 @@
2121
* Prototypes
2222
******************************************************************************/
2323

24+
#if !(defined(FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL) && FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL)
2425
/*!
2526
* @brief Get instance number for DMAMUX.
2627
*
2728
* @param base DMAMUX peripheral base address.
2829
*/
2930
static uint32_t DMAMUX_GetInstance(DMAMUX_Type *base);
31+
#endif /* FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL */
3032

3133
/*******************************************************************************
3234
* Variables
3335
******************************************************************************/
3436

37+
#if !(defined(FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL) && FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL)
3538
/*! @brief Array to map DMAMUX instance number to base pointer. */
3639
static DMAMUX_Type *const s_dmamuxBases[] = DMAMUX_BASE_PTRS;
3740

38-
#if !(defined(FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL) && FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL)
3941
/*! @brief Array to map DMAMUX instance number to clock name. */
4042
static const clock_ip_name_t s_dmamuxClockName[] = DMAMUX_CLOCKS;
4143
#endif /* FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL */
4244

4345
/*******************************************************************************
4446
* Code
4547
******************************************************************************/
48+
#if !(defined(FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL) && FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL)
4649
static uint32_t DMAMUX_GetInstance(DMAMUX_Type *base)
4750
{
4851
uint32_t instance;
@@ -60,6 +63,7 @@ static uint32_t DMAMUX_GetInstance(DMAMUX_Type *base)
6063

6164
return instance;
6265
}
66+
#endif /* FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL */
6367

6468
/*!
6569
* brief Initializes the DMAMUX peripheral.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/*! @name Driver version */
2424
/*! @{ */
2525
/*! @brief DMAMUX driver version 2.1.1. */
26-
#define FSL_DMAMUX_DRIVER_VERSION (MAKE_VERSION(2, 1, 2))
26+
#define FSL_DMAMUX_DRIVER_VERSION (MAKE_VERSION(2, 1, 3))
2727
/*! @} */
2828

2929
#if (defined(FSL_FEATURE_DMAMUX_CHANNEL_NEEDS_ENDIAN_CONVERT) && FSL_FEATURE_DMAMUX_CHANNEL_NEEDS_ENDIAN_CONVERT)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if(CONFIG_MCUX_COMPONENT_driver.flexcan_edma)
1212
endif()
1313

1414
if(CONFIG_MCUX_COMPONENT_driver.flexcan)
15-
mcux_component_version(2.14.1)
15+
mcux_component_version(2.14.3)
1616

1717
mcux_add_source(SOURCES fsl_flexcan.h fsl_flexcan.c)
1818

0 commit comments

Comments
 (0)