Skip to content

L
linux-davinci
Commit 6c5dbb40 authored by Russell King's avatar Russell King Committed by Russell King
Browse files
Options

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

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent eeec7c8d
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
arch/arm/mach-omap2/clock24xx.c
View file @ 6c5dbb40
...@@ -169,8 +169,8 @@ static struct omap_clk omap24xx_clks[] = { ...@@ -169,8 +169,8 @@ static struct omap_clk omap24xx_clks[] = {
CLK(NULL, "wdt1_ick", &wdt1_ick, CK_243X | CK_242X), CLK(NULL, "wdt1_ick", &wdt1_ick, CK_243X | CK_242X),
CLK(NULL, "omapctrl_ick", &omapctrl_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, "icr_ick", &icr_ick, CK_243X),
CLK(NULL, "cam_fck", &cam_fck, CK_243X | CK_242X), CLK("omap24xxcam", "fck", &cam_fck, CK_243X | CK_242X),
CLK(NULL, "cam_ick", &cam_ick, 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, "mailboxes_ick", &mailboxes_ick, CK_243X | CK_242X),
CLK(NULL, "wdt4_ick", &wdt4_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), CLK(NULL, "wdt4_fck", &wdt4_fck, CK_243X | CK_242X),
......
drivers/media/video/omap24xxcam.c
View file @ 6c5dbb40
...@@ -80,17 +80,17 @@ static int omap24xxcam_clock_get(struct omap24xxcam_device *cam) ...@@ -80,17 +80,17 @@ static int omap24xxcam_clock_get(struct omap24xxcam_device *cam)
{ {
int rval = 0; int rval = 0;
cam->fck = clk_get(cam->dev, "cam_fck"); cam->fck = clk_get(cam->dev, "fck");
if (IS_ERR(cam->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); rval = PTR_ERR(cam->fck);
omap24xxcam_clock_put(cam); omap24xxcam_clock_put(cam);
return rval; return rval;
} }
cam->ick = clk_get(cam->dev, "cam_ick"); cam->ick = clk_get(cam->dev, "ick");
if (IS_ERR(cam->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); rval = PTR_ERR(cam->ick);
omap24xxcam_clock_put(cam); omap24xxcam_clock_put(cam);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment