diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-28 17:04:54 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-28 17:04:54 +0000 |
| commit | 588956edf5bb33741de41687677f21f5c37671da (patch) | |
| tree | 70508bb41cc7320b3b798cdda405f20deff59a39 /arch/arm/mach-imx/clk-imx6q.c | |
| parent | 750d40d7dfd65c0b8babb67137843db8a9a99140 (diff) | |
| parent | 9347e87f7cd66d6ca96ba7d0b4b1cacebea4d096 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-rt-15.02lsk-v3.14-rt-14.02
Diffstat (limited to 'arch/arm/mach-imx/clk-imx6q.c')
| -rw-r--r-- | arch/arm/mach-imx/clk-imx6q.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c index 4d677f442539..01a5765a8b26 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c @@ -161,8 +161,8 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) post_div_table[1].div = 1; post_div_table[2].div = 1; video_div_table[1].div = 1; - video_div_table[2].div = 1; - }; + video_div_table[3].div = 1; + } /* type name parent_name base div_mask */ clk[pll1_sys] = imx_clk_pllv3(IMX_PLLV3_SYS, "pll1_sys", "osc", base, 0x7f); |