diff options
author | Nicolas Pitre <nico@cam.org> | 2009-06-11 16:27:20 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@cam.org> | 2009-06-15 00:37:08 -0400 |
commit | 3fade49b734cca2d8c4f1bcd7c3023302b557f3b (patch) | |
tree | 0c4d33f43c7c707c3d9dfb6e0edf7cf568b77941 /arch/arm/mach-orion5x/common.c | |
parent | 97f8a27a5cfb08c9ce3abc90aaafb791759aed94 (diff) |
[ARM] orion5x: register the crypto device on SOCs that support it
Not all Orion variants do implement the crypto unit.
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'arch/arm/mach-orion5x/common.c')
-rw-r--r-- | arch/arm/mach-orion5x/common.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index eafcc49009ea..f87fa1253803 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c | |||
@@ -562,7 +562,7 @@ static struct platform_device orion5x_crypto_device = { | |||
562 | .resource = orion5x_crypto_res, | 562 | .resource = orion5x_crypto_res, |
563 | }; | 563 | }; |
564 | 564 | ||
565 | int __init orion5x_crypto_init(void) | 565 | static int __init orion5x_crypto_init(void) |
566 | { | 566 | { |
567 | int ret; | 567 | int ret; |
568 | 568 | ||
@@ -697,6 +697,14 @@ void __init orion5x_init(void) | |||
697 | } | 697 | } |
698 | 698 | ||
699 | /* | 699 | /* |
700 | * The 5082/5181l/5182/6082/6082l/6183 have crypto | ||
701 | * while 5180n/5181/5281 don't have crypto. | ||
702 | */ | ||
703 | if ((dev == MV88F5181_DEV_ID && rev >= MV88F5181L_REV_A0) || | ||
704 | dev == MV88F5182_DEV_ID || dev == MV88F6183_DEV_ID) | ||
705 | orion5x_crypto_init(); | ||
706 | |||
707 | /* | ||
700 | * Register watchdog driver | 708 | * Register watchdog driver |
701 | */ | 709 | */ |
702 | orion5x_wdt_init(); | 710 | orion5x_wdt_init(); |