---

yaml --- r: 137315 b: refs/heads/master c: 6c5dbb4 h: refs/heads/master i: 137313: 823d3da 137311: 3f91a57 v: v3
git-mirror · Feb 8, 2009 · 88e65ed · 88e65ed
1 parent d7e1d61
commit 88e65ed
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eeec7c8d18465a85c212230bdb715e3f029dbf4e
+refs/heads/master: 6c5dbb40f4795f3fdbf3e5aab7eda4e2f838d08b
diff --git a/trunk/arch/arm/mach-omap2/clock24xx.c b/trunk/arch/arm/mach-omap2/clock24xx.c
@@ -169,8 +169,8 @@ static struct omap_clk omap24xx_clks[] = {
 	CLK(NULL,	"wdt1_ick",	&wdt1_ick,	CK_243X | CK_242X),
 	CLK(NULL,	"omapctrl_ick",	&omapctrl_ick,	CK_243X | CK_242X),
 	CLK(NULL,	"icr_ick",	&icr_ick,	CK_243X),
-	CLK(NULL,	"cam_fck",	&cam_fck,	CK_243X | CK_242X),
-	CLK(NULL,	"cam_ick",	&cam_ick,	CK_243X | CK_242X),
+	CLK("omap24xxcam", "fck",	&cam_fck,	CK_243X | CK_242X),
+	CLK("omap24xxcam", "ick",	&cam_ick,	CK_243X | CK_242X),
 	CLK(NULL,	"mailboxes_ick", &mailboxes_ick,	CK_243X | CK_242X),
 	CLK(NULL,	"wdt4_ick",	&wdt4_ick,	CK_243X | CK_242X),
 	CLK(NULL,	"wdt4_fck",	&wdt4_fck,	CK_243X | CK_242X),

diff --git a/trunk/drivers/media/video/omap24xxcam.c b/trunk/drivers/media/video/omap24xxcam.c
@@ -80,17 +80,17 @@ static int omap24xxcam_clock_get(struct omap24xxcam_device *cam)
 {
 	int rval = 0;
 
-	cam->fck = clk_get(cam->dev, "cam_fck");
+	cam->fck = clk_get(cam->dev, "fck");
 	if (IS_ERR(cam->fck)) {
-		dev_err(cam->dev, "can't get cam_fck");
+		dev_err(cam->dev, "can't get camera fck");
 		rval = PTR_ERR(cam->fck);
 		omap24xxcam_clock_put(cam);
 		return rval;
 	}
 
-	cam->ick = clk_get(cam->dev, "cam_ick");
+	cam->ick = clk_get(cam->dev, "ick");
 	if (IS_ERR(cam->ick)) {
-		dev_err(cam->dev, "can't get cam_ick");
+		dev_err(cam->dev, "can't get camera ick");
 		rval = PTR_ERR(cam->ick);
 		omap24xxcam_clock_put(cam);
 	}