diff options
-rw-r--r-- | arch/arm/mach-omap2/clock2xxx_data.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/clock2xxx_data.c b/arch/arm/mach-omap2/clock2xxx_data.c index d08d545f84f1..aa37761fa457 100644 --- a/arch/arm/mach-omap2/clock2xxx_data.c +++ b/arch/arm/mach-omap2/clock2xxx_data.c | |||
@@ -512,7 +512,7 @@ static struct clk dsp_ick = { | |||
512 | .name = "dsp_ick", /* apparently ipi and isp */ | 512 | .name = "dsp_ick", /* apparently ipi and isp */ |
513 | .ops = &clkops_omap2_dflt_wait, | 513 | .ops = &clkops_omap2_dflt_wait, |
514 | .parent = &dsp_irate_ick, | 514 | .parent = &dsp_irate_ick, |
515 | .flags = DELAYED_APP | CONFIG_PARTICIPANT, | 515 | .flags = CONFIG_PARTICIPANT, |
516 | .enable_reg = OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_ICLKEN), | 516 | .enable_reg = OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_ICLKEN), |
517 | .enable_bit = OMAP2420_EN_DSP_IPI_SHIFT, /* for ipi */ | 517 | .enable_bit = OMAP2420_EN_DSP_IPI_SHIFT, /* for ipi */ |
518 | }; | 518 | }; |
@@ -522,7 +522,7 @@ static struct clk iva2_1_ick = { | |||
522 | .name = "iva2_1_ick", | 522 | .name = "iva2_1_ick", |
523 | .ops = &clkops_omap2_dflt_wait, | 523 | .ops = &clkops_omap2_dflt_wait, |
524 | .parent = &dsp_irate_ick, | 524 | .parent = &dsp_irate_ick, |
525 | .flags = DELAYED_APP | CONFIG_PARTICIPANT, | 525 | .flags = CONFIG_PARTICIPANT, |
526 | .enable_reg = OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_FCLKEN), | 526 | .enable_reg = OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_FCLKEN), |
527 | .enable_bit = OMAP24XX_CM_FCLKEN_DSP_EN_DSP_SHIFT, | 527 | .enable_bit = OMAP24XX_CM_FCLKEN_DSP_EN_DSP_SHIFT, |
528 | }; | 528 | }; |
@@ -779,7 +779,7 @@ static struct clk gfx_ick = { | |||
779 | .name = "gfx_ick", /* From l3 */ | 779 | .name = "gfx_ick", /* From l3 */ |
780 | .ops = &clkops_omap2_dflt_wait, | 780 | .ops = &clkops_omap2_dflt_wait, |
781 | .parent = &core_l3_ck, | 781 | .parent = &core_l3_ck, |
782 | .flags = DELAYED_APP | CONFIG_PARTICIPANT, | 782 | .flags = CONFIG_PARTICIPANT, |
783 | .clkdm_name = "gfx_clkdm", | 783 | .clkdm_name = "gfx_clkdm", |
784 | .enable_reg = OMAP_CM_REGADDR(GFX_MOD, CM_ICLKEN), | 784 | .enable_reg = OMAP_CM_REGADDR(GFX_MOD, CM_ICLKEN), |
785 | .enable_bit = OMAP_EN_GFX_SHIFT, | 785 | .enable_bit = OMAP_EN_GFX_SHIFT, |
@@ -2068,7 +2068,6 @@ static struct clk mmchsdb2_fck = { | |||
2068 | static struct clk virt_prcm_set = { | 2068 | static struct clk virt_prcm_set = { |
2069 | .name = "virt_prcm_set", | 2069 | .name = "virt_prcm_set", |
2070 | .ops = &clkops_null, | 2070 | .ops = &clkops_null, |
2071 | .flags = DELAYED_APP, | ||
2072 | .parent = &mpu_ck, /* Indexed by mpu speed, no parent */ | 2071 | .parent = &mpu_ck, /* Indexed by mpu speed, no parent */ |
2073 | .recalc = &omap2_table_mpu_recalc, /* sets are keyed on mpu rate */ | 2072 | .recalc = &omap2_table_mpu_recalc, /* sets are keyed on mpu rate */ |
2074 | .set_rate = &omap2_select_table_rate, | 2073 | .set_rate = &omap2_select_table_rate, |