ENGR00216109 MX6Q/DL clock: VDOA needs OCRAM clock and DDR clock enabled

VDOA needs OCRAM clock and DDR clock enabled when video playback,
and set bus clock high to finish work quickly.

Signed-off-by: Wayne Zou <b36644@freescale.com>

diff --git a/arch/arm/mach-mx6/clock.c b/arch/arm/mach-mx6/clock.c
index 2173838c3a2c6b1653a1b5ca6e349c3f5d4b19c9..600cd8b23414f42c8277448051cd804ee6c627ae 100644 (file)
--- a/arch/arm/mach-mx6/clock.c
+++ b/arch/arm/mach-mx6/clock.c
@@ -1989,15 +1989,26 @@ static struct clk vdo_axi_clk = {
        .set_parent = _clk_vdo_axi_set_parent,
 };
 
-static struct clk vdoa_clk = {
+static struct clk vdoa_clk[] = {
+       {
        __INIT_CLK_DEBUG(vdoa_clk)
        .id = 0,
        .parent = &vdo_axi_clk,
-       .secondary = &ipg_clk,
        .enable_reg = MXC_CCM_CCGR2,
        .enable_shift = MXC_CCM_CCGRx_CG13_OFFSET,
        .enable = _clk_enable,
        .disable = _clk_disable,
+       .secondary = &vdoa_clk[1],
+       .flags = AHB_HIGH_SET_POINT | CPU_FREQ_TRIG_UPDATE,
+       },
+       {
+       .parent =  &mmdc_ch0_axi_clk[0],
+       .secondary = &vdoa_clk[2],
+       },
+       {
+       .parent =  &mx6fast1_clk,
+       .secondary = &ocram_clk,
+       },
 };
 
 static unsigned long _clk_gpt_get_rate(struct clk *clk)
@@ -5245,7 +5256,7 @@ static struct clk_lookup lookups[] = {
        _REGISTER_CLOCK(NULL, "hdmi_isfr_clk", hdmi_clk[0]),
        _REGISTER_CLOCK(NULL, "hdmi_iahb_clk", hdmi_clk[1]),
        _REGISTER_CLOCK(NULL, "mipi_pllref_clk", mipi_pllref_clk),
-       _REGISTER_CLOCK(NULL, "vdoa", vdoa_clk),
+       _REGISTER_CLOCK(NULL, "vdoa", vdoa_clk[0]),
        _REGISTER_CLOCK(NULL, NULL, aips_tz2_clk),
        _REGISTER_CLOCK(NULL, NULL, aips_tz1_clk),
        _REGISTER_CLOCK(NULL, "clko_clk", clko_clk),