aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Walmsley2012-09-23 17:28:27 -0600
committerPaul Walmsley2012-09-23 17:28:27 -0600
commitfe47c58ba82c967729c76869a5f10a94c38754f3 (patch)
treed3a0e62aca6904d839c846f7a94e2d356118ba1f
parent4848d460a7d4b2b5b22afda16b713cb753affa12 (diff)
hwrng: OMAP: remove SoC restrictions from driver registration
Remove the SoC restriction code from the OMAP RNG driver. The integration code in arch/arm/*omap* should handle this. The device shouldn't be created if it doesn't exist on the currently-booted SoC. This allows us to remove some OMAP-specific cpu_is_omap*() calls from the driver. Also, if other OMAP chips have RNGs that can be used by Linux, there will be no need to modify the driver. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Matt Mackall <mpm@selenic.com> Cc: Herbert Xu <herbert@gondor.apana.org.au> Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--arch/arm/mach-omap1/devices.c3
-rw-r--r--drivers/char/hw_random/omap-rng.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 23a0b116b078..7a5a3285e965 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -376,6 +376,9 @@ static struct platform_device omap1_rng_device = {
static void omap1_init_rng(void)
{
+ if (!cpu_is_omap16xx())
+ return;
+
(void) platform_device_register(&omap1_rng_device);
}
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index 748fcc8892f3..a5effd813abd 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -220,9 +220,6 @@ static struct platform_driver omap_rng_driver = {
static int __init omap_rng_init(void)
{
- if (!cpu_is_omap16xx() && !cpu_is_omap24xx())
- return -ENODEV;
-
return platform_driver_register(&omap_rng_driver);
}