]> err.no Git - linux-2.6/commitdiff
powerpc/fsl: update crypto node definition and device tree instances
authorKim Phillips <kim.phillips@freescale.com>
Wed, 9 Jul 2008 00:13:33 +0000 (19:13 -0500)
committerKumar Gala <galak@kernel.crashing.org>
Mon, 14 Jul 2008 12:55:47 +0000 (07:55 -0500)
delete obsolete device-type property, delete model property
(use compatible property instead), prepend "fsl," to Freescale
specific properties. Add nodes to device trees that are missing them,
and fix broken property values in other trees.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
27 files changed:
Documentation/powerpc/dts-bindings/fsl/sec.txt [new file with mode: 0644]
arch/powerpc/boot/dts/mpc8272ads.dts
arch/powerpc/boot/dts/mpc8313erdb.dts
arch/powerpc/boot/dts/mpc8315erdb.dts
arch/powerpc/boot/dts/mpc832x_mds.dts
arch/powerpc/boot/dts/mpc832x_rdb.dts
arch/powerpc/boot/dts/mpc8349emitx.dts
arch/powerpc/boot/dts/mpc8349emitxgp.dts
arch/powerpc/boot/dts/mpc834x_mds.dts
arch/powerpc/boot/dts/mpc836x_mds.dts
arch/powerpc/boot/dts/mpc8377_mds.dts
arch/powerpc/boot/dts/mpc8377_rdb.dts
arch/powerpc/boot/dts/mpc8378_mds.dts
arch/powerpc/boot/dts/mpc8378_rdb.dts
arch/powerpc/boot/dts/mpc8379_mds.dts
arch/powerpc/boot/dts/mpc8379_rdb.dts
arch/powerpc/boot/dts/mpc8536ds.dts
arch/powerpc/boot/dts/mpc8541cds.dts
arch/powerpc/boot/dts/mpc8544ds.dts
arch/powerpc/boot/dts/mpc8548cds.dts
arch/powerpc/boot/dts/mpc8555cds.dts
arch/powerpc/boot/dts/mpc8568mds.dts
arch/powerpc/boot/dts/mpc8572ds.dts
arch/powerpc/boot/dts/sbc8349.dts
arch/powerpc/boot/dts/sbc8548.dts
arch/powerpc/boot/dts/tqm8541.dts
arch/powerpc/boot/dts/tqm8555.dts

diff --git a/Documentation/powerpc/dts-bindings/fsl/sec.txt b/Documentation/powerpc/dts-bindings/fsl/sec.txt
new file mode 100644 (file)
index 0000000..2b6f2d4
--- /dev/null
@@ -0,0 +1,68 @@
+Freescale SoC SEC Security Engines
+
+Required properties:
+
+- compatible : Should contain entries for this and backward compatible
+  SEC versions, high to low, e.g., "fsl,sec2.1", "fsl,sec2.0"
+- reg : Offset and length of the register set for the device
+- interrupts : the SEC's interrupt number
+- fsl,num-channels : An integer representing the number of channels
+  available.
+- fsl,channel-fifo-len : An integer representing the number of
+  descriptor pointers each channel fetch fifo can hold.
+- fsl,exec-units-mask : The bitmask representing what execution units
+  (EUs) are available. It's a single 32-bit cell. EU information
+  should be encoded following the SEC's Descriptor Header Dword
+  EU_SEL0 field documentation, i.e. as follows:
+
+       bit 0  = reserved - should be 0
+       bit 1  = set if SEC has the ARC4 EU (AFEU)
+       bit 2  = set if SEC has the DES/3DES EU (DEU)
+       bit 3  = set if SEC has the message digest EU (MDEU/MDEU-A)
+       bit 4  = set if SEC has the random number generator EU (RNG)
+       bit 5  = set if SEC has the public key EU (PKEU)
+       bit 6  = set if SEC has the AES EU (AESU)
+       bit 7  = set if SEC has the Kasumi EU (KEU)
+       bit 8  = set if SEC has the CRC EU (CRCU)
+       bit 11 = set if SEC has the message digest EU extended alg set (MDEU-B)
+
+remaining bits are reserved for future SEC EUs.
+
+- fsl,descriptor-types-mask : The bitmask representing what descriptors
+  are available. It's a single 32-bit cell. Descriptor type information
+  should be encoded following the SEC's Descriptor Header Dword DESC_TYPE
+  field documentation, i.e. as follows:
+
+       bit 0  = set if SEC supports the aesu_ctr_nonsnoop desc. type
+       bit 1  = set if SEC supports the ipsec_esp descriptor type
+       bit 2  = set if SEC supports the common_nonsnoop desc. type
+       bit 3  = set if SEC supports the 802.11i AES ccmp desc. type
+       bit 4  = set if SEC supports the hmac_snoop_no_afeu desc. type
+       bit 5  = set if SEC supports the srtp descriptor type
+       bit 6  = set if SEC supports the non_hmac_snoop_no_afeu desc.type
+       bit 7  = set if SEC supports the pkeu_assemble descriptor type
+       bit 8  = set if SEC supports the aesu_key_expand_output desc.type
+       bit 9  = set if SEC supports the pkeu_ptmul descriptor type
+       bit 10 = set if SEC supports the common_nonsnoop_afeu desc. type
+       bit 11 = set if SEC supports the pkeu_ptadd_dbl descriptor type
+
+  ..and so on and so forth.
+
+Optional properties:
+
+- interrupt-parent : the phandle for the interrupt controller that
+  services interrupts for this device.
+
+Example:
+
+       /* MPC8548E */
+       crypto@30000 {
+               compatible = "fsl,sec2.1", "fsl,sec2.0";
+               reg = <0x30000 0x10000>;
+               interrupts = <29 2>;
+               interrupt-parent = <&mpic>;
+               fsl,num-channels = <4>;
+               fsl,channel-fifo-len = <24>;
+               fsl,exec-units-mask = <0xfe>;
+               fsl,descriptor-types-mask = <0x12b0ebf>;
+       };
index d27f8a73c24a0781828643ce01f26f61833d5024..2a1929acaabd32aac0d02d1a73cef7ae81d351bc 100644 (file)
                        compatible = "fsl,mpc8272-pic", "fsl,cpm2-pic";
                };
 
-/* May need to remove if on a part without crypto engine */
                crypto@30000 {
-                       device_type = "crypto";
-                       model = "SEC2";
-                       compatible = "fsl,mpc8272-talitos-sec2",
-                                    "fsl,talitos-sec2",
-                                    "fsl,talitos",
-                                    "talitos";
-                       reg = <0x30000 0x10000>;
-                       interrupts = <11 8>;
+                       compatible = "fsl,sec1.0";
+                       reg = <0x40000 0x13000>;
+                       interrupts = <47 0x8>;
                        interrupt-parent = <&PIC>;
-                       num-channels = <4>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x7e>;
-/* desc mask is for rev1.x, we need runtime fixup for >=2.x */
-                       descriptor-types-mask = <0x1010ebf>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x7e>;
+                       fsl,descriptor-types-mask = <0x1010415>;
                };
        };
 
