]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
video: da8xx-fb: clk_get on connection id fck
authorManjunathappa <prakash.pm@ti.com>
Tue, 20 Nov 2012 12:41:01 +0000 (18:11 +0530)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 27 Nov 2012 09:52:40 +0000 (11:52 +0200)
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>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
arch/arm/mach-davinci/da830.c
arch/arm/mach-davinci/da850.c
arch/arm/mach-davinci/pm_domain.c
drivers/video/da8xx-fb.c

index 510648e0394b80d4f6186f93ae4516f7624d7dbb..678a54a64daee17b09cf096cf4bcb2f31199383b 100644 (file)
@@ -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),
index b90c172d55413dc6e301ba15afff70f721d3c704..fda70484815a2e6072775d6224675ae6a7321532 100644 (file)
@@ -396,7 +396,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),
index 00946e23c1ee3100a2027a2e1d918d261ca89517..c90250e3bef8068f0333c2387fb9ae96c84cd7a3 100644 (file)
@@ -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)
index 3fd9ec5f993a13be0a51f6c2ae96106546042f3d..f2ceb65f523b5a3fb32575193e46c187baed3d4a 100644 (file)
@@ -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;