diff --git a/drivers/clock_control/clock_control_mcux_sim.c b/drivers/clock_control/clock_control_mcux_sim.c index 8af0db184b8..f1f9d09ea27 100644 --- a/drivers/clock_control/clock_control_mcux_sim.c +++ b/drivers/clock_control/clock_control_mcux_sim.c @@ -43,15 +43,37 @@ static int mcux_sim_get_subsys_rate(struct device *dev, return 0; } +#ifdef DT_INST_0_NXP_KINETIS_KE1XF_SIM +#define NXP_KINETIS_SIM_LABEL DT_INST_0_NXP_KINETIS_KE1XF_SIM_LABEL +#ifdef DT_INST_0_NXP_KINETIS_KE1XF_SIM_CLKOUT_SOURCE + #define NXP_KINETIS_SIM_CLKOUT_SOURCE \ + DT_INST_0_NXP_KINETIS_KE1XF_SIM_CLKOUT_SOURCE +#endif +#ifdef DT_INST_0_NXP_KINETIS_KE1XF_SIM_CLKOUT_DIVIDER + #define NXP_KINETIS_SIM_CLKOUT_DIVIDER \ + DT_INST_0_NXP_KINETIS_KE1XF_SIM_CLKOUT_DIVIDER +#endif +#else +#define NXP_KINETIS_SIM_LABEL DT_INST_0_NXP_KINETIS_SIM_LABEL +#ifdef DT_INST_0_NXP_KINETIS_SIM_CLKOUT_SOURCE + #define NXP_KINETIS_SIM_CLKOUT_SOURCE \ + DT_INST_0_NXP_KINETIS_SIM_CLKOUT_SOURCE +#endif +#ifdef DT_INST_0_NXP_KINETIS_SIM_CLKOUT_DIVIDER + #define NXP_KINETIS_SIM_CLKOUT_DIVIDER \ + DT_INST_0_NXP_KINETIS_SIM_CLKOUT_DIVIDER +#endif +#endif + static int mcux_sim_init(struct device *dev) { -#ifdef DT_SIM_CLKOUT_DIVIDER +#ifdef NXP_KINETIS_SIM_CLKOUT_DIVIDER SIM->CHIPCTL = (SIM->CHIPCTL & ~SIM_CHIPCTL_CLKOUTDIV_MASK) - | SIM_CHIPCTL_CLKOUTDIV(DT_SIM_CLKOUT_DIVIDER); + | SIM_CHIPCTL_CLKOUTDIV(NXP_KINETIS_SIM_CLKOUT_DIVIDER); #endif -#ifdef DT_SIM_CLKOUT_SOURCE +#ifdef NXP_KINETIS_SIM_CLKOUT_SOURCE SIM->CHIPCTL = (SIM->CHIPCTL & ~SIM_CHIPCTL_CLKOUTSEL_MASK) - | SIM_CHIPCTL_CLKOUTSEL(DT_SIM_CLKOUT_SOURCE); + | SIM_CHIPCTL_CLKOUTSEL(NXP_KINETIS_SIM_CLKOUT_SOURCE); #endif return 0; @@ -63,7 +85,7 @@ static const struct clock_control_driver_api mcux_sim_driver_api = { .get_rate = mcux_sim_get_subsys_rate, }; -DEVICE_AND_API_INIT(mcux_sim, DT_SIM_NAME, +DEVICE_AND_API_INIT(mcux_sim, NXP_KINETIS_SIM_LABEL, &mcux_sim_init, NULL, NULL, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, diff --git a/soc/arm/nxp_kinetis/k2x/dts_fixup.h b/soc/arm/nxp_kinetis/k2x/dts_fixup.h index 84e8964a80f..4cd14774cf8 100644 --- a/soc/arm/nxp_kinetis/k2x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/k2x/dts_fixup.h @@ -12,9 +12,6 @@ #define DT_ADC_0_IRQ_PRI DT_NXP_KINETIS_ADC16_4003B000_IRQ_0_PRIORITY #define DT_ADC_0_NAME DT_NXP_KINETIS_ADC16_4003B000_LABEL -#define DT_SIM_BASE_ADDRESS DT_NXP_KINETIS_SIM_40047000_BASE_ADDRESS -#define DT_SIM_NAME DT_NXP_KINETIS_SIM_40047000_LABEL - #define DT_FLASH_DEV_BASE_ADDRESS DT_NXP_KINETIS_FTFE_40020000_BASE_ADDRESS #define DT_FLASH_DEV_NAME DT_NXP_KINETIS_FTFE_40020000_LABEL diff --git a/soc/arm/nxp_kinetis/k6x/dts_fixup.h b/soc/arm/nxp_kinetis/k6x/dts_fixup.h index ffafba81402..7dc73aec0df 100644 --- a/soc/arm/nxp_kinetis/k6x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/k6x/dts_fixup.h @@ -13,9 +13,6 @@ #define DT_ADC_1_IRQ_PRI DT_NXP_KINETIS_ADC16_400BB000_IRQ_0_PRIORITY #define DT_ADC_1_NAME DT_NXP_KINETIS_ADC16_400BB000_LABEL -#define DT_SIM_BASE_ADDRESS DT_NXP_KINETIS_SIM_40047000_BASE_ADDRESS -#define DT_SIM_NAME DT_NXP_KINETIS_SIM_40047000_LABEL - #define DT_RTC_0_NAME DT_NXP_KINETIS_RTC_4003D000_LABEL #define DT_FLASH_DEV_BASE_ADDRESS DT_NXP_KINETIS_FTFE_40020000_BASE_ADDRESS diff --git a/soc/arm/nxp_kinetis/k8x/dts_fixup.h b/soc/arm/nxp_kinetis/k8x/dts_fixup.h index 3c70c4b4a52..ebf316ba7eb 100644 --- a/soc/arm/nxp_kinetis/k8x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/k8x/dts_fixup.h @@ -7,14 +7,6 @@ /* SoC level DTS fixup file */ #define DT_NUM_IRQ_PRIO_BITS DT_ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define DT_SIM_NAME DT_NXP_KINETIS_SIM_40047000_LABEL -#ifdef DT_NXP_KINETIS_SIM_40047000_CLKOUT_DIVIDER -#define DT_SIM_CLKOUT_DIVIDER DT_NXP_KINETIS_SIM_40047000_CLKOUT_DIVIDER -#endif -#ifdef DT_NXP_KINETIS_SIM_40047000_CLKOUT_SOURCE -#define DT_SIM_CLKOUT_SOURCE DT_NXP_KINETIS_SIM_40047000_CLKOUT_SOURCE -#endif - #define DT_FLASH_DEV_BASE_ADDRESS DT_NXP_KINETIS_FTFA_40020000_BASE_ADDRESS #define DT_FLASH_DEV_NAME DT_NXP_KINETIS_FTFA_40020000_LABEL diff --git a/soc/arm/nxp_kinetis/ke1xf/dts_fixup.h b/soc/arm/nxp_kinetis/ke1xf/dts_fixup.h index 8cc9454045a..0e60d2ac7a7 100644 --- a/soc/arm/nxp_kinetis/ke1xf/dts_fixup.h +++ b/soc/arm/nxp_kinetis/ke1xf/dts_fixup.h @@ -7,14 +7,6 @@ /* SoC level DTS fixup file */ #define DT_NUM_IRQ_PRIO_BITS DT_ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define DT_SIM_NAME DT_NXP_KINETIS_KE1XF_SIM_40048000_LABEL -#ifdef DT_NXP_KINETIS_KE1XF_SIM_40048000_CLKOUT_DIVIDER -#define DT_SIM_CLKOUT_DIVIDER DT_NXP_KINETIS_KE1XF_SIM_40048000_CLKOUT_DIVIDER -#endif /* DT_NXP_KINETIS_KE1XF_SIM_40048000_CLKOUT_DIVIDER */ -#ifdef DT_NXP_KINETIS_KE1XF_SIM_40048000_CLKOUT_SOURCE -#define DT_SIM_CLKOUT_SOURCE DT_NXP_KINETIS_KE1XF_SIM_40048000_CLKOUT_SOURCE -#endif /* DT_NXP_KINETIS_KE1XF_SIM_40048000_CLKOUT_SOURCE */ - #define DT_RTC_0_NAME DT_NXP_KINETIS_RTC_4003D000_LABEL #define DT_FLASH_DEV_BASE_ADDRESS DT_NXP_KINETIS_FTFE_40020000_BASE_ADDRESS diff --git a/soc/arm/nxp_kinetis/kl2x/dts_fixup.h b/soc/arm/nxp_kinetis/kl2x/dts_fixup.h index 09998933eb9..3d69463e08a 100644 --- a/soc/arm/nxp_kinetis/kl2x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/kl2x/dts_fixup.h @@ -8,9 +8,6 @@ #define DT_ADC_0_IRQ_PRI DT_NXP_KINETIS_ADC16_4003B000_IRQ_0_PRIORITY #define DT_ADC_0_NAME DT_NXP_KINETIS_ADC16_4003B000_LABEL -#define DT_SIM_BASE_ADDRESS DT_NXP_KINETIS_SIM_40047000_BASE_ADDRESS -#define DT_SIM_NAME DT_NXP_KINETIS_SIM_40047000_LABEL - #define DT_FLASH_DEV_BASE_ADDRESS DT_NXP_KINETIS_FTFA_40020000_BASE_ADDRESS #define DT_FLASH_DEV_NAME DT_NXP_KINETIS_FTFA_40020000_LABEL diff --git a/soc/arm/nxp_kinetis/kv5x/dts_fixup.h b/soc/arm/nxp_kinetis/kv5x/dts_fixup.h index 80c05ab5491..dfc2da44638 100644 --- a/soc/arm/nxp_kinetis/kv5x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/kv5x/dts_fixup.h @@ -7,14 +7,6 @@ /* SoC level DTS fixup file */ #define DT_NUM_IRQ_PRIO_BITS DT_ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define DT_SIM_NAME DT_NXP_KINETIS_SIM_40047000_LABEL -#ifdef DT_NXP_KINETIS_SIM_40047000_CLKOUT_DIVIDER -#define DT_SIM_CLKOUT_DIVIDER DT_NXP_KINETIS_SIM_40047000_CLKOUT_DIVIDER -#endif /* DT_NXP_KINETIS_SIM_40047000_CLKOUT_DIVIDER */ -#ifdef DT_NXP_KINETIS_SIM_40047000_CLKOUT_SOURCE -#define DT_SIM_CLKOUT_SOURCE DT_NXP_KINETIS_SIM_40047000_CLKOUT_SOURCE -#endif /* DT_NXP_KINETIS_SIM_40047000_CLKOUT_SOURCE */ - #define DT_FLASH_DEV_BASE_ADDRESS DT_NXP_KINETIS_FTFE_40020000_BASE_ADDRESS #define DT_FLASH_DEV_NAME DT_NXP_KINETIS_FTFE_40020000_LABEL diff --git a/soc/arm/nxp_kinetis/kwx/dts_fixup.h b/soc/arm/nxp_kinetis/kwx/dts_fixup.h index 0b4110c97aa..53e42136596 100644 --- a/soc/arm/nxp_kinetis/kwx/dts_fixup.h +++ b/soc/arm/nxp_kinetis/kwx/dts_fixup.h @@ -7,9 +7,6 @@ #define DT_ADC_0_IRQ_PRI DT_NXP_KINETIS_ADC16_4003B000_IRQ_0_PRIORITY #define DT_ADC_0_NAME DT_NXP_KINETIS_ADC16_4003B000_LABEL -#define DT_SIM_BASE_ADDRESS DT_NXP_KINETIS_SIM_40047000_BASE_ADDRESS -#define DT_SIM_NAME DT_NXP_KINETIS_SIM_40047000_LABEL - #define DT_RTC_0_NAME DT_NXP_KINETIS_RTC_4003D000_LABEL #if defined(CONFIG_SOC_MKW22D5) || defined(CONFIG_SOC_MKW24D5)