summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-01-19 20:58:56 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-02-08 17:50:21 +0000
commiteeec7c8d18465a85c212230bdb715e3f029dbf4e (patch)
tree0eedd58299f41c22d145bf7e8e224c69edb24bf9 /arch
parentb1ad379632327c0722c5c92275c326971da3b948 (diff)
downloadblackbird-op-linux-eeec7c8d18465a85c212230bdb715e3f029dbf4e.tar.gz
blackbird-op-linux-eeec7c8d18465a85c212230bdb715e3f029dbf4e.zip
[ARM] omap: convert omap RNG clocks to match by devid and conid
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/clock24xx.c2
-rw-r--r--arch/arm/mach-omap2/clock34xx.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index f83588002f69..1e9ac83dca5e 100644
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -200,7 +200,7 @@ static struct omap_clk omap24xx_clks[] = {
CLK(NULL, "sdrc_ick", &sdrc_ick, CK_243X),
CLK(NULL, "des_ick", &des_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, "pka_ick", &pka_ick, CK_243X | CK_242X),
CLK(NULL, "usb_fck", &usb_fck, CK_243X | CK_242X),
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index 1a4bc336c8a3..07e3308da650 100644
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -196,7 +196,7 @@ static struct omap_clk omap34xx_clks[] = {
CLK(NULL, "usb_l4_ick", &usb_l4_ick, CK_3430ES1),
CLK(NULL, "security_l4_ick2", &security_l4_ick2, 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, "des1_ick", &des1_ick, CK_343X),
CLK(NULL, "dss1_alwon_fck", &dss1_alwon_fck, CK_343X),
OpenPOWER on IntegriCloud