Commit 1f315f17 authored by Declan Snyder's avatar Declan Snyder Committed by Daniel DeGrasse
Browse files

soc: nxp: imxrt: Clean up INIT_SYS_PLL 



Don't force select INIT_SYS_PLL at SOC level. Instead use default y so
that board can unset it. Keep previous case where we would default y
which was only on RT1040. Also, this config is not used in RT1170 soc,
so move it to RT10xx series kconfig instead of family level. And it
appears to be on all the RT10xx, so ifdef is not needed.

Signed-off-by: default avatarDeclan Snyder <declan.snyder@nxp.com>
parent ef2271ec

soc/nxp/imxrt/imxrt10xx/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ config SOC_MIMXRT1042 
	select HAS_MCUX_SEMC

	select CPU_HAS_FPU_DOUBLE_PRECISION

	select CPU_HAS_ARM_MPU

	select INIT_SYS_PLL



config SOC_MIMXRT1052

	select HAS_MCUX_ELCDIF
@@ -129,6 +128,10 @@ config INIT_PLL6_500M 
		   SOC_MIMXRT1021 || SOC_MIMXRT1024

	select INIT_ENET_PLL



config INIT_SYS_PLL

	bool "Initialize System PLL"

	default y if SOC_MIMXRT1042



config INIT_VIDEO_PLL

	default y if DISPLAY_MCUX_ELCDIF

	depends on !SOC_MIMXRT1011 && !SOC_MIMXRT1015 && \

soc/nxp/imxrt/imxrt10xx/soc.c

+10 −13
Original line number Diff line number Diff line
@@ -33,16 +33,6 @@ 
		     DT_PROP(DT_CHILD(CCM_NODE, podf), clock_div) <= (b), \

		     #podf " is out of supported range (" #a ", " #b ")")



#if CONFIG_INIT_SYS_PLL

/* Configure System PLL */

const clock_sys_pll_config_t sysPllConfig = {

	.loopDivider = (DT_PROP(DT_CHILD(CCM_NODE, sys_pll), loop_div) - 20) / 2,

	.numerator = DT_PROP(DT_CHILD(CCM_NODE, sys_pll), numerator),

	.denominator = DT_PROP(DT_CHILD(CCM_NODE, sys_pll), denominator),

	.src = DT_PROP(DT_CHILD(CCM_NODE, sys_pll), src),

};

#endif



#if CONFIG_USB_DC_NXP_EHCI

/* USB PHY configuration */

#define BOARD_USB_PHY_D_CAL (0x0CU)
@@ -152,9 +142,16 @@ __weak void clock_init(void) 
	CLOCK_InitVideoPll(&videoPllConfig);

#endif



#if CONFIG_INIT_SYS_PLL

	const clock_sys_pll_config_t sysPllConfig = {

		.loopDivider = (DT_PROP(DT_CHILD(CCM_NODE, sys_pll), loop_div) - 20) / 2,

		.numerator = DT_PROP(DT_CHILD(CCM_NODE, sys_pll), numerator),

		.denominator = DT_PROP(DT_CHILD(CCM_NODE, sys_pll), denominator),

		.src = DT_PROP(DT_CHILD(CCM_NODE, sys_pll), src),

	};



	if (IS_ENABLED(CONFIG_INIT_SYS_PLL)) {

		CLOCK_InitSysPll(&sysPllConfig);

#endif

	}



#if DT_NODE_EXISTS(DT_CHILD(CCM_NODE, arm_podf))

	/* Set ARM PODF */

CRA Git | Maintained and supported by SUSTech CRA and CCSE