提交 81cec3c7 编写于 作者: M Manjunathappa 提交者: Tomi Valkeinen

video: da8xx-fb: clk_get on connection id fck

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=2Signed-off-by: NManjunathappa <prakash.pm@ti.com>
Cc: Vaibhav Hiremath <hvaibhav@ti.com>
Acked-by: NSekhar Nori <nsekhar@ti.com>
Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
上级 3b43ad20
...@@ -408,7 +408,7 @@ static struct clk_lookup da830_clks[] = { ...@@ -408,7 +408,7 @@ static struct clk_lookup da830_clks[] = {
CLK(NULL, "pwm2", &pwm2_clk), CLK(NULL, "pwm2", &pwm2_clk),
CLK("eqep.0", NULL, &eqep0_clk), CLK("eqep.0", NULL, &eqep0_clk),
CLK("eqep.1", NULL, &eqep1_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.0", NULL, &mcasp0_clk),
CLK("davinci-mcasp.1", NULL, &mcasp1_clk), CLK("davinci-mcasp.1", NULL, &mcasp1_clk),
CLK("davinci-mcasp.2", NULL, &mcasp2_clk), CLK("davinci-mcasp.2", NULL, &mcasp2_clk),
......
...@@ -396,7 +396,7 @@ static struct clk_lookup da850_clks[] = { ...@@ -396,7 +396,7 @@ static struct clk_lookup da850_clks[] = {
CLK(NULL, "rmii", &rmii_clk), CLK(NULL, "rmii", &rmii_clk),
CLK("davinci_emac.1", NULL, &emac_clk), CLK("davinci_emac.1", NULL, &emac_clk),
CLK("davinci-mcasp.0", NULL, &mcasp_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.0", NULL, &mmcsd0_clk),
CLK("davinci_mmc.1", NULL, &mmcsd1_clk), CLK("davinci_mmc.1", NULL, &mmcsd1_clk),
CLK(NULL, "aemif", &aemif_clk), CLK(NULL, "aemif", &aemif_clk),
......
...@@ -53,6 +53,7 @@ static struct dev_pm_domain davinci_pm_domain = { ...@@ -53,6 +53,7 @@ static struct dev_pm_domain davinci_pm_domain = {
static struct pm_clk_notifier_block platform_bus_notifier = { static struct pm_clk_notifier_block platform_bus_notifier = {
.pm_domain = &davinci_pm_domain, .pm_domain = &davinci_pm_domain,
.con_ids = { "fck", NULL, },
}; };
static int __init davinci_pm_runtime_init(void) static int __init davinci_pm_runtime_init(void)
......
...@@ -1248,7 +1248,7 @@ static int __devinit fb_probe(struct platform_device *device) ...@@ -1248,7 +1248,7 @@ static int __devinit fb_probe(struct platform_device *device)
goto err_request_mem; goto err_request_mem;
} }
fb_clk = clk_get(&device->dev, NULL); fb_clk = clk_get(&device->dev, "fck");
if (IS_ERR(fb_clk)) { if (IS_ERR(fb_clk)) {
dev_err(&device->dev, "Can not get device clock\n"); dev_err(&device->dev, "Can not get device clock\n");
ret = -ENODEV; ret = -ENODEV;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册