On 4/2/2013 5:14 PM, Prabhakar lad wrote: > From: Lad, Prabhakar <prabhakar.csengg@xxxxxxxxx> > > By default the VPSS clocks were enabled in capture driver > for davinci family which creates duplicates for dm355/dm365/dm644x. > This patch adds support to enable the VPSS clocks in VPSS driver, > which avoids duplication of code and also adding clock aliases. > > This patch uses PM runtime API to enable/disable instead common clock > framework. con_ids for master and slave clocks of vpss is added in pm_domain Common clock framework in not (yet) used on DaVinci, so this is misleading. > diff --git a/arch/arm/mach-davinci/pm_domain.c b/arch/arm/mach-davinci/pm_domain.c > index c90250e..445b10b 100644 > --- a/arch/arm/mach-davinci/pm_domain.c > +++ b/arch/arm/mach-davinci/pm_domain.c > @@ -53,7 +53,7 @@ static struct dev_pm_domain davinci_pm_domain = { > > static struct pm_clk_notifier_block platform_bus_notifier = { > .pm_domain = &davinci_pm_domain, > - .con_ids = { "fck", NULL, }, > + .con_ids = { "fck", "master", "slave", NULL, }, NULL is sentinel so you can drop the ',' after that. Apart from that, for the mach-davinci parts: Acked-by: Sekhar Nori <nsekhar@xxxxxx> Thanks, Sekhar -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html