index b2068430a06d792c6a500ea088f91b1f77b78739..3664fb5840266a551ef06986a27585fd03ed4b46 100644 (file)
                };
 
                crypto@30000 {
-                       device_type = "crypto";
-                       model = "SEC2";
-                       compatible = "talitos";
-                       reg = <0x30000 0x7000>;
+                       compatible = "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";
+                       reg = <0x30000 0x10000>;
                        interrupts = <11 0x8>;
                        interrupt-parent = <&ipic>;
-                       /* Rev. 2.2 */
-                       num-channels = <1>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x0000004c>;
-                       descriptor-types-mask = <0x0122003f>;
+                       fsl,num-channels = <1>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x4c>;
+                       fsl,descriptor-types-mask = <0x0122003f>;
                };
 
                /* IPIC
index a40e8064d42933a37e4dbcc0f5bd6c8a888618d1..f704513fb930b5dd6dcf4270e9592ae8368f271c 100644 (file)
                };
 
                crypto@30000 {
-                       model = "SEC3";
-                       device_type = "crypto";
-                       compatible = "talitos";
+                       compatible = "fsl,sec3.3", "fsl,sec3.1", "fsl,sec3.0",
+                                    "fsl,sec2.4", "fsl,sec2.2", "fsl,sec2.1",
+                                    "fsl,sec2.0";
                        reg = <0x30000 0x10000>;
                        interrupts = <11 0x8>;
                        interrupt-parent = <&ipic>;
-                       /* Rev. 3.0 geometry */
-                       num-channels = <4>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x000001fe>;
-                       descriptor-types-mask = <0x03ab0ebf>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x97c>;
+                       fsl,descriptor-types-mask = <0x3ab0abf>;
                };
 
                sata@18000 {
index b5968b6c8a2962bf27d4b14d1458ce9eeb16a20b..7345743d3d96ac7100a2e0f3269aaf147cbf0cd4 100644 (file)
                };
 
                crypto@30000 {
-                       device_type = "crypto";
-                       model = "SEC2";
-                       compatible = "talitos";
-                       reg = <0x30000 0x7000>;
+                       compatible = "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";
+                       reg = <0x30000 0x10000>;
                        interrupts = <11 0x8>;
                        interrupt-parent = <&ipic>;
-                       /* Rev. 2.2 */
-                       num-channels = <1>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x0000004c>;
-                       descriptor-types-mask = <0x0122003f>;
+                       fsl,num-channels = <1>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x4c>;
+                       fsl,descriptor-types-mask = <0x0122003f>;
                };
 
                ipic: pic@700 {
index a798d8639a7da6215d2aa58e81052476af74315b..e74c045a0f8caa235312518b76e2a333d6a30eaf 100644 (file)
                };
 
                crypto@30000 {
-                       device_type = "crypto";
-                       model = "SEC2";
-                       compatible = "talitos";
-                       reg = <0x30000 0x7000>;
+                       compatible = "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";
+                       reg = <0x30000 0x10000>;
                        interrupts = <11 0x8>;
                        interrupt-parent = <&ipic>;
-                       /* Rev. 2.2 */
-                       num-channels = <1>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x0000004c>;
-                       descriptor-types-mask = <0x0122003f>;
+                       fsl,num-channels = <1>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x4c>;
+                       fsl,descriptor-types-mask = <0x0122003f>;
                };
 
                ipic:pic@700 {
index fc0f4c918c76258701576727e4b5c02ef82cf291..8dfab56625856ea3d57f77b45921789b5d22a206 100644 (file)
                };
 
                crypto@30000 {
-                       device_type = "crypto";
-                       model = "SEC2";
-                       compatible = "talitos";
+                       compatible = "fsl,sec2.0";
                        reg = <0x30000 0x10000>;
                        interrupts = <11 0x8>;
                        interrupt-parent = <&ipic>;
-                       num-channels = <4>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x0000007e>;
-                       descriptor-types-mask = <0x01010ebf>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x7e>;
+                       fsl,descriptor-types-mask = <0x01010ebf>;
                };
 
                ipic: pic@700 {
index e6afb1d1e19e512c7be8c0dd9ba972772bd5de0b..49ca3497eefb45bb1540b53757914a488febdd39 100644 (file)
                };
 
                crypto@30000 {
-                       device_type = "crypto";
-                       model = "SEC2";
-                       compatible = "talitos";
+                       compatible = "fsl,sec2.0";
                        reg = <0x30000 0x10000>;
                        interrupts = <11 0x8>;
                        interrupt-parent = <&ipic>;
-                       num-channels = <4>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x0000007e>;
-                       descriptor-types-mask = <0x01010ebf>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x7e>;
+                       fsl,descriptor-types-mask = <0x01010ebf>;
                };
 
                ipic: pic@700 {
index 9c75c7c69e21791f657f25197148ce0c2c6ce281..ba586cb7afbb52d13600895d39571717582b2fd0 100644 (file)
                        interrupt-parent = <&ipic>;
                };
 
