5 files changed, 53 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/crypto/omap-aes.txt b/Documentation/devicetree/bindings/crypto/omap-aes.txt
new file mode 100644
index 000000000000..fd9717653cbb
--- /dev/null
+++ b/Documentation/devicetree/bindings/crypto/omap-aes.txt
@@ -0,0 +1,31 @@
+OMAP SoC AES crypto Module
+
+Required properties:
+
+- compatible : Should contain entries for this and backward compatible
+  AES versions:
+  - "ti,omap2-aes" for OMAP2.
+  - "ti,omap3-aes" for OMAP3.
+  - "ti,omap4-aes" for OMAP4 and AM33XX.
+  Note that the OMAP2 and 3 versions are compatible (OMAP3 supports
+  more algorithms) but they are incompatible with OMAP4.
+- ti,hwmods: Name of the hwmod associated with the AES module
+- reg : Offset and length of the register set for the module
+- interrupts : the interrupt-specifier for the AES module.
+
+Optional properties:
+- dmas: DMA specifiers for tx and rx dma. See the DMA client binding,
+        Documentation/devicetree/bindings/dma/dma.txt
+- dma-names: DMA request names should include "tx" and "rx" if present.
+
+Example:
+        /* AM335x */
+        aes: aes@53500000 {
+                compatible = "ti,omap4-aes";
+                ti,hwmods = "aes";
+                reg = <0x53500000 0xa0>;
+                interrupts = <102>;
+                dmas = <&edma 6>,
+                       <&edma 5>;
+                dma-names = "tx", "rx";
+        };
diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index 8a9802ee6380..94ee427a6db1 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -23,3 +23,7 @@
 &sham {
         status = "okay";
 };
+
+&aes {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 09786efc25c1..ff834add842d 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -527,3 +527,7 @@
 &sham {
         status = "okay";
 };
+
+&aes {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index 08d5cd9e6457..5f12b28dd593 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -429,3 +429,7 @@
 &sham {
         status = "okay";
 };
+
+&aes {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 5f114a7f9484..e36aed69a363 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -721,5 +721,15 @@
                         dmas = <&edma 36>;
                         dma-names = "rx";
                 };
+
+                aes: aes@53500000 {
+                        compatible = "ti,omap4-aes";
+                        ti,hwmods = "aes";
+                        reg = <0x53500000 0xa0>;
+                        interrupts = <102>;
+                        dmas = <&edma 6>,
+                               <&edma 5>;
+                        dma-names = "tx", "rx";
+                };
         };
 };