Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
6c5dbb40
Commit
6c5dbb40
authored
Jan 24, 2009
by
Russell King
Committed by
Russell King
Feb 08, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ARM] omap: omap24xxcam: use short connection IDs for omap2 clocks
Signed-off-by:
Russell King
<
rmk+kernel@arm.linux.org.uk
>
parent
eeec7c8d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
arch/arm/mach-omap2/clock24xx.c
arch/arm/mach-omap2/clock24xx.c
+2
-2
drivers/media/video/omap24xxcam.c
drivers/media/video/omap24xxcam.c
+4
-4
No files found.
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 cam
era
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 cam
era
ick"
);
rval
=
PTR_ERR
(
cam
->
ick
);
rval
=
PTR_ERR
(
cam
->
ick
);
omap24xxcam_clock_put
(
cam
);
omap24xxcam_clock_put
(
cam
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment