From: Jason Chen Date: Fri, 15 Apr 2011 08:25:57 +0000 (+0800) Subject: ENGR00141363 ARM imx53 clock: change di0 clock default parent to pll3 X-Git-Tag: v3.0.35-fsl_4.1.0~2562 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7eb80894ad09abe0057dca4308c00eb56770e9b0;p=karo-tx-linux.git ENGR00141363 ARM imx53 clock: change di0 clock default parent to pll3 If enable both LVDS and one display device use external di clock, there will be conflict between their clock parent -- both use pll4 on mx53. So it need change di0 clock parent to pll3, and then uart parent need change to pll2 to avoid console mess. Signed-off-by: Jason Chen --- diff --git a/arch/arm/mach-mx5/clock.c b/arch/arm/mach-mx5/clock.c index c540f08292f0..64209fc437ac 100755 --- a/arch/arm/mach-mx5/clock.c +++ b/arch/arm/mach-mx5/clock.c @@ -5036,8 +5036,6 @@ int __init mx53_clocks_init(unsigned long ckil, unsigned long osc, unsigned long clk_set_parent(&esdhc2_clk[0], &esdhc1_clk[0]); clk_set_parent(&esdhc3_clk[0], &pll2_sw_clk); - clk_set_parent(&ipu_di_clk[0], &pll4_sw_clk); - #if 0 /*Setup the LPM bypass bits */ reg = __raw_readl(MXC_CCM_CLPCR); @@ -5146,7 +5144,6 @@ int __init mx53_clocks_init(unsigned long ckil, unsigned long osc, unsigned long clk_set_parent(&arm_axi_clk, &axi_b_clk); clk_set_parent(&ipu_clk[0], &axi_b_clk); - clk_set_parent(&uart_main_clk, &pll3_sw_clk); clk_set_parent(&gpu3d_clk, &axi_b_clk); clk_set_parent(&gpu2d_clk, &axi_b_clk);