-               /* May need to remove if on a part without crypto engine */
                crypto@30000 {
-                       device_type = "crypto";
-                       model = "SEC2";
-                       compatible = "talitos";
+                       compatible = "fsl,sec2.0";
                        reg = <0x30000 0x10000>;
                        interrupts = <11 0x8>;
                        interrupt-parent = <&ipic>;
-                       num-channels = <4>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x0000007e>;
-                       /* desc mask is for rev2.0,
-                        * we need runtime fixup for >2.0 */
-                       descriptor-types-mask = <0x01010ebf>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x7e>;
+                       fsl,descriptor-types-mask = <0x01010ebf>;
                };
 
                /* IPIC
index 8e33b155f112752cbf8ee7218bc876b46ad50457..3701dae1ee02b09fe7f84246d886401f57ee9a14 100644 (file)
                };
 
                crypto@30000 {
-                       device_type = "crypto";
-                       model = "SEC2";
-                       compatible = "talitos";
+                       compatible = "fsl,sec2.0";
                        reg = <0x30000 0x10000>;
                        interrupts = <11 0x8>;
                        interrupt-parent = <&ipic>;
-                       num-channels = <4>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x0000007e>;
-                       /* desc mask is for rev1.x, we need runtime fixup for >=2.x */
-                       descriptor-types-mask = <0x01010ebf>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x7e>;
+                       fsl,descriptor-types-mask = <0x01010ebf>;
                };
 
                ipic: pic@700 {
index 49a38cb95b527c144f9f4a03ca0f25f9150cc45b..0a700cb5f6110ba53f83f2b36d107ba70f8c01d2 100644 (file)
                };
 
                crypto@30000 {
-                       model = "SEC3";
-                       compatible = "talitos";
+                       compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",
+                                    "fsl,sec2.1", "fsl,sec2.0";
                        reg = <0x30000 0x10000>;
                        interrupts = <11 0x8>;
                        interrupt-parent = <&ipic>;
-                       /* Rev. 3.0 geometry */
-                       num-channels = <4>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x000001fe>;
-                       descriptor-types-mask = <0x03ab0ebf>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x9fe>;
+                       fsl,descriptor-types-mask = <0x3ab0ebf>;
                };
 
                sdhc@2e000 {
index 1f45387903023793c3aede39667b13e9386ded86..ed137aa83d5f01d5c4e50442a6d521a1db84c7ce 100644 (file)
                };
 
                crypto@30000 {
-                       model = "SEC3";
-                       device_type = "crypto";
-                       compatible = "talitos";
+                       compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",
+                                    "fsl,sec2.1", "fsl,sec2.0";
                        reg = <0x30000 0x10000>;
                        interrupts = <11 0x8>;
                        interrupt-parent = <&ipic>;
-                       /* Rev. 3.0 geometry */
-                       num-channels = <4>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x000001fe>;
-                       descriptor-types-mask = <0x03ab0ebf>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x9fe>;
+                       fsl,descriptor-types-mask = <0x3ab0ebf>;
                };
 
                sata@18000 {
index 99ad49d4f13fe9cb53c2cc714bebfc8d92b0b94b..29c8c76a58f7d122dbcc8febdf37668b1ad57dc5 100644 (file)
                };
 
                crypto@30000 {
-                       model = "SEC3";
-                       compatible = "talitos";
+                       compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",
+                                    "fsl,sec2.1", "fsl,sec2.0";
                        reg = <0x30000 0x10000>;
                        interrupts = <11 0x8>;
                        interrupt-parent = <&ipic>;
-                       /* Rev. 3.0 geometry */
-                       num-channels = <4>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x000001fe>;
-                       descriptor-types-mask = <0x03ab0ebf>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x9fe>;
+                       fsl,descriptor-types-mask = <0x3ab0ebf>;
                };
 
                sdhc@2e000 {
index 44e34d3f21cf1940a928c5600a22da45757651af..34a7f2f935e1482d72717d0045fee840a58e69bf 100644 (file)
                };
 
                crypto@30000 {
-                       model = "SEC3";
-                       device_type = "crypto";
-                       compatible = "talitos";
+                       compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",
+                                    "fsl,sec2.1", "fsl,sec2.0";
                        reg = <0x30000 0x10000>;
                        interrupts = <11 0x8>;
                        interrupt-parent = <&ipic>;
-                       /* Rev. 3.0 geometry */
-                       num-channels = <4>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x000001fe>;
-                       descriptor-types-mask = <0x03ab0ebf>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x9fe>;
+                       fsl,descriptor-types-mask = <0x3ab0ebf>;
                };
 
                /* IPIC
index 980be8136276d7abca4a847829a31ad937bbf618..d641a8985ea38e87954b6d77c869308ee1730e66 100644 (file)
                };
 
                crypto@30000 {
-                       model = "SEC3";
-                       compatible = "talitos";
+                       compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",
+                                    "fsl,sec2.1", "fsl,sec2.0";
                        reg = <0x30000 0x10000>;
                        interrupts = <11 0x8>;
                        interrupt-parent = <&ipic>;
-                       /* Rev. 3.0 geometry */
-                       num-channels = <4>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x000001fe>;
-                       descriptor-types-mask = <0x03ab0ebf>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x9fe>;
+                       fsl,descriptor-types-mask = <0x3ab0ebf>;
                };
 
                sdhc@2e000 {
index eeedf5884881f42eb557823344f5d24dfbb25e54..e4d7030d50e558ded5a02f4566d2b5d3cf2a0d08 100644 (file)
                };
 
                crypto@30000 {
-                       model = "SEC3";
-                       device_type = "crypto";
-                       compatible = "talitos";
+                       compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",
+                                    "fsl,sec2.1", "fsl,sec2.0";
                        reg = <0x30000 0x10000>;
                        interrupts = <11 0x8>;
                        interrupt-parent = <&ipic>;
-                       /* Rev. 3.0 geometry */
-                       num-channels = <4>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x000001fe>;
-                       descriptor-types-mask = <0x03ab0ebf>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x9fe>;
+                       fsl,descriptor-types-mask = <0x3ab0ebf>;
                };
 
                sata@18000 {
index 98ad27a2ddee93f8af65384f8c1e7fc112c9e982..02cfa24a1695265bb60faa17f138de56da4a2674 100644 (file)
                        interrupt-parent = <&mpic>;
                };
 
