| Message ID | 1353415261-30080-1-git-send-email-prakash.pm@ti.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
On 11/20/2012 6:11 PM, Manjunathappa wrote: > do clk_get on connection id "fck" to support OMAP based > platforms having multiple clocks for module. Without this > driver change clk_get fails on am335x. > > This patch is based on the discussion in community > http://marc.info/?l=linux-kernel&m=135166018907827&w=2 > > Signed-off-by: Manjunathappa <prakash.pm@ti.com> > Cc: Vaibhav Hiremath <hvaibhav@ti.com> For the mach-davinci changes: Acked-by: Sekhar Nori <nsekhar@ti.com> Florian, I assume you will want to take this through your tree? Thanks, Sekhar
Hi Tomi, On Tue, Nov 20, 2012 at 18:32:54, Nori, Sekhar wrote: > On 11/20/2012 6:11 PM, Manjunathappa wrote: > > do clk_get on connection id "fck" to support OMAP based > > platforms having multiple clocks for module. Without this > > driver change clk_get fails on am335x. > > > > This patch is based on the discussion in community > > http://marc.info/?l=linux-kernel&m=135166018907827&w=2 > > > > Signed-off-by: Manjunathappa <prakash.pm@ti.com> > > Cc: Vaibhav Hiremath <hvaibhav@ti.com> > > For the mach-davinci changes: > > Acked-by: Sekhar Nori <nsekhar@ti.com> > > Florian, > > I assume you will want to take this through your tree? > Could you please pull in this? Thanks, Prakash > Thanks, > Sekhar >
On 2012-11-23 06:33, Manjunathappa, Prakash wrote: > Hi Tomi, > > On Tue, Nov 20, 2012 at 18:32:54, Nori, Sekhar wrote: >> On 11/20/2012 6:11 PM, Manjunathappa wrote: >>> do clk_get on connection id "fck" to support OMAP based >>> platforms having multiple clocks for module. Without this >>> driver change clk_get fails on am335x. >>> >>> This patch is based on the discussion in community >>> http://marc.info/?l=linux-kernel&m=135166018907827&w=2 >>> >>> Signed-off-by: Manjunathappa <prakash.pm@ti.com> >>> Cc: Vaibhav Hiremath <hvaibhav@ti.com> >> >> For the mach-davinci changes: >> >> Acked-by: Sekhar Nori <nsekhar@ti.com> >> >> Florian, >> >> I assume you will want to take this through your tree? >> > > Could you please pull in this? Merged this and the "da8xx-fb: LCDC driver cleanup" to: git://gitorious.org/linux-omap-dss2/linux.git for-next Tomi
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index deee5c2..ee8504f 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -408,7 +408,7 @@ static struct clk_lookup da830_clks[] = { CLK(NULL, "pwm2", &pwm2_clk), CLK("eqep.0", NULL, &eqep0_clk), CLK("eqep.1", NULL, &eqep1_clk), - CLK("da8xx_lcdc.0", NULL, &lcdc_clk), + CLK("da8xx_lcdc.0", "fck", &lcdc_clk), CLK("davinci-mcasp.0", NULL, &mcasp0_clk), CLK("davinci-mcasp.1", NULL, &mcasp1_clk), CLK("davinci-mcasp.2", NULL, &mcasp2_clk), diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index b44dc84..bc75bdd 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -389,7 +389,7 @@ static struct clk_lookup da850_clks[] = { CLK(NULL, "rmii", &rmii_clk), CLK("davinci_emac.1", NULL, &emac_clk), CLK("davinci-mcasp.0", NULL, &mcasp_clk), - CLK("da8xx_lcdc.0", NULL, &lcdc_clk), + CLK("da8xx_lcdc.0", "fck", &lcdc_clk), CLK("davinci_mmc.0", NULL, &mmcsd0_clk), CLK("davinci_mmc.1", NULL, &mmcsd1_clk), CLK(NULL, "aemif", &aemif_clk), diff --git a/arch/arm/mach-davinci/pm_domain.c b/arch/arm/mach-davinci/pm_domain.c index 00946e2..c90250e 100644 --- a/arch/arm/mach-davinci/pm_domain.c +++ b/arch/arm/mach-davinci/pm_domain.c @@ -53,6 +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, }, }; static int __init davinci_pm_runtime_init(void) diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c index f0f21c8..bb68533 100644 --- a/drivers/video/da8xx-fb.c +++ b/drivers/video/da8xx-fb.c @@ -1248,7 +1248,7 @@ static int __devinit fb_probe(struct platform_device *device) goto err_request_mem; } - fb_clk = clk_get(&device->dev, NULL); + fb_clk = clk_get(&device->dev, "fck"); if (IS_ERR(fb_clk)) { dev_err(&device->dev, "Can not get device clock\n"); ret = -ENODEV;
do clk_get on connection id "fck" to support OMAP based platforms having multiple clocks for module. Without this driver change clk_get fails on am335x. This patch is based on the discussion in community http://marc.info/?l=linux-kernel&m=135166018907827&w=2 Signed-off-by: Manjunathappa <prakash.pm@ti.com> Cc: Vaibhav Hiremath <hvaibhav@ti.com> --- arch/arm/mach-davinci/da830.c | 2 +- arch/arm/mach-davinci/da850.c | 2 +- arch/arm/mach-davinci/pm_domain.c | 1 + drivers/video/da8xx-fb.c | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-)