ARM: dts: imx6ul: Add caam

[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/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 07869c9..63be11a 100644 (file)
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -218,7 +218,17 @@
                        clocks = <&clks IMX6UL_CLK_APBHDMA>;
                };
 
-               gpmi: gpmi-nand@1806000         {
+               caam_sm: caam-sm@00100000 {
+                        compatible = "fsl,imx7d-caam-sm", "fsl,imx6q-caam-sm";
+                        reg = <0x00100000 0x3fff>;
+               };
+
+               irq_sec_vio: caam_secvio {
+                            compatible = "fsl,imx7d-caam-secvio", "fsl,imx6q-caam-secvio";
+                            interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+               };
+
+               gpmi: gpmi-nand@1806000 {
                        compatible = "fsl,imx6q-gpmi-nand";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -731,6 +741,11 @@
                                fsl,anatop = <&anatop>;
                        };
 
+                       caam_snvs: caam-snvs@020cc000 {
+                               compatible = "fsl,imx6q-caam-snvs";
+                               reg = <0x020cc000 0x4000>;
+                       };
+
                        snvs: snvs@020cc000 {
                                compatible = "fsl,sec-v4.0-mon", "syscon", "simple-mfd";
                                reg = <0x020cc000 0x4000>;