ENGR00289885 [iMX6Q] Add Secure Memory and SECVIO support.

1. Pull in secure memory support from 3.0.35 kernel.
2. Pull in SECVIO support from 3.0.35 kernel.
3. Make changes to support device tree.
4. Add device tree setting for SECVIO sources.

Signed-off-by: Dan Douglass <b41520@freescale.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index bd6c7a0c266b..6de80a23995f 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -75,6 +75,11 @@
                 interrupt-parent = <&intc>;
                 ranges;
 
+                caam_sm: caam-sm@00100000 {
+                        compatible = "fsl,imx6q-caam-sm";
+                        reg = <0x00100000 0x3fff>;
+                };
+
                 dma_apbh: dma-apbh@00110000 {
                         compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";
                         reg = <0x00110000 0x2000>;
@@ -85,6 +90,12 @@
                         clocks = <&clks 106>;
                 };
 
+                irq_sec_vio: caam_secvio {
+                        compatible = "fsl,imx6q-caam-secvio";
+                        interrupts = <0 20 0x04>;
+                        secvio_src = <0x8000001d>;
+                };
+
                 gpmi: gpmi-nand@00112000 {
                         compatible = "fsl,imx6q-gpmi-nand";
                         #address-cells = <1>;
@@ -606,6 +617,11 @@
                                 fsl,anatop = <&anatop>;
                         };
 
+                        caam_snvs: caam-snvs@020cc000 {
+                                compatible = "fsl,imx6q-caam-snvs";
+                                reg = <0x020cc000 0x4000>;
+                        };
+
                         snvs@020cc000 {
                                 compatible = "fsl,sec-v4.0-mon", "simple-bus";
                                 #address-cells = <1>;