aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-omap2/clock24xx.c2
-rw-r--r--arch/arm/mach-omap2/clock34xx.c2
-rw-r--r--drivers/char/hw_random/omap-rng.c2
3 files changed, 3 insertions, 3 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[] = {
200 CLK(NULL, "sdrc_ick", &sdrc_ick, CK_243X), 200 CLK(NULL, "sdrc_ick", &sdrc_ick, CK_243X),
201 CLK(NULL, "des_ick", &des_ick, CK_243X | CK_242X), 201 CLK(NULL, "des_ick", &des_ick, CK_243X | CK_242X),
202 CLK(NULL, "sha_ick", &sha_ick, CK_243X | CK_242X), 202 CLK(NULL, "sha_ick", &sha_ick, CK_243X | CK_242X),
203 CLK(NULL, "rng_ick", &rng_ick, CK_243X | CK_242X), 203 CLK("omap_rng", "ick", &rng_ick, CK_243X | CK_242X),
204 CLK(NULL, "aes_ick", &aes_ick, CK_243X | CK_242X), 204 CLK(NULL, "aes_ick", &aes_ick, CK_243X | CK_242X),
205 CLK(NULL, "pka_ick", &pka_ick, CK_243X | CK_242X), 205 CLK(NULL, "pka_ick", &pka_ick, CK_243X | CK_242X),
206 CLK(NULL, "usb_fck", &usb_fck, CK_243X | CK_242X), 206 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[] = {
196 CLK(NULL, "usb_l4_ick", &usb_l4_ick, CK_3430ES1), 196 CLK(NULL, "usb_l4_ick", &usb_l4_ick, CK_3430ES1),
197 CLK(NULL, "security_l4_ick2", &security_l4_ick2, CK_343X), 197 CLK(NULL, "security_l4_ick2", &security_l4_ick2, CK_343X),
198 CLK(NULL, "aes1_ick", &aes1_ick, CK_343X), 198 CLK(NULL, "aes1_ick", &aes1_ick, CK_343X),
199 CLK(NULL, "rng_ick", &rng_ick, CK_343X), 199 CLK("omap_rng", "ick", &rng_ick, CK_343X),
200 CLK(NULL, "sha11_ick", &sha11_ick, CK_343X), 200 CLK(NULL, "sha11_ick", &sha11_ick, CK_343X),
201 CLK(NULL, "des1_ick", &des1_ick, CK_343X), 201 CLK(NULL, "des1_ick", &des1_ick, CK_343X),
202 CLK(NULL, "dss1_alwon_fck", &dss1_alwon_fck, CK_343X), 202 CLK(NULL, "dss1_alwon_fck", &dss1_alwon_fck, CK_343X),
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index ba68a4671cb5..538313f9e7ac 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -102,7 +102,7 @@ static int __init omap_rng_probe(struct platform_device *pdev)
102 return -EBUSY; 102 return -EBUSY;
103 103
104 if (cpu_is_omap24xx()) { 104 if (cpu_is_omap24xx()) {
105 rng_ick = clk_get(&pdev->dev, "rng_ick"); 105 rng_ick = clk_get(&pdev->dev, "ick");
106 if (IS_ERR(rng_ick)) { 106 if (IS_ERR(rng_ick)) {
107 dev_err(&pdev->dev, "Could not get rng_ick\n"); 107 dev_err(&pdev->dev, "Could not get rng_ick\n");
108 ret = PTR_ERR(rng_ick); 108 ret = PTR_ERR(rng_ick);