summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2012-09-25 02:02:18 +0200
committerJason Cooper <jason@lakedaemon.net>2012-10-17 17:20:01 +0000
commita458926e16a37ef41a4fbf45957cb9faaeb6a6ef (patch)
tree22ca2d4f59918dae609cf0235e8a3395a8eefa3e
parentdfdc16fa785bacf169cae458a6f1805cfa2178c6 (diff)
downloadblackbird-op-linux-a458926e16a37ef41a4fbf45957cb9faaeb6a6ef.tar.gz
blackbird-op-linux-a458926e16a37ef41a4fbf45957cb9faaeb6a6ef.zip
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.dtsi9
-rw-r--r--arch/arm/mach-dove/common.c1
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 @@
nr-ports = <1>;
status = "disabled";
};
+
+ crypto: crypto@30000 {
+ compatible = "marvell,orion-crypto";
+ reg = <0x30000 0x10000>,
+ <0xc8000000 0x800>;
+ reg-names = "regs", "sram";
+ interrupts = <31>;
+ status = "okay";
+ };
};
};
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)
dove_ehci0_init();
dove_ehci1_init();
dove_pcie_init(1, 1);
- dove_crypto_init();
of_platform_populate(NULL, of_default_bus_match_table,
dove_auxdata_lookup, NULL);
OpenPOWER on IntegriCloud