diff options
author | guoyin.chen <guoyin.chen@freescale.com> | 2014-08-06 10:00:05 +0800 |
---|---|---|
committer | guoyin.chen <guoyin.chen@freescale.com> | 2014-08-06 10:00:05 +0800 |
commit | 081c167e5bbd7232c1164c605a00f2ab218b9846 (patch) | |
tree | d09acad06fbf625647912213195faf9079f01637 /arch | |
parent | 51fba2157004590376cee59dca54f7e316145b11 (diff) | |
parent | ea837f36ea7e0074efa13244674bf71a73885124 (diff) |
Merge remote-tracking branch 'remotes/fsl-linux-sdk/imx_3.10.31_1.1.0_beta' into imx_3.10.y_android_kk4.4.3-beta
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-imx/clk-imx6q.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c index 8373e471d77f..25734ed936c8 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c @@ -679,11 +679,27 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) imx_clk_set_parent(clk[pcie_axi_sel], clk[axi]); /* gpu clock initilazation */ + /* + * On mx6dl, 2d core clock sources(sel, podf) is from 3d + * shader core clock, but 3d shader clock multiplexer of + * mx6dl is different. For instance the equivalent of + * pll2_pfd_594M on mx6q is pll2_pfd_528M on mx6dl. + * Make a note here. + */ imx_clk_set_parent(clk[gpu3d_shader_sel], clk[pll2_pfd1_594m]); - imx_clk_set_rate(clk[gpu3d_shader], 594000000); - imx_clk_set_parent(clk[gpu3d_core_sel], clk[mmdc_ch0_axi]); - imx_clk_set_rate(clk[gpu3d_core], 528000000); - imx_clk_set_parent(clk[gpu2d_core_sel], clk[pll3_usb_otg]); + if (cpu_is_imx6dl()) { + imx_clk_set_rate(clk[gpu2d_core], 528000000); + /* for mx6dl, change gpu3d_core parent to 594_PFD*/ + imx_clk_set_parent(clk[gpu3d_core_sel], clk[pll2_pfd1_594m]); + imx_clk_set_rate(clk[gpu3d_core], 528000000); + } else if (cpu_is_imx6q()) { + imx_clk_set_rate(clk[gpu3d_shader], 594000000); + imx_clk_set_parent(clk[gpu3d_core_sel], clk[mmdc_ch0_axi]); + imx_clk_set_rate(clk[gpu3d_core], 528000000); + imx_clk_set_parent(clk[gpu2d_core_sel], clk[pll3_usb_otg]); + } + + for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) imx_clk_prepare_enable(clk[clks_init_on[i]]); |