MLK-12339 Security: Missing caam support.

Added CAAM to the device tree for imx6sx in imx6sx.dtsi.

Signed-off-by: Dan Douglass <dan.douglass@nxp.com>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 974a1d0..ba8a506 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -250,6 +250,17 @@
                        clocks = <&clks IMX6SX_CLK_APBH_DMA>;
                };
 
+               caam_sm: caam-sm@00100000 {
+                       compatible = "fsl,imx6q-caam-sm";
+                       reg = <0x00100000 0x3fff>;
+               };
+
+               irq_sec_vio: caam_secvio {
+                       compatible = "fsl,imx6q-caam-secvio";
+                       interrupts = <0 20 0x04>;
+                       secvio_src = <0x8000001d>;
+               };
+
                gpmi: gpmi-nand@1806000{
                        compatible = "fsl,imx6sx-gpmi-nand";
                        #address-cells = <1>;
@@ -775,6 +786,11 @@
                                fsl,anatop = <&anatop>;
                        };
 
+                       caam_snvs: caam-snvs@020cc000 {
+                               compatible = "fsl,imx6q-caam-snvs";
+                               reg = <0x020cc000 0x4000>;
+                       };
+
                        snvs: snvs@20cc000 {
                                compatible = "fsl,sec-v4.0-mon", "syscon", "simple-mfd";
                                reg = <0x020cc000 0x4000>;
@@ -923,8 +939,8 @@
                                compatible = "fsl,sec-v4.0";
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               reg = <0x2100000 0x10000>;
-                               ranges = <0 0x2100000 0x10000>;
+                               reg = <0x2100000 0x40000>;
+                               ranges = <0 0x2100000 0x40000>;
                                interrupt-parent = <&intc>;
                                clocks = <&clks IMX6SX_CLK_CAAM_MEM>,
                                         <&clks IMX6SX_CLK_CAAM_ACLK>,
@@ -935,13 +951,15 @@
                                sec_jr0: jr0@1000 {
                                        compatible = "fsl,sec-v4.0-job-ring";
                                        reg = <0x1000 0x1000>;
-                                       interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupt-parent = <&intc>;
+                                       interrupts = <0 105 0x4>;
                                };
 
                                sec_jr1: jr1@2000 {
                                        compatible = "fsl,sec-v4.0-job-ring";
                                        reg = <0x2000 0x1000>;
-                                       interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
+                                       interrupt-parent = <&intc>;
+                                       interrupts = <0 106 0x4>;
                                };
                        };