+               crypto@30000 {
+                       compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",
+                                    "fsl,sec2.1", "fsl,sec2.0";
+                       reg = <0x30000 0x10000>;
+                       interrupts = <45 2 58 2>;
+                       interrupt-parent = <&mpic>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x9fe>;
+                       fsl,descriptor-types-mask = <0x3ab0ebf>;
+               };
+
                sata@18000 {
                        compatible = "fsl,mpc8536-sata", "fsl,pq-sata";
                        reg = <0x18000 0x1000>;
index 21ad71b825c14c254950c681667ee46a9db1fa11..c4469f19ff82814070ac3fb3465364665a1da0e0 100644 (file)
                        interrupt-parent = <&mpic>;
                };
 
+               crypto@30000 {
+                       compatible = "fsl,sec2.0";
+                       reg = <0x30000 0x10000>;
+                       interrupts = <45 2>;
+                       interrupt-parent = <&mpic>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x7e>;
+                       fsl,descriptor-types-mask = <0x01010ebf>;
+               };
+
                mpic: pic@40000 {
                        interrupt-controller;
                        #address-cells = <0>;
index 6cf533f4b5fb94390d22c74454e868f19ff8991c..7d3829d3495e1ac52d2fbd85e3fd1ba92575493b 100644 (file)
                        fsl,has-rstcr;
                };
 
+               crypto@30000 {
+                       compatible = "fsl,sec2.1", "fsl,sec2.0";
+                       reg = <0x30000 0x10000>;
+                       interrupts = <45 2>;
+                       interrupt-parent = <&mpic>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0xfe>;
+                       fsl,descriptor-types-mask = <0x12b0ebf>;
+               };
+
                mpic: pic@40000 {
                        interrupt-controller;
                        #address-cells = <0>;
index d1fa6bbfaea0d7e7867cf0c7c2f72f802bc332ca..d84466bb7ecaa30739b9006f69dd5b69ed8dcb74 100644 (file)
                        fsl,has-rstcr;
                };
 
+               crypto@30000 {
+                       compatible = "fsl,sec2.1", "fsl,sec2.0";
+                       reg = <0x30000 0x10000>;
+                       interrupts = <45 2>;
+                       interrupt-parent = <&mpic>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0xfe>;
+                       fsl,descriptor-types-mask = <0x12b0ebf>;
+               };
+
                mpic: pic@40000 {
                        interrupt-controller;
                        #address-cells = <0>;
index 6fc8059b5a0180bcfb9616c5629ed2315892fc69..e03a780062832d7be3d167de7f564d4d8b04f2ce 100644 (file)
                        interrupt-parent = <&mpic>;
                };
 
+               crypto@30000 {
+                       compatible = "fsl,sec2.0";
+                       reg = <0x30000 0x10000>;
+                       interrupts = <45 2>;
+                       interrupt-parent = <&mpic>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x7e>;
+                       fsl,descriptor-types-mask = <0x01010ebf>;
+               };
+
                mpic: pic@40000 {
                        interrupt-controller;
                        #address-cells = <0>;
index be9a289c0d62df984cc24174f97568ad235db112..9c30a34821dcf73e0163fd01f13954be51ef6980 100644 (file)
                };
 
                crypto@30000 {
-                       device_type = "crypto";
-                       model = "SEC2";
-                       compatible = "talitos";
-                       reg = <0x30000 0xf000>;
+                       compatible = "fsl,sec2.1", "fsl,sec2.0";
+                       reg = <0x30000 0x10000>;
                        interrupts = <45 2>;
                        interrupt-parent = <&mpic>;
-                       num-channels = <4>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0xfe>;
-                       descriptor-types-mask = <0x12b0ebf>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0xfe>;
+                       fsl,descriptor-types-mask = <0x12b0ebf>;
                };
 
                mpic: pic@40000 {
index cb06325f0b7955dd2b79888ca9810340d141cdda..08c61e3daeccabdf3fd3abb2967811ac5ca80786 100644 (file)
                        interrupt-parent = <&mpic>;
                };
 
+               crypto@30000 {
+                       compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",
+                                    "fsl,sec2.1", "fsl,sec2.0";
+                       reg = <0x30000 0x10000>;
+                       interrupts = <45 2 58 2>;
+                       interrupt-parent = <&mpic>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x9fe>;
+                       fsl,descriptor-types-mask = <0x3ab0ebf>;
+               };
+
                mpic: pic@40000 {
                        interrupt-controller;
                        #address-cells = <0>;
index 5b76bb26085a13426cc9e423ef39cce95bdee7ef..45f789b56709b410133cb778a4a3c0e736778484 100644 (file)
                        interrupt-parent = <&ipic>;
                };
 
-               /* May need to remove if on a part without crypto engine */
                crypto@30000 {
-                       model = "SEC2";
-                       compatible = "talitos";
+                       compatible = "fsl,sec2.0";
                        reg = <0x30000 0x10000>;
                        interrupts = <11 0x8>;
                        interrupt-parent = <&ipic>;
-                       num-channels = <4>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x0000007e>;
-                       /* desc mask is for rev2.0,
-                        * we need runtime fixup for >2.0 */
-                       descriptor-types-mask = <0x01010ebf>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x7e>;
+                       fsl,descriptor-types-mask = <0x01010ebf>;
                };
 
                /* IPIC
index 21cbacb1000c24195da2a69bb6c72b0108dc15d3..333552b4e90dd1d417ebe31cbf3c5ef0d248aab2 100644 (file)
                        fsl,has-rstcr;
                };
 
+               crypto@30000 {
+                       compatible = "fsl,sec2.1", "fsl,sec2.0";
+                       reg = <0x30000 0x10000>;
+                       interrupts = <45 2>;
+                       interrupt-parent = <&mpic>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0xfe>;
+                       fsl,descriptor-types-mask = <0x12b0ebf>;
+               };
+
                mpic: pic@40000 {
                        interrupt-controller;
                        #address-cells = <0>;
index d083a648a81ded0d76d9e2caabfd3b331478b0c2..d76441ec5dc72f1599ced341d2356062538da9b5 100644 (file)
                        interrupt-parent = <&mpic>;
                };
 
+               crypto@30000 {
+                       compatible = "fsl,sec2.0";
+                       reg = <0x30000 0x10000>;
+                       interrupts = <45 2>;
+                       interrupt-parent = <&mpic>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x7e>;
+                       fsl,descriptor-types-mask = <0x01010ebf>;
+               };
+
                mpic: pic@40000 {
                        interrupt-controller;
                        #address-cells = <0>;
index 96b0b94ad9250b5d98fc1ffc344fdb5c31488369..6f7ea59c4846e05c783b4076349cc29cb6c09185 100644 (file)
                        interrupt-parent = <&mpic>;
                };
 
+               crypto@30000 {
+                       compatible = "fsl,sec2.0";
+                       reg = <0x30000 0x10000>;
+                       interrupts = <45 2>;
+                       interrupt-parent = <&mpic>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x7e>;
+                       fsl,descriptor-types-mask = <0x01010ebf>;
+               };
+
                mpic: pic@40000 {
                        interrupt-controller;
                        #address-cells = <0>;