hal/imxrt106x: fix enet PLL init

julianuziemblo · julianuziemblo · commit 023bc75f05e4 · 2025-03-20T10:56:09.000+01:00
- correct clk0 enable bit
- add bypass during clock frequency change

JIRA: RTOS-507
diff --git a/hal/armv7m/imxrt/10xx/imxrt10xx.c b/hal/armv7m/imxrt/10xx/imxrt10xx.c
@@ -968,7 +968,7 @@ void _imxrt_ccmInitEnetPll(u8 enclk0, u8 enclk1, u8 enclk2, u8 div0, u8 div1)
 	u32 enet_pll = ((div1 & 0x3) << 2) | (div0 & 0x3);
 
 	if (enclk0 != 0) {
-		enet_pll |= 1 << 12;
+		enet_pll |= 1 << 13;
 	}
 
 	if (enclk1 != 0) {
@@ -979,10 +979,15 @@ void _imxrt_ccmInitEnetPll(u8 enclk0, u8 enclk1, u8 enclk2, u8 div0, u8 div1)
 		enet_pll |= 1 << 21;
 	}
 
-	*(imxrt_common.ccm_analog + ccm_analog_pll_enet) = enet_pll;
+	/* enable bypass during clock frequency change */
+	*(imxrt_common.ccm_analog + ccm_analog_pll_enet) = 1 << 16;
+
+	*(imxrt_common.ccm_analog + ccm_analog_pll_enet) |= enet_pll;
 
 	while ((*(imxrt_common.ccm_analog + ccm_analog_pll_enet) & (1 << 31)) == 0) {
 	}
+
+	*(imxrt_common.ccm_analog + ccm_analog_pll_enet) &= ~(1 << 16);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -968,7 +968,7 @@ void _imxrt_ccmInitEnetPll(u8 enclk0, u8 enclk1, u8 enclk2, u8 div0, u8 div1)`
`968`	`968`	`u32 enet_pll = ((div1 & 0x3) << 2) \| (div0 & 0x3);`
`969`	`969`
`970`	`970`	`if (enclk0 != 0) {`
`971`		`- enet_pll \|= 1 << 12;`
	`971`	`+ enet_pll \|= 1 << 13;`
`972`	`972`	`}`
`973`	`973`
`974`	`974`	`if (enclk1 != 0) {`
`@@ -979,10 +979,15 @@ void _imxrt_ccmInitEnetPll(u8 enclk0, u8 enclk1, u8 enclk2, u8 div0, u8 div1)`
`979`	`979`	`enet_pll \|= 1 << 21;`
`980`	`980`	`}`
`981`	`981`
`982`		`- *(imxrt_common.ccm_analog + ccm_analog_pll_enet) = enet_pll;`
	`982`	`+ /* enable bypass during clock frequency change */`
	`983`	`+ *(imxrt_common.ccm_analog + ccm_analog_pll_enet) = 1 << 16;`
	`984`	`+`
	`985`	`+ *(imxrt_common.ccm_analog + ccm_analog_pll_enet) \|= enet_pll;`
`983`	`986`
`984`	`987`	`while ((*(imxrt_common.ccm_analog + ccm_analog_pll_enet) & (1 << 31)) == 0) {`
`985`	`988`	`}`
	`989`	`+`
	`990`	`+ *(imxrt_common.ccm_analog + ccm_analog_pll_enet) &= ~(1 << 16);`
`986`	`991`	`}`
`987`	`992`
`988`	`993`