Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0

This commit is contained in:
lintao
2013-08-02 18:13:13 +08:00

View File

@@ -3578,7 +3578,11 @@ static void __init rk30_clock_common_init(unsigned long gpll_rate, unsigned long
clk_set_parent_nolock(&aclk_gpu, &general_pll_clk);
clk_set_rate_nolock(&aclk_gpu, 200 * MHZ);
clk_set_rate_nolock(&clk_uart0, 48000000);
if (0 == pll_flag) {
clk_set_rate_nolock(&clk_uart0, 48000000);
} else {
clk_set_rate_nolock(&clk_uart0, 49500000);
}
clk_set_rate_nolock(&clk_sdmmc, 24750000);
clk_set_rate_nolock(&clk_sdio, 24750000);
}