From f47f0c97038ac0dc522bcdce9b418c038766b252 Mon Sep 17 00:00:00 2001 From: Yong Shen Date: Mon, 10 Jan 2011 20:08:54 +0800 Subject: [PATCH] --- yaml --- r: 231361 b: refs/heads/master c: 2cad26a9d583ea16bb23a8cdc2f7a7df4662a72c h: refs/heads/master i: 231359: 7e5f484d632f9482f643f70e77e9a364a1720333 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx5/clock-mx51-mx53.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 02a78513b30d..2d31d60397b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0a6ba5ffbb52b5e8fccd1a013e770e1b0af03ba +refs/heads/master: 2cad26a9d583ea16bb23a8cdc2f7a7df4662a72c diff --git a/trunk/arch/arm/mach-mx5/clock-mx51-mx53.c b/trunk/arch/arm/mach-mx5/clock-mx51-mx53.c index 64fe24900a4d..8f142294e10e 100644 --- a/trunk/arch/arm/mach-mx5/clock-mx51-mx53.c +++ b/trunk/arch/arm/mach-mx5/clock-mx51-mx53.c @@ -1370,7 +1370,6 @@ int __init mx51_clocks_init(unsigned long ckil, unsigned long osc, clk_tree_init(); - clk_set_parent(&uart_root_clk, &pll3_sw_clk); clk_enable(&cpu_clk); clk_enable(&main_bus_clk); @@ -1413,6 +1412,7 @@ int __init mx53_clocks_init(unsigned long ckil, unsigned long osc, clk_tree_init(); + clk_set_parent(&uart_root_clk, &pll3_sw_clk); clk_enable(&cpu_clk); clk_enable(&main_bus_clk);