summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortunik <tunik@mutagen.sam-solutions.net>2012-12-11 06:42:31 -0600
committerJustin Waters <justin.waters@timesys.com>2013-11-07 12:19:15 -0500
commit9042fa13199b15cde5e5d23a7be890dc7b99ec63 (patch)
treef273fa2eca452ffc0edc73a8685313fdd7b5c2d6
parent4ab86c72a3b67dd94a23fc62d5ef9acef6e72ea8 (diff)
fix ldb clock
Signed-off-by: Christian Hemp <c.hemp@phytec.de>
-rw-r--r--arch/arm/mach-mx6/clock.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-mx6/clock.c b/arch/arm/mach-mx6/clock.c
index 412423dd7879..cc2e624cd634 100644
--- a/arch/arm/mach-mx6/clock.c
+++ b/arch/arm/mach-mx6/clock.c
@@ -5477,8 +5477,15 @@ int __init mx6_clocks_init(unsigned long ckil, unsigned long osc,
if (cpu_is_mx6q() && (mx6q_revision() > IMX_CHIP_REVISION_1_1))
clk_set_parent(&gpu2d_core_clk[0], &pll3_usb_otg_main_clk);
+#if defined(CONFIG_MACH_MX6Q_PHYFLEX) || defined(CONFIG_MACH_MX6Q_PHYCARD)
+ /* PhyTec cards need to set pll5_video_main_clk parent
+ * insteade of pll2_pfd_352M */
+ clk_set_parent(&ldb_di0_clk, &pll5_video_main_clk);
+ clk_set_parent(&ldb_di1_clk, &pll5_video_main_clk);
+#else
clk_set_parent(&ldb_di0_clk, &pll2_pfd_352M);
clk_set_parent(&ldb_di1_clk, &pll2_pfd_352M);
+#endif
/* PCLK camera - J5 */
clk_set_parent(&clko2_clk, &osc_clk);