]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ENGR00161761 - [MX6] : workaround for IEEE 1588.
authorFugang Duan <B38611@freescale.com>
Wed, 9 Nov 2011 06:39:14 +0000 (14:39 +0800)
committerOliver Wendt <ow@karo-electronics.de>
Mon, 30 Sep 2013 12:09:59 +0000 (14:09 +0200)
- IEEE 1588 use 40MHz divided from pll3 480MHz. And use 480M ddr
  init script. So, cannot disable pll3 in clock.c file.

Signed-off-by: Fugang Duan <B38611@freescale.com>
arch/arm/mach-mx6/clock.c

index d3c352cc8644b88aead81f9451a3c6cb632f6c82..f5c7ba08af24fc6b554302cfd4276412de7db9f5 100644 (file)
@@ -4808,12 +4808,14 @@ int __init mx6_clocks_init(unsigned long ckil, unsigned long osc,
        pll2_pfd_352M.disable(&pll2_pfd_352M);
        pll2_pfd_594M.disable(&pll2_pfd_594M);
 
+#if !defined(CONFIG_FEC_1588)
        pll3_pfd_454M.disable(&pll3_pfd_454M);
        pll3_pfd_508M.disable(&pll3_pfd_508M);
        pll3_pfd_540M.disable(&pll3_pfd_540M);
        pll3_pfd_720M.disable(&pll3_pfd_720M);
 
        pll3_usb_otg_main_clk.disable(&pll3_usb_otg_main_clk);
+#endif
        pll4_audio_main_clk.disable(&pll4_audio_main_clk);
        pll5_video_main_clk.disable(&pll5_video_main_clk);
        pll6_MLB_main_clk.disable(&pll6_MLB_main_clk);