Skip to contentSkip to conversation

imx: mx6: correct enable_fec_anatop_clock

PATCH New Peng Fan 2 participants 2 messages Sep 6, 2015 – Oct 2, 2015 Arm (32-bit)

lore
Share & tools
lore

Peng Fan

author
#0 lore raw

PATCH 1/1 imx: mx6: correct enable_fec_anatop_clock

We should follow 'read->set/clr bit->write' flow for enable_fec_anatop_clock, otherwise we may overridden configuration before enable_fec_anatop_clock.

Signed-off-by Peng Fan <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Cc: Fabio Estevam <[email protected]>
---
 arch/arm/cpu/armv7/mx6/clock.c | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/cpu/armv7/mx6/clock.c +2 -0
index ba6cc75..11efd12 100644
@@ -535,6 +535,8 @@ int enable_fec_anatop_clock(int fec_id, enum enet_freq freq)
 	if (freq < ENET_25MHZ || freq > ENET_125MHZ)
 		return -EINVAL;
 
+	reg = readl(&anatop->pll_enet);
+
 	if (fec_id == 0) {
 		reg &= ~BM_ANADIG_PLL_ENET_DIV_SELECT;
 		reg |= BF_ANADIG_PLL_ENET_DIV_SELECT(freq);
Signature · 1 line
1.8.4
#1 lore raw

PATCH 1/1 imx: mx6: correct enable_fec_anatop_clock

Quoted 16 lines · Peng Fan

We should follow 'read->set/clr bit->write' flow for enable_fec_anatop_clock, otherwise we may overridden configuration before enable_fec_anatop_clock.

Signed-off-by Peng Fan <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Cc: Fabio Estevam <[email protected]>
---
 arch/arm/cpu/armv7/mx6/clock.c | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/cpu/armv7/mx6/clock.c +0 -0
index ba6cc75..11efd12 100644

arch/arm/cpu/armv7/mx6/clock.c int enable_fec_anatop_clock(int fec_id, enum enet_freq freq) · line 542

Quoted 8 lines
arch/arm/cpu/armv7/mx6/clock.c +2 -0
@@ -535,6 +535,8 @@ int enable_fec_anatop_clock(int fec_id, enum enet_freq freq)
 	if (freq < ENET_25MHZ || freq > ENET_125MHZ)
 		return -EINVAL;
 
+	reg = readl(&anatop->pll_enet);
+
 	if (fec_id == 0) {
 		reg &= ~BM_ANADIG_PLL_ENET_DIV_SELECT;
 		reg |= BF_ANADIG_PLL_ENET_DIV_SELECT(freq);

Applied to u-boot-imx, thanks!

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
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
=====================================================================