[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 1e9ac83dca5e5449448ca749519faa62804397a6..d190b6a7493632883c94021a778d1e482a225aee 100644 (file)
--- 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 73eb656acfe356b0ca965fffee948fbd75436397..805faaea64498a97061f3db0f85ac454e4525201 100644 (file)
--- 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);
        }