Skip to contentSkip to conversation

mx6: clock: Fix the calculation of PLL_ENET frequency

PATCH New Fabio Estevam 2 participants 2 messages Dec 3, 2013 – Dec 17, 2013 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mx6: clock: Fix the calculation of PLL_ENET frequency

From: Fabio Estevam <[email protected]>

According to the mx6 quad reference manual, the DIV_SELECT field of register CCM_ANALOG_PLL_ENETn has the following meaning:

"Controls the frequency of the ethernet reference clock.
- 00 - 25MHz
- 01 - 50MHz
- 10 - 100MHz
- 11 - 125MHz"

Current logic does not handle the 25MHz case correctly, so fix it.

---
Changes since v1:
- Use a single expression that correctly computes the frequency for all the DIV_SELECT combination (Troy Kisky)

 arch/arm/cpu/armv7/mx6/clock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/cpu/armv7/mx6/clock.c +1 -1
index 873d9d0..20c7e70 100644
@@ -94,7 +94,7 @@ static u32 decode_pll(enum pll_clocks pll, u32 infreq)
 		div = __raw_readl(&imx_ccm->analog_pll_enet);
 		div &= BM_ANADIG_PLL_ENET_DIV_SELECT;
 
-		return (div == 3 ? 125000000 : 25000000 * (div << 1));
+		return 25000000 * (div + (div >> 1) + 1);
 	default:
 		return 0;
 	}
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH v2 1/1 mx6: clock: Fix the calculation of PLL_ENET frequency

Quoted 11 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

According to the mx6 quad reference manual, the DIV_SELECT field of register CCM_ANALOG_PLL_ENETn has the following meaning:

"Controls the frequency of the ethernet reference clock.
- 00 - 25MHz
- 01 - 50MHz
- 10 - 100MHz
- 11 - 125MHz"

Quoted 5 lines

Current logic does not handle the 25MHz case correctly, so fix it.

---

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================