diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2015-08-05 18:03:58 +0200 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2015-08-05 18:03:58 +0200 |
| commit | c1944bbc667e0b9ee65dce0e10b75fb9dc856291 (patch) | |
| tree | cca82ff95a6e41b1969817d77ff195fef6a1ff8a /arch | |
| parent | 756ad5099e37fe0c3782236a53c7da885460c810 (diff) | |
| parent | 2cb415fc83bc733147f015a3380fc4e1bafff389 (diff) | |
Merge branch 'vf610-dcu-4.1' into toradex_vf_4.1-next
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/clk-vf610.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clk-vf610.c b/arch/arm/mach-imx/clk-vf610.c index e0f4b90cfad8..6e739454ff89 100644 --- a/arch/arm/mach-imx/clk-vf610.c +++ b/arch/arm/mach-imx/clk-vf610.c @@ -486,7 +486,6 @@ static void __init vf610_clocks_init(struct device_node *ccm_node) clk_set_rate(clk[VF610_CLK_PLL4_MAIN_DIV], 147456000); clk_set_parent(clk[VF610_CLK_DCU0_SEL], clk[VF610_CLK_PLL1_PFD2]); - clk_set_rate(clk[VF610_CLK_DCU0_DIV], 113200000); for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) clk_prepare_enable(clk[clks_init_on[i]]); |