Skip to content

Commit f91541b

Browse files
tunguyen4585mmahadevan108
authored andcommitted
s32: mcux: S32Z270: add missing flexcan features on s32z27x devices
add memory error control features and remove some bits is unsupported on s32z27x devices Signed-off-by: Tu Nguyen Van <tu.nguyenvan@nxp.com>
1 parent 093abc4 commit f91541b

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

s32/mcux/devices/S32Z270/S32Z270_device.h

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,6 @@ typedef struct {
130130

131131
#define CAN_MCR_SRXDIS(x) FLEXCAN_MCR_SRXDIS(x)
132132

133-
#define CAN_MCR_WAKSRC_MASK (0x80000U)
134-
#define CAN_MCR_WAKSRC_SHIFT (19U)
135-
136-
#define CAN_MCR_WAKSRC(x) FLEXCAN_MCR_WAKSRC(x)
137-
138133
#define CAN_MCR_LPMACK_MASK FLEXCAN_MCR_LPMACK_MASK
139134
#define CAN_MCR_LPMACK_SHIFT FLEXCAN_MCR_LPMACK_SHIFT
140135

@@ -145,11 +140,6 @@ typedef struct {
145140

146141
#define CAN_MCR_WRNEN(x) FLEXCAN_MCR_WRNEN(x)
147142

148-
#define CAN_MCR_SLFWAK_MASK (0x400000U)
149-
#define CAN_MCR_SLFWAK_SHIFT (22U)
150-
151-
#define CAN_MCR_SLFWAK(x) FLEXCAN_MCR_SLFWAK(x)
152-
153143
#define CAN_MCR_FRZACK_MASK FLEXCAN_MCR_FRZACK_MASK
154144
#define CAN_MCR_FRZACK_SHIFT FLEXCAN_MCR_FRZACK_SHIFT
155145

@@ -160,11 +150,6 @@ typedef struct {
160150

161151
#define CAN_MCR_SOFTRST(x) FLEXCAN_MCR_SOFTRST(x)
162152

163-
#define CAN_MCR_WAKMSK_MASK (0x4000000U)
164-
#define CAN_MCR_WAKMSK_SHIFT (26U)
165-
166-
#define CAN_MCR_WAKMSK(x) FLEXCAN_MCR_WAKMSK(x)
167-
168153
#define CAN_MCR_NOTRDY_MASK FLEXCAN_MCR_NOTRDY_MASK
169154
#define CAN_MCR_NOTRDY_SHIFT FLEXCAN_MCR_NOTRDY_SHIFT
170155

@@ -333,11 +318,6 @@ typedef struct {
333318
/*! @name ESR1 - Error and Status 1 Register */
334319
/*! @{ */
335320

336-
#define CAN_ESR1_WAKINT_MASK (0x1U)
337-
#define CAN_ESR1_WAKINT_SHIFT (0U)
338-
339-
#define CAN_ESR1_WAKINT(x) FLEXCAN_ESR1_WAKINT(x)
340-
341321
#define CAN_ESR1_ERRINT_MASK FLEXCAN_ESR1_ERRINT_MASK
342322
#define CAN_ESR1_ERRINT_SHIFT FLEXCAN_ESR1_ERRINT_SHIFT
343323

s32/mcux/devices/S32Z270/S32Z270_features.h

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,15 @@
8181
/* @brief CAN instance support Flexible Data rate (CAN FD) protocol. */
8282
#define FSL_FEATURE_FLEXCAN_INSTANCE_HAS_FLEXIBLE_DATA_RATEn(x) (1)
8383
/* @brief Has memory error control (register MECR). */
84-
#define FSL_FEATURE_FLEXCAN_HAS_MEMORY_ERROR_CONTROL (0)
84+
#define FSL_FEATURE_FLEXCAN_HAS_MEMORY_ERROR_CONTROL (1)
85+
/* @brief Init memory base 1 */
86+
#define FSL_FEATURE_FLEXCAN_INIT_MEMORY_BASE_1 (0x80)
87+
/* @brief Init memory size 1 */
88+
#define FSL_FEATURE_FLEXCAN_INIT_MEMORY_SIZE_1 (0xA60)
89+
/* @brief Init memory base 2 */
90+
#define FSL_FEATURE_FLEXCAN_INIT_MEMORY_BASE_2 (0xC20)
91+
/* @brief Init memory size 2 */
92+
#define FSL_FEATURE_FLEXCAN_INIT_MEMORY_SIZE_2 (0x25E0)
8593
/* @brief Has enhanced bit timing register (register EPRS, ENCBT, EDCBT and ETDC). */
8694
#define FSL_FEATURE_FLEXCAN_HAS_ENHANCED_BIT_TIMING_REG (0)
8795
/* @brief Has Pretended Networking mode support. */
@@ -90,6 +98,18 @@
9098
#define FSL_FEATURE_FLEXCAN_HAS_ENHANCED_RX_FIFO (0)
9199
/* @brief Does not support Supervisor Mode (bitfield MCR[SUPV]. */
92100
#define FSL_FEATURE_FLEXCAN_HAS_NO_SUPV_SUPPORT (1)
101+
/* @brief Does not support Memory Error Control (bitfield MECR[HANCEI]. */
102+
#define FSL_FEATURE_FLEXCAN_HAS_NO_HANCEI_SUPPORT (1)
103+
/* @brief Does not support Memory Error Control (bitfield MECR[FANCEI]. */
104+
#define FSL_FEATURE_FLEXCAN_HAS_NO_FANCEI_SUPPORT (1)
105+
/* @brief Does not support Memory Error Control (bitfield MECR[CEI]. */
106+
#define FSL_FEATURE_FLEXCAN_HAS_NO_CEI_SUPPORT (1)
107+
/* @brief Does not support Wake Up interrupt (bitfield MCR[WAKMSK]. */
108+
#define FSL_FEATURE_FLEXCAN_HAS_NO_WAKMSK_SUPPORT (1)
109+
/* @brief Does not support Self Wake Up (bitfield MCR[SLFWAK]. */
110+
#define FSL_FEATURE_FLEXCAN_HAS_NO_SLFWAK_SUPPORT (1)
111+
/* @brief Does not support Wake Up Source (bitfield MCR[WAKSRC]. */
112+
#define FSL_FEATURE_FLEXCAN_HAS_NO_WAKSRC_SUPPORT (1)
93113

94114
/* I2C module features */
95115

0 commit comments

Comments
 (0)