2011-11-13 10:48:05 +00:00
|
|
|
--- a/drivers/video/omap/dispc.c
|
|
|
|
|
+++ b/drivers/video/omap/dispc.c
|
2011-10-30 20:31:45 +00:00
|
|
|
@@ -922,14 +922,14 @@ static int get_dss_clocks(void)
|
|
|
|
|
return PTR_ERR(dispc.dss_ick);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- dispc.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "fck");
|
|
|
|
|
+ dispc.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck");
|
|
|
|
|
if (IS_ERR(dispc.dss1_fck)) {
|
|
|
|
|
dev_err(dispc.fbdev->dev, "can't get dss1_fck\n");
|
|
|
|
|
clk_put(dispc.dss_ick);
|
|
|
|
|
return PTR_ERR(dispc.dss1_fck);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- dispc.dss_54m_fck = clk_get(&dispc.fbdev->dssdev->dev, "tv_clk");
|
|
|
|
|
+ dispc.dss_54m_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss_54m_fck");
|
|
|
|
|
if (IS_ERR(dispc.dss_54m_fck)) {
|
|
|
|
|
dev_err(dispc.fbdev->dev, "can't get tv_fck\n");
|
|
|
|
|
clk_put(dispc.dss_ick);
|
2011-11-13 10:48:05 +00:00
|
|
|
--- a/drivers/video/omap/rfbi.c
|
|
|
|
|
+++ b/drivers/video/omap/rfbi.c
|
2011-10-30 20:31:45 +00:00
|
|
|
@@ -90,7 +90,7 @@ static int rfbi_get_clocks(void)
|
|
|
|
|
return PTR_ERR(rfbi.dss_ick);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- rfbi.dss1_fck = clk_get(&rfbi.fbdev->dssdev->dev, "fck");
|
|
|
|
|
+ rfbi.dss1_fck = clk_get(&rfbi.fbdev->dssdev->dev, "dss1_fck");
|
|
|
|
|
if (IS_ERR(rfbi.dss1_fck)) {
|
|
|
|
|
dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n");
|
|
|
|
|
clk_put(rfbi.dss_ick);
|
