Skip to content

Commit 41a0865

Browse files
ZhaoxiangJincfriedt
ZhaoxiangJin
authored and
cfriedt
committed
boards: nxp: Convert enum members to upper case.
1. Convert enum members to upper case. 2. Remove extra underscores from header names Signed-off-by: Zhaoxiang Jin <[email protected]>
1 parent a039bab commit 41a0865

File tree

53 files changed

+886
-886
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+886
-886
lines changed

‎boards/madmachine/mm_feather/flexspi_nor_config.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ const struct flexspi_nor_config_t qspi_flash_config = {
1616
.tag = FLEXSPI_CFG_BLK_TAG,
1717
.version = FLEXSPI_CFG_BLK_VERSION,
1818
.read_sample_clk_src =
19-
flexspi_read_sample_clk_loopback_from_dqs_pad,
19+
FLEXSPI_READ_SAMPLE_CLK_LOOPBACK_FROM_DQS_PAD,
2020
.cs_hold_time = 3u,
2121
.cs_setup_time = 3u,
22-
.sflash_pad_type = serial_flash_4_pads,
23-
.serial_clk_freq = flexspi_serial_clk_100mhz,
22+
.sflash_pad_type = SERIAL_FLASH_4_PADS,
23+
.serial_clk_freq = FLEXSPI_SERIAL_CLK_100MHZ,
2424
.sflash_a1_size = 8u * 1024u * 1024u,
2525
.lookup_table = {
2626
FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD,

‎boards/madmachine/mm_swiftio/flexspi_nor_config.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ const struct flexspi_nor_config_t qspi_flash_config = {
1616
.tag = FLEXSPI_CFG_BLK_TAG,
1717
.version = FLEXSPI_CFG_BLK_VERSION,
1818
.read_sample_clk_src =
19-
flexspi_read_sample_clk_loopback_from_dqs_pad,
19+
FLEXSPI_READ_SAMPLE_CLK_LOOPBACK_FROM_DQS_PAD,
2020
.cs_hold_time = 3u,
2121
.cs_setup_time = 3u,
22-
.sflash_pad_type = serial_flash_4_pads,
23-
.serial_clk_freq = flexspi_serial_clk_100mhz,
22+
.sflash_pad_type = SERIAL_FLASH_4_PADS,
23+
.serial_clk_freq = FLEXSPI_SERIAL_CLK_100MHZ,
2424
.sflash_a1_size = 8u * 1024u * 1024u,
2525
.lookup_table = {
2626
FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD,

‎boards/nxp/frdm_mcxn947/xip/mcxn_flexspi_nor_config.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,16 @@ const flexspi_nor_image_config image_config = {
7474
.tag = FLEXSPI_CFG_BLK_TAG,
7575
.version = FLEXSPI_CFG_BLK_VERSION,
7676
.read_sample_clk_src =
77-
flexspi_read_sample_clk_loopback_from_dqs_pad,
77+
FLEXSPI_READ_SAMPLE_CLK_LOOPBACK_FROM_DQS_PAD,
7878
.cs_hold_time = 3u,
7979
.cs_setup_time = 3u,
8080
/* Enable DDR mode, Wordaddassable, Safe */
8181
/* configuration, Differential clock */
8282
.controller_misc_option =
83-
(1u << flexspi_misc_offset_safe_config_freq_enable),
84-
.device_type = flexspi_device_type_serial_nor,
85-
.sflash_pad_type = serial_flash_4_pads,
86-
.serial_clk_freq = flexspi_serial_clk_75mhz,
83+
(1u << FLEXSPI_MISC_OFFSET_SAFE_CONFIG_FREQ_ENABLE),
84+
.device_type = FLEXSPI_DEVICE_TYPE_SERIAL_NOR,
85+
.sflash_pad_type = SERIAL_FLASH_4_PADS,
86+
.serial_clk_freq = FLEXSPI_SERIAL_CLK_75MHZ,
8787
.sflash_a1_size = 8u * 1024u * 1024u,
8888
.lookup_table = {
8989
/* Read LUTs */

‎boards/nxp/frdm_mcxn947/xip/mcxn_flexspi_nor_config.h‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* SPDX-License-Identifier: Apache-2.0
66
*/
77

8-
#ifndef __MCXN_FLEXSPI_NOR_CONFIG__
9-
#define __MCXN_FLEXSPI_NOR_CONFIG__
8+
#ifndef MCXN_FLEXSPI_NOR_CONFIG_
9+
#define MCXN_FLEXSPI_NOR_CONFIG_
1010

1111
#include <stdint.h>
1212
#include <stdbool.h>
@@ -72,71 +72,71 @@
7272

7373
/*! @brief Definitions for FlexSPI Serial Clock Frequency */
7474
typedef enum flexspi_serial_clock_freq {
75-
flexspi_serial_clk_30mhz = 1,
76-
flexspi_serial_clk_50mhz = 2,
77-
flexspi_serial_clk_60mhz = 3,
78-
flexspi_serial_clk_75mhz = 4,
79-
flexspi_serial_clk_100mhz = 5,
75+
FLEXSPI_SERIAL_CLK_30MHZ = 1,
76+
FLEXSPI_SERIAL_CLK_50MHZ = 2,
77+
FLEXSPI_SERIAL_CLK_60MHZ = 3,
78+
FLEXSPI_SERIAL_CLK_75MHZ = 4,
79+
FLEXSPI_SERIAL_CLK_100MHZ = 5,
8080
} flexspi_serial_clk_freq_t;
8181

8282
/*! @brief FlexSPI clock configuration type */
8383
enum {
8484
/* Clock configure for SDR mode */
85-
flexspi_clk_sdr,
85+
FLEXSPI_CLK_SDR,
8686
/* Clock configurat for DDR mode */
87-
flexspi_clk_ddr,
87+
FLEXSPI_CLK_DDR,
8888
};
8989

9090
/*! @brief FlexSPI Read Sample Clock Source definition */
9191
typedef enum flexspi_read_sample_clk_source {
92-
flexspi_read_sample_clk_loopback_internally = 0,
93-
flexspi_read_sample_clk_loopback_from_dqs_pad = 1,
94-
flexspi_read_sample_clk_loopback_from_sck_pad = 2,
95-
flexspi_read_sample_clk_external_input_from_dqs_pad = 3,
92+
FLEXSPI_READ_SAMPLE_CLK_LOOPBACK_INTERNALLY = 0,
93+
FLEXSPI_READ_SAMPLE_CLK_LOOPBACK_FROM_DQS_PAD = 1,
94+
FLEXSPI_READ_SAMPLE_CLK_LOOPBACK_FROM_SCK_PAD = 2,
95+
FLEXSPI_READ_SAMPLE_CLK_EXTERNAL_INPUT_FROM_DQS_PAD = 3,
9696
} flexspi_read_sample_clk_t;
9797

9898
/*! @brief Misc feature bit definitions */
9999
enum {
100100
/* Bit for Differential clock enable */
101-
flexspi_misc_offset_diff_clk_enable = 0,
101+
FLEXSPI_MISC_OFFSET_DIFF_CLK_ENABLE = 0,
102102
/* Bit for CK2 enable */
103-
flexspi_misc_offset_ck2_enable = 1,
103+
FLEXSPI_MISC_OFFSET_CK2_ENABLE = 1,
104104
/* Bit for Parallel mode enable */
105-
flexspi_misc_offset_parallel_enable = 2,
105+
FLEXSPI_MISC_OFFSET_PARALLEL_ENABLE = 2,
106106
/* Bit for Word Addressable enable */
107-
flexspi_misc_offset_word_addressable_enable = 3,
107+
FLEXSPI_MISC_OFFSET_WORD_ADDRESSABLE_ENABLE = 3,
108108
/* Bit for Safe Configuration Frequency enable */
109-
flexspi_misc_offset_safe_config_freq_enable = 4,
109+
FLEXSPI_MISC_OFFSET_SAFE_CONFIG_FREQ_ENABLE = 4,
110110
/* Bit for Pad setting override enable */
111-
flexspi_misc_offset_pad_setting_override_enable = 5,
111+
FLEXSPI_MISC_OFFSET_PAD_SETTING_OVERRIDE_ENABLE = 5,
112112
/* Bit for DDR clock confiuration indication. */
113-
flexspi_misc_offset_ddr_mode_enable = 6,
113+
FLEXSPI_MISC_OFFSET_DDR_MODE_ENABLE = 6,
114114
};
115115

116116
/*! @brief Flash Type Definition */
117117
enum {
118118
/* Flash devices are Serial NOR */
119-
flexspi_device_type_serial_nor = 1,
119+
FLEXSPI_DEVICE_TYPE_SERIAL_NOR = 1,
120120
/* Flash devices are Serial NAND */
121-
flexspi_device_type_serial_nand = 2,
121+
FLEXSPI_DEVICE_TYPE_SERIAL_NAND = 2,
122122
/* Flash devices are Serial RAM/HyperFLASH */
123-
flexspi_device_type_serial_ram = 3,
123+
FLEXSPI_DEVICE_TYPE_SERIAL_RAM = 3,
124124
/* Flash device is MCP device, A1 is Serial NOR,
125125
* A2 is Serial NAND
126126
*/
127-
flexspi_device_type_mcp_nor_nand = 0x12,
127+
FLEXSPI_DEVICE_TYPE_MCP_NOR_NAND = 0x12,
128128
/* Flash device is MCP device, A1 is Serial NOR,
129129
* A2 is Serial RAMs
130130
*/
131-
flexspi_device_type_mcp_nor_ram = 0x13,
131+
FLEXSPI_DEVICE_TYPE_MCP_NOR_RAM = 0x13,
132132
};
133133

134134
/*! @brief Flash Pad Definitions */
135135
enum {
136-
serial_flash_1_pads = 1,
137-
serial_flash_2_pads = 2,
138-
serial_flash_4_pads = 4,
139-
serial_flash_8_pads = 8,
136+
SERIAL_FLASH_1_PADS = 1,
137+
SERIAL_FLASH_2_PADS = 2,
138+
SERIAL_FLASH_4_PADS = 4,
139+
SERIAL_FLASH_8_PADS = 8,
140140
};
141141

142142
/*! @brief FlexSPI LUT Sequence structure */
@@ -151,17 +151,17 @@ enum {
151151
/* Generic command, for example: configure dummy cycles,
152152
* drive strength, etc
153153
*/
154-
device_config_cmd_type_generic,
154+
DEVICE_CONFIG_CMD_TYPE_GENERIC,
155155
/* Quad Enable command */
156-
device_config_cmd_type_quad_enable,
156+
DEVICE_CONFIG_CMD_TYPE_QUAD_ENABLE,
157157
/* Switch from SPI to DPI/QPI/OPI mode */
158-
device_config_cmd_type_spi2xpi,
158+
DEVICE_CONFIG_CMD_TYPE_SPI2XPI,
159159
/* Switch from DPI/QPI/OPI to SPI mode */
160-
device_config_cmd_type_xpi2spi,
160+
DEVICE_CONFIG_CMD_TYPE_XPI2SPI,
161161
/* Switch to 0-4-4/0-8-8 mode */
162-
device_config_cmd_type_spi2nocmd,
162+
DEVICE_CONFIG_CMD_TYPE_SPI2NOCMD,
163163
/* Reset device command */
164-
device_config_cmd_type_reset,
164+
DEVICE_CONFIG_CMD_TYPE_RESET,
165165
};
166166

167167
/*! @brief FlexSPI Memory Configuration Block */
@@ -380,4 +380,4 @@ extern "C" {
380380
#ifdef __cplusplus
381381
}
382382
#endif
383-
#endif /* __MCXN_FLEXSPI_NOR_CONFIG__ */
383+
#endif /* MCXN_FLEXSPI_NOR_CONFIG_ */

‎boards/nxp/mcx_nx4x_evk/xip/mcxn_flexspi_nor_config.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,16 @@ const flexspi_nor_image_config image_config = {
7474
.tag = FLEXSPI_CFG_BLK_TAG,
7575
.version = FLEXSPI_CFG_BLK_VERSION,
7676
.read_sample_clk_src =
77-
flexspi_read_sample_clk_loopback_from_dqs_pad,
77+
FLEXSPI_READ_SAMPLE_CLK_LOOPBACK_FROM_DQS_PAD,
7878
.cs_hold_time = 3u,
7979
.cs_setup_time = 3u,
8080
/* Enable DDR mode, Wordaddassable, Safe */
8181
/* configuration, Differential clock */
8282
.controller_misc_option =
83-
(1u << flexspi_misc_offset_safe_config_freq_enable),
84-
.device_type = flexspi_device_type_serial_nor,
85-
.sflash_pad_type = serial_flash_4_pads,
86-
.serial_clk_freq = flexspi_serial_clk_75mhz,
83+
(1u << FLEXSPI_MISC_OFFSET_SAFE_CONFIG_FREQ_ENABLE),
84+
.device_type = FLEXSPI_DEVICE_TYPE_SERIAL_NOR,
85+
.sflash_pad_type = SERIAL_FLASH_4_PADS,
86+
.serial_clk_freq = FLEXSPI_SERIAL_CLK_75MHZ,
8787
.sflash_a1_size = 8u * 1024u * 1024u,
8888
.lookup_table = {
8989
/* Read LUTs */

‎boards/nxp/mcx_nx4x_evk/xip/mcxn_flexspi_nor_config.h‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* SPDX-License-Identifier: Apache-2.0
66
*/
77

8-
#ifndef __MCXN_FLEXSPI_NOR_CONFIG__
9-
#define __MCXN_FLEXSPI_NOR_CONFIG__
8+
#ifndef MCXN_FLEXSPI_NOR_CONFIG_
9+
#define MCXN_FLEXSPI_NOR_CONFIG_
1010

1111
#include <stdint.h>
1212
#include <stdbool.h>
@@ -72,71 +72,71 @@
7272

7373
/*! @brief Definitions for FlexSPI Serial Clock Frequency */
7474
typedef enum flexspi_serial_clock_freq {
75-
flexspi_serial_clk_30mhz = 1,
76-
flexspi_serial_clk_50mhz = 2,
77-
flexspi_serial_clk_60mhz = 3,
78-
flexspi_serial_clk_75mhz = 4,
79-
flexspi_serial_clk_100mhz = 5,
75+
FLEXSPI_SERIAL_CLK_30MHZ = 1,
76+
FLEXSPI_SERIAL_CLK_50MHZ = 2,
77+
FLEXSPI_SERIAL_CLK_60MHZ = 3,
78+
FLEXSPI_SERIAL_CLK_75MHZ = 4,
79+
FLEXSPI_SERIAL_CLK_100MHZ = 5,
8080
} flexspi_serial_clk_freq_t;
8181

8282
/*! @brief FlexSPI clock configuration type */
8383
enum {
8484
/* Clock configure for SDR mode */
85-
flexspi_clk_sdr,
85+
FLEXSPI_CLK_SDR,
8686
/* Clock configurat for DDR mode */
87-
flexspi_clk_ddr,
87+
FLEXSPI_CLK_DDR,
8888
};
8989

9090
/*! @brief FlexSPI Read Sample Clock Source definition */
9191
typedef enum flexspi_read_sample_clk_source {
92-
flexspi_read_sample_clk_loopback_internally = 0,
93-
flexspi_read_sample_clk_loopback_from_dqs_pad = 1,
94-
flexspi_read_sample_clk_loopback_from_sck_pad = 2,
95-
flexspi_read_sample_clk_external_input_from_dqs_pad = 3,
92+
FLEXSPI_READ_SAMPLE_CLK_LOOPBACK_INTERNALLY = 0,
93+
FLEXSPI_READ_SAMPLE_CLK_LOOPBACK_FROM_DQS_PAD = 1,
94+
FLEXSPI_READ_SAMPLE_CLK_LOOPBACK_FROM_SCK_PAD = 2,
95+
FLEXSPI_READ_SAMPLE_CLK_EXTERNAL_INPUT_FROM_DQS_PAD = 3,
9696
} flexspi_read_sample_clk_t;
9797

9898
/*! @brief Misc feature bit definitions */
9999
enum {
100100
/* Bit for Differential clock enable */
101-
flexspi_misc_offset_diff_clk_enable = 0,
101+
FLEXSPI_MISC_OFFSET_DIFF_CLK_ENABLE = 0,
102102
/* Bit for CK2 enable */
103-
flexspi_misc_offset_ck2_enable = 1,
103+
FLEXSPI_MISC_OFFSET_CK2_ENABLE = 1,
104104
/* Bit for Parallel mode enable */
105-
flexspi_misc_offset_parallel_enable = 2,
105+
FLEXSPI_MISC_OFFSET_PARALLEL_ENABLE = 2,
106106
/* Bit for Word Addressable enable */
107-
flexspi_misc_offset_word_addressable_enable = 3,
107+
FLEXSPI_MISC_OFFSET_WORD_ADDRESSABLE_ENABLE = 3,
108108
/* Bit for Safe Configuration Frequency enable */
109-
flexspi_misc_offset_safe_config_freq_enable = 4,
109+
FLEXSPI_MISC_OFFSET_SAFE_CONFIG_FREQ_ENABLE = 4,
110110
/* Bit for Pad setting override enable */
111-
flexspi_misc_offset_pad_setting_override_enable = 5,
111+
FLEXSPI_MISC_OFFSET_PAD_SETTING_OVERRIDE_ENABLE = 5,
112112
/* Bit for DDR clock confiuration indication. */
113-
flexspi_misc_offset_ddr_mode_enable = 6,
113+
FLEXSPI_MISC_OFFSET_DDR_MODE_ENABLE = 6,
114114
};
115115

116116
/*! @brief Flash Type Definition */
117117
enum {
118118
/* Flash devices are Serial NOR */
119-
flexspi_device_type_serial_nor = 1,
119+
FLEXSPI_DEVICE_TYPE_SERIAL_NOR = 1,
120120
/* Flash devices are Serial NAND */
121-
flexspi_device_type_serial_nand = 2,
121+
FLEXSPI_DEVICE_TYPE_SERIAL_NAND = 2,
122122
/* Flash devices are Serial RAM/HyperFLASH */
123-
flexspi_device_type_serial_ram = 3,
123+
FLEXSPI_DEVICE_TYPE_SERIAL_RAM = 3,
124124
/* Flash device is MCP device, A1 is Serial NOR,
125125
* A2 is Serial NAND
126126
*/
127-
flexspi_device_type_mcp_nor_nand = 0x12,
127+
FLEXSPI_DEVICE_TYPE_MCP_NOR_NAND = 0x12,
128128
/* Flash device is MCP device, A1 is Serial NOR,
129129
* A2 is Serial RAMs
130130
*/
131-
flexspi_device_type_mcp_nor_ram = 0x13,
131+
FLEXSPI_DEVICE_TYPE_MCP_NOR_RAM = 0x13,
132132
};
133133

134134
/*! @brief Flash Pad Definitions */
135135
enum {
136-
serial_flash_1_pads = 1,
137-
serial_flash_2_pads = 2,
138-
serial_flash_4_pads = 4,
139-
serial_flash_8_pads = 8,
136+
SERIAL_FLASH_1_PADS = 1,
137+
SERIAL_FLASH_2_PADS = 2,
138+
SERIAL_FLASH_4_PADS = 4,
139+
SERIAL_FLASH_8_PADS = 8,
140140
};
141141

142142
/*! @brief FlexSPI LUT Sequence structure */
@@ -151,17 +151,17 @@ enum {
151151
/* Generic command, for example: configure dummy cycles,
152152
* drive strength, etc
153153
*/
154-
device_config_cmd_type_generic,
154+
DEVICE_CONFIG_CMD_TYPE_GENERIC,
155155
/* Quad Enable command */
156-
device_config_cmd_type_quad_enable,
156+
DEVICE_CONFIG_CMD_TYPE_QUAD_ENABLE,
157157
/* Switch from SPI to DPI/QPI/OPI mode */
158-
device_config_cmd_type_spi2xpi,
158+
DEVICE_CONFIG_CMD_TYPE_SPI2XPI,
159159
/* Switch from DPI/QPI/OPI to SPI mode */
160-
device_config_cmd_type_xpi2spi,
160+
DEVICE_CONFIG_CMD_TYPE_XPI2SPI,
161161
/* Switch to 0-4-4/0-8-8 mode */
162-
device_config_cmd_type_spi2nocmd,
162+
DEVICE_CONFIG_CMD_TYPE_SPI2NOCMD,
163163
/* Reset device command */
164-
device_config_cmd_type_reset,
164+
DEVICE_CONFIG_CMD_TYPE_RESET,
165165
};
166166

167167
/*! @brief FlexSPI Memory Configuration Block */
@@ -380,4 +380,4 @@ extern "C" {
380380
#ifdef __cplusplus
381381
}
382382
#endif
383-
#endif /* __MCXN_FLEXSPI_NOR_CONFIG__ */
383+
#endif /* MCXN_FLEXSPI_NOR_CONFIG_ */

‎boards/nxp/mimxrt1010_evk/xip/evkmimxrt1010_flexspi_nor_config.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ const flexspi_nor_config_t qspi_flash_config = {
1515
.tag = FLEXSPI_CFG_BLK_TAG,
1616
.version = FLEXSPI_CFG_BLK_VERSION,
1717
.read_sample_clk_src =
18-
flexspi_read_sample_clk_loopback_from_dqs_pad,
18+
FLEXSPI_READ_SAMPLE_CLK_LOOPBACK_FROM_DQS_PAD,
1919
.cs_hold_time = 3u,
2020
.cs_setup_time = 3u,
21-
.device_type = flexspi_device_type_serial_nor,
22-
.sflash_pad_type = serial_flash_4_pads,
23-
.serial_clk_freq = flexspi_serial_clk_120mhz,
21+
.device_type = FLEXSPI_DEVICE_TYPE_SERIAL_NOR,
22+
.sflash_pad_type = SERIAL_FLASH_4_PADS,
23+
.serial_clk_freq = FLEXSPI_SERIAL_CLK_120MHZ,
2424
.sflash_a1_size = 16u * 1024u * 1024u,
2525
.lookup_table = {
2626
/* Read LUTs */

0 commit comments

Comments
 (0)