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
eeec7c8d
Commit
eeec7c8d
authored
Jan 19, 2009
by
Russell King
Committed by
Russell King
Feb 08, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ARM] omap: convert omap RNG clocks to match by devid and conid
Signed-off-by:
Russell King
<
rmk+kernel@arm.linux.org.uk
>
parent
b1ad3796
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
arch/arm/mach-omap2/clock24xx.c
arch/arm/mach-omap2/clock24xx.c
+1
-1
arch/arm/mach-omap2/clock34xx.c
arch/arm/mach-omap2/clock34xx.c
+1
-1
drivers/char/hw_random/omap-rng.c
drivers/char/hw_random/omap-rng.c
+1
-1
No files found.
arch/arm/mach-omap2/clock24xx.c
View file @
eeec7c8d
...
@@ -200,7 +200,7 @@ static struct omap_clk omap24xx_clks[] = {
...
@@ -200,7 +200,7 @@ static struct omap_clk omap24xx_clks[] = {
CLK
(
NULL
,
"sdrc_ick"
,
&
sdrc_ick
,
CK_243X
),
CLK
(
NULL
,
"sdrc_ick"
,
&
sdrc_ick
,
CK_243X
),
CLK
(
NULL
,
"des_ick"
,
&
des_ick
,
CK_243X
|
CK_242X
),
CLK
(
NULL
,
"des_ick"
,
&
des_ick
,
CK_243X
|
CK_242X
),
CLK
(
NULL
,
"sha_ick"
,
&
sha_ick
,
CK_243X
|
CK_242X
),
CLK
(
NULL
,
"sha_ick"
,
&
sha_ick
,
CK_243X
|
CK_242X
),
CLK
(
NULL
,
"rng_ick"
,
&
rng_ick
,
CK_243X
|
CK_242X
),
CLK
(
"omap_rng"
,
"ick"
,
&
rng_ick
,
CK_243X
|
CK_242X
),
CLK
(
NULL
,
"aes_ick"
,
&
aes_ick
,
CK_243X
|
CK_242X
),
CLK
(
NULL
,
"aes_ick"
,
&
aes_ick
,
CK_243X
|
CK_242X
),
CLK
(
NULL
,
"pka_ick"
,
&
pka_ick
,
CK_243X
|
CK_242X
),
CLK
(
NULL
,
"pka_ick"
,
&
pka_ick
,
CK_243X
|
CK_242X
),
CLK
(
NULL
,
"usb_fck"
,
&
usb_fck
,
CK_243X
|
CK_242X
),
CLK
(
NULL
,
"usb_fck"
,
&
usb_fck
,
CK_243X
|
CK_242X
),
...
...
arch/arm/mach-omap2/clock34xx.c
View file @
eeec7c8d
...
@@ -196,7 +196,7 @@ static struct omap_clk omap34xx_clks[] = {
...
@@ -196,7 +196,7 @@ static struct omap_clk omap34xx_clks[] = {
CLK
(
NULL
,
"usb_l4_ick"
,
&
usb_l4_ick
,
CK_3430ES1
),
CLK
(
NULL
,
"usb_l4_ick"
,
&
usb_l4_ick
,
CK_3430ES1
),
CLK
(
NULL
,
"security_l4_ick2"
,
&
security_l4_ick2
,
CK_343X
),
CLK
(
NULL
,
"security_l4_ick2"
,
&
security_l4_ick2
,
CK_343X
),
CLK
(
NULL
,
"aes1_ick"
,
&
aes1_ick
,
CK_343X
),
CLK
(
NULL
,
"aes1_ick"
,
&
aes1_ick
,
CK_343X
),
CLK
(
NULL
,
"rng_ick"
,
&
rng_ick
,
CK_343X
),
CLK
(
"omap_rng"
,
"ick"
,
&
rng_ick
,
CK_343X
),
CLK
(
NULL
,
"sha11_ick"
,
&
sha11_ick
,
CK_343X
),
CLK
(
NULL
,
"sha11_ick"
,
&
sha11_ick
,
CK_343X
),
CLK
(
NULL
,
"des1_ick"
,
&
des1_ick
,
CK_343X
),
CLK
(
NULL
,
"des1_ick"
,
&
des1_ick
,
CK_343X
),
CLK
(
NULL
,
"dss1_alwon_fck"
,
&
dss1_alwon_fck
,
CK_343X
),
CLK
(
NULL
,
"dss1_alwon_fck"
,
&
dss1_alwon_fck
,
CK_343X
),
...
...
drivers/char/hw_random/omap-rng.c
View file @
eeec7c8d
...
@@ -102,7 +102,7 @@ static int __init omap_rng_probe(struct platform_device *pdev)
...
@@ -102,7 +102,7 @@ static int __init omap_rng_probe(struct platform_device *pdev)
return
-
EBUSY
;
return
-
EBUSY
;
if
(
cpu_is_omap24xx
())
{
if
(
cpu_is_omap24xx
())
{
rng_ick
=
clk_get
(
&
pdev
->
dev
,
"
rng_
ick"
);
rng_ick
=
clk_get
(
&
pdev
->
dev
,
"ick"
);
if
(
IS_ERR
(
rng_ick
))
{
if
(
IS_ERR
(
rng_ick
))
{
dev_err
(
&
pdev
->
dev
,
"Could not get rng_ick
\n
"
);
dev_err
(
&
pdev
->
dev
,
"Could not get rng_ick
\n
"
);
ret
=
PTR_ERR
(
rng_ick
);
ret
=
PTR_ERR
(
rng_ick
);
...
...
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