From 670aed285e70c03555462dfb84f69212fae13b15 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Thu, 21 Apr 2011 19:11:16 +0300
Subject: [PATCH] --- yaml --- r: 251071 b: refs/heads/master c:
 c96c92d893e28d8b8b3161ffb6c3cf0847aaf478 h: refs/heads/master i:   251069:
 c4c157e205d845790dd3602ecd22d56f83b8be33   251067:
 5976d9e069b0c137828a52c24192ad212fdb3022   251063:
 3b9fba40d9d5922304336b74c231f705a44898ce   251055:
 2c64cacec3999310f931fd957a99ff6bb6d4e94d   251039:
 e008dfe603aa95b807cd9c7ac9f8c795a711bd39   251007:
 76c3cbdee437a4bed06d4ac7d5bc0382d18619bc v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/video/omap/dispc.c       | 4 ++--
 trunk/drivers/video/omap/omapfb_main.c | 2 +-
 trunk/drivers/video/omap/rfbi.c        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 9270a06db3cd..508a814e7145 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 943e4457ca732553b7cca2df8881124ae96071de
+refs/heads/master: c96c92d893e28d8b8b3161ffb6c3cf0847aaf478
diff --git a/trunk/drivers/video/omap/dispc.c b/trunk/drivers/video/omap/dispc.c
index 529483467abf..0ccd7adf47bb 100644
--- a/trunk/drivers/video/omap/dispc.c
+++ b/trunk/drivers/video/omap/dispc.c
@@ -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, "dss1_fck");
+	dispc.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "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_fck");
+	dispc.dss_54m_fck = clk_get(&dispc.fbdev->dssdev->dev, "tv_clk");
 	if (IS_ERR(dispc.dss_54m_fck)) {
 		dev_err(dispc.fbdev->dev, "can't get tv_fck\n");
 		clk_put(dispc.dss_ick);
diff --git a/trunk/drivers/video/omap/omapfb_main.c b/trunk/drivers/video/omap/omapfb_main.c
index e264efd0278f..b3ddd743d8a6 100644
--- a/trunk/drivers/video/omap/omapfb_main.c
+++ b/trunk/drivers/video/omap/omapfb_main.c
@@ -90,7 +90,7 @@ static void omapdss_release(struct device *dev)
 
 /* dummy device for clocks */
 static struct platform_device omapdss_device = {
-	.name		= "omapdss",
+	.name		= "omapdss_dss",
 	.id		= -1,
 	.dev            = {
 		.release = omapdss_release,
diff --git a/trunk/drivers/video/omap/rfbi.c b/trunk/drivers/video/omap/rfbi.c
index eada9f12efc7..0c6981f1a4a3 100644
--- a/trunk/drivers/video/omap/rfbi.c
+++ b/trunk/drivers/video/omap/rfbi.c
@@ -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, "dss1_fck");
+	rfbi.dss1_fck = clk_get(&rfbi.fbdev->dssdev->dev, "fck");
 	if (IS_ERR(rfbi.dss1_fck)) {
 		dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n");
 		clk_put(rfbi.dss_ick);