diff options
author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2012-09-24 20:02:18 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2012-10-17 13:20:01 -0400 |
commit | a458926e16a37ef41a4fbf45957cb9faaeb6a6ef (patch) | |
tree | 22ca2d4f59918dae609cf0235e8a3395a8eefa3e | |
parent | dfdc16fa785bacf169cae458a6f1805cfa2178c6 (diff) |
ARM: dove: Add crypto engine to DT
Make use of DT support for the crypto engine on dove and remove
the obsolete init call.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r-- | arch/arm/boot/dts/dove.dtsi | 9 | ||||
-rw-r--r-- | arch/arm/mach-dove/common.c | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index c59c5292d10e..5a00022383e7 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi | |||
@@ -145,5 +145,14 @@ | |||
145 | nr-ports = <1>; | 145 | nr-ports = <1>; |
146 | status = "disabled"; | 146 | status = "disabled"; |
147 | }; | 147 | }; |
148 | |||
149 | crypto: crypto@30000 { | ||
150 | compatible = "marvell,orion-crypto"; | ||
151 | reg = <0x30000 0x10000>, | ||
152 | <0xc8000000 0x800>; | ||
153 | reg-names = "regs", "sram"; | ||
154 | interrupts = <31>; | ||
155 | status = "okay"; | ||
156 | }; | ||
148 | }; | 157 | }; |
149 | }; | 158 | }; |
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c index ffec26fdc1dc..f723fe13d0f0 100644 --- a/arch/arm/mach-dove/common.c +++ b/arch/arm/mach-dove/common.c | |||
@@ -416,7 +416,6 @@ static void __init dove_dt_init(void) | |||
416 | dove_ehci0_init(); | 416 | dove_ehci0_init(); |
417 | dove_ehci1_init(); | 417 | dove_ehci1_init(); |
418 | dove_pcie_init(1, 1); | 418 | dove_pcie_init(1, 1); |
419 | dove_crypto_init(); | ||
420 | 419 | ||
421 | of_platform_populate(NULL, of_default_bus_match_table, | 420 | of_platform_populate(NULL, of_default_bus_match_table, |
422 | dove_auxdata_lookup, NULL); | 421 | dove_auxdata_lookup, NULL); |