From f410d9711a1574580f861bac18c5c9dd7c573d7d Mon Sep 17 00:00:00 2001 From: Dave Marples Date: Fri, 29 Nov 2019 14:54:08 -0600 Subject: [PATCH] boards/arm/imxrt/imxrt10x0-evk/include/board.h: Set up TRACE clocking correctly. This also reverts 7dcd57aa4a2110166801d13c72365de1dc2f7192. --- .../arm/imxrt/imxrt1020-evk/include/board.h | 38 ++++++++++--------- .../arm/imxrt/imxrt1050-evk/include/board.h | 36 ++++++++++-------- .../arm/imxrt/imxrt1060-evk/include/board.h | 30 +++++++++------ 3 files changed, 60 insertions(+), 44 deletions(-) diff --git a/boards/arm/imxrt/imxrt1020-evk/include/board.h b/boards/arm/imxrt/imxrt1020-evk/include/board.h index ecaf4371d96..ba50524740d 100644 --- a/boards/arm/imxrt/imxrt1020-evk/include/board.h +++ b/boards/arm/imxrt/imxrt1020-evk/include/board.h @@ -92,30 +92,34 @@ * imxrt_config_gpio(GPIO_CCM_CLKO1); */ -#define BOARD_XTAL_FREQUENCY 24000000 -#define BOARD_CPU_FREQUENCY 500000000U +#define BOARD_XTAL_FREQUENCY 24000000 +#define BOARD_CPU_FREQUENCY 500000000U -#define IMXRT_PRE_PERIPH_CLK_SEL CCM_CBCMR_PRE_PERIPH_CLK_SEL_PLL6 -#define IMXRT_PERIPH_CLK_SEL CCM_CBCDR_PERIPH_CLK_SEL_PRE_PERIPH -#define IMXRT_ARM_PODF_DIVIDER 1 -#define IMXRT_AHB_PODF_DIVIDER 1 -#define IMXRT_IPG_PODF_DIVIDER 4 -#define IMXRT_PERCLK_CLK_SEL CCM_CSCMR1_PERCLK_CLK_SEL_IPG_CLK_ROOT -#define IMXRT_PERCLK_PODF_DIVIDER 2 -#define IMXRT_SEMC_PODF_DIVIDER 4 -#define IMXRT_LPSPI_CLK_SELECT CCM_CBCMR_LPSPI_CLK_SEL_PLL3_PFD0 -#define IMXRT_LSPI_PODF_DIVIDER 8 +#define IMXRT_PRE_PERIPH_CLK_SEL CCM_CBCMR_PRE_PERIPH_CLK_SEL_PLL6 +#define IMXRT_PERIPH_CLK_SEL CCM_CBCDR_PERIPH_CLK_SEL_PRE_PERIPH +#define IMXRT_ARM_PODF_DIVIDER 1 +#define IMXRT_AHB_PODF_DIVIDER 1 +#define IMXRT_IPG_PODF_DIVIDER 4 +#define IMXRT_PERCLK_CLK_SEL CCM_CSCMR1_PERCLK_CLK_SEL_IPG_CLK_ROOT +#define IMXRT_PERCLK_PODF_DIVIDER 2 +#define IMXRT_SEMC_PODF_DIVIDER 4 +#define IMXRT_LPSPI_CLK_SELECT CCM_CBCMR_LPSPI_CLK_SEL_PLL3_PFD0 +#define IMXRT_LSPI_PODF_DIVIDER 8 #define IMXRT_USDHC1_CLK_SELECT CCM_CSCMR1_USDHC1_CLK_SEL_PLL2_PFD0 -#define IMXRT_USDHC1_PODF_DIVIDER 1 +#define IMXRT_USDHC1_PODF_DIVIDER 1 #define IMXRT_USDHC1_CLK_SELECT CCM_CSCMR1_USDHC2_CLK_SEL_PLL2_PFD0 -#define IMXRT_USDHC2_PODF_DIVIDER 4 -#define IMXRT_TRACE_CLK_SELECT CCM_CBCMR_TRACE_CLK_SEL_PLL2 +#define IMXRT_USDHC2_PODF_DIVIDER 4 -#define IMXRT_SYS_PLL_DIV_SELECT CCM_ANALOG_PLL_SYS_DIV_SELECT_22 +#define IMXRT_SYS_PLL_DIV_SELECT CCM_ANALOG_PLL_SYS_DIV_SELECT_22 #define IMXRT_USB1_PLL_DIV_SELECT CCM_ANALOG_PLL_USB1_DIV_SELECT_20 #define IMXRT_AUDIO_PLL_DIV_SELECT (45) -#define IMXRT_TRACE_PODF_DIVIDER 1 +/* Define this to enable tracing */ + +#if 0 +# define IMXRT_TRACE_PODF_DIVIDER 1 +# define IMXRT_TRACE_CLK_SELECT CCM_CBCMR_TRACE_CLK_SEL_PLL2_PFD0 +#endif /* LED definitions ***********************************************************/ diff --git a/boards/arm/imxrt/imxrt1050-evk/include/board.h b/boards/arm/imxrt/imxrt1050-evk/include/board.h index c02fc5fa9b1..9145a466ac5 100644 --- a/boards/arm/imxrt/imxrt1050-evk/include/board.h +++ b/boards/arm/imxrt/imxrt1050-evk/include/board.h @@ -98,27 +98,33 @@ * imxrt_config_gpio(GPIO_CCM_CLKO1); */ -#define BOARD_XTAL_FREQUENCY 24000000 -#define IMXRT_PRE_PERIPH_CLK_SEL CCM_CBCMR_PRE_PERIPH_CLK_SEL_PLL1 -#define IMXRT_PERIPH_CLK_SEL CCM_CBCDR_PERIPH_CLK_SEL_PRE_PERIPH -#define IMXRT_ARM_PLL_DIV_SELECT 100 -#define IMXRT_ARM_PODF_DIVIDER 2 -#define IMXRT_AHB_PODF_DIVIDER 1 -#define IMXRT_IPG_PODF_DIVIDER 4 -#define IMXRT_PERCLK_CLK_SEL CCM_CSCMR1_PERCLK_CLK_SEL_IPG_CLK_ROOT -#define IMXRT_PERCLK_PODF_DIVIDER 9 -#define IMXRT_SEMC_PODF_DIVIDER 8 -#define IMXRT_LPSPI_CLK_SELECT CCM_CBCMR_LPSPI_CLK_SEL_PLL3_PFD0 -#define IMXRT_LSPI_PODF_DIVIDER 8 +#define BOARD_XTAL_FREQUENCY 24000000 +#define IMXRT_PRE_PERIPH_CLK_SEL CCM_CBCMR_PRE_PERIPH_CLK_SEL_PLL1 +#define IMXRT_PERIPH_CLK_SEL CCM_CBCDR_PERIPH_CLK_SEL_PRE_PERIPH +#define IMXRT_ARM_PLL_DIV_SELECT 100 +#define IMXRT_ARM_PODF_DIVIDER 2 +#define IMXRT_AHB_PODF_DIVIDER 1 +#define IMXRT_IPG_PODF_DIVIDER 4 +#define IMXRT_PERCLK_CLK_SEL CCM_CSCMR1_PERCLK_CLK_SEL_IPG_CLK_ROOT +#define IMXRT_PERCLK_PODF_DIVIDER 9 +#define IMXRT_SEMC_PODF_DIVIDER 8 +#define IMXRT_LPSPI_CLK_SELECT CCM_CBCMR_LPSPI_CLK_SEL_PLL3_PFD0 +#define IMXRT_LSPI_PODF_DIVIDER 8 #define IMXRT_USDHC1_CLK_SELECT CCM_CSCMR1_USDHC1_CLK_SEL_PLL2_PFD0 -#define IMXRT_USDHC1_PODF_DIVIDER 2 -#define IMXRT_TRACE_CLK_SELECT CCM_CBCMR_TRACE_CLK_SEL_PLL2 +#define IMXRT_USDHC1_PODF_DIVIDER 2 -#define IMXRT_SYS_PLL_SELECT CCM_ANALOG_PLL_SYS_DIV_SELECT_22 +#define IMXRT_SYS_PLL_SELECT CCM_ANALOG_PLL_SYS_DIV_SELECT_22 #define BOARD_CPU_FREQUENCY \ (BOARD_XTAL_FREQUENCY * (IMXRT_ARM_PLL_DIV_SELECT / 2)) / IMXRT_ARM_PODF_DIVIDER +/* Define this to enable tracing */ + +#if 0 +# define IMXRT_TRACE_PODF_DIVIDER 1 +# define IMXRT_TRACE_CLK_SELECT CCM_CBCMR_TRACE_CLK_SEL_PLL2_PFD0 +#endif + /* LED definitions **********************************************************/ /* There are four LED status indicators located on the EVK Board. diff --git a/boards/arm/imxrt/imxrt1060-evk/include/board.h b/boards/arm/imxrt/imxrt1060-evk/include/board.h index 7ed99dcf583..0f4b7d997e9 100644 --- a/boards/arm/imxrt/imxrt1060-evk/include/board.h +++ b/boards/arm/imxrt/imxrt1060-evk/include/board.h @@ -98,23 +98,29 @@ * imxrt_config_gpio(GPIO_CCM_CLKO1); */ -#define BOARD_XTAL_FREQUENCY 24000000 -#define IMXRT_PRE_PERIPH_CLK_SEL CCM_CBCMR_PRE_PERIPH_CLK_SEL_PLL1 -#define IMXRT_PERIPH_CLK_SEL CCM_CBCDR_PERIPH_CLK_SEL_PRE_PERIPH -#define IMXRT_ARM_PLL_DIV_SELECT 100 -#define IMXRT_ARM_PODF_DIVIDER 2 -#define IMXRT_AHB_PODF_DIVIDER 1 -#define IMXRT_IPG_PODF_DIVIDER 4 -#define IMXRT_PERCLK_CLK_SEL CCM_CSCMR1_PERCLK_CLK_SEL_IPG_CLK_ROOT -#define IMXRT_PERCLK_PODF_DIVIDER 9 -#define IMXRT_SEMC_PODF_DIVIDER 8 -#define IMXRT_TRACE_CLK_SELECT CCM_CBCMR_TRACE_CLK_SEL_PLL2 +#define BOARD_XTAL_FREQUENCY 24000000 +#define IMXRT_PRE_PERIPH_CLK_SEL CCM_CBCMR_PRE_PERIPH_CLK_SEL_PLL1 +#define IMXRT_PERIPH_CLK_SEL CCM_CBCDR_PERIPH_CLK_SEL_PRE_PERIPH +#define IMXRT_ARM_PLL_DIV_SELECT 100 +#define IMXRT_ARM_PODF_DIVIDER 2 +#define IMXRT_AHB_PODF_DIVIDER 1 +#define IMXRT_IPG_PODF_DIVIDER 4 +#define IMXRT_PERCLK_CLK_SEL CCM_CSCMR1_PERCLK_CLK_SEL_IPG_CLK_ROOT +#define IMXRT_PERCLK_PODF_DIVIDER 9 +#define IMXRT_SEMC_PODF_DIVIDER 8 -#define IMXRT_SYS_PLL_SELECT CCM_ANALOG_PLL_SYS_DIV_SELECT_22 +#define IMXRT_SYS_PLL_SELECT CCM_ANALOG_PLL_SYS_DIV_SELECT_22 #define BOARD_CPU_FREQUENCY \ (BOARD_XTAL_FREQUENCY * (IMXRT_ARM_PLL_DIV_SELECT / 2)) / IMXRT_ARM_PODF_DIVIDER +/* Define this to enable tracing */ + +#if 0 +# define IMXRT_TRACE_PODF_DIVIDER 1 +# define IMXRT_TRACE_CLK_SELECT CCM_CBCMR_TRACE_CLK_SEL_PLL2_PFD0 +#endif + /* LED definitions **********************************************************/ /* There are four LED status indicators located on the EVK Board.