From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 24 Jan 2009 16:27:06 +0000 (+0000)
Subject: [ARM] omap: omap24xxcam: use short connection IDs for omap2 clocks
X-Git-Tag: firefly_0821_release~15211^2~20^2~51
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6c5dbb40f4795f3fdbf3e5aab7eda4e2f838d08b;p=firefly-linux-kernel-4.4.55.git

[ARM] omap: omap24xxcam: use short connection IDs for omap2 clocks

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index 1e9ac83dca5e..d190b6a74936 100644
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/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/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c
index 73eb656acfe3..805faaea6449 100644
--- a/drivers/media/video/omap24xxcam.c
+++ b/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);
 	}