crypto: caam - de-CHIP-ify device tree compatibles

- all the integration parameters have been captured by the binding.
- the block name really uniquely identifies this hardware.

Some advocate putting SoC names everywhere in case software needs
to work around some chip-specific bug, but more precise SoC
information already exists in SVR, and board information already
exists in the top-level device tree node.

Note that sometimes the SoC name is a worse identifier than the
block version, as the block version can change between revisions
of the same SoC.

As a matter of historical reference, neither SEC versions 2.x
nor 3.x (driven by talitos) ever needed CHIP references.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Cc: Kumar Gala <kumar.gala@freescale.com>
Cc: Scott Wood <scottwood@freescale.com>
Acked-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 11 insertions, 21 deletions

diff --git a/arch/powerpc/boot/dts/p4080ds.dts b/arch/powerpc/boot/dts/p4080ds.dts
index 0430d241fde8..927f94d16e9b 100644
--- a/arch/powerpc/boot/dts/p4080ds.dts
+++ b/arch/powerpc/boot/dts/p4080ds.dts
@@ -423,7 +423,7 @@
                 };
 
                 crypto: crypto@300000 {
-                        compatible = "fsl,p4080-sec-v4.0", "fsl,sec-v4.0";
+                        compatible = "fsl,sec-v4.0";
                         #address-cells = <1>;
                         #size-cells = <1>;
                         reg = <0x300000 0x10000>;
@@ -432,74 +432,64 @@
                         interrupts = <92 2>;
 
                         sec_jr0: jr@1000 {
-                                compatible = "fsl,p4080-sec-v4.0-job-ring",
-                                             "fsl,sec-v4.0-job-ring";
+                                compatible = "fsl,sec-v4.0-job-ring";
                                 reg = <0x1000 0x1000>;
                                 interrupt-parent = <&mpic>;
                                 interrupts = <88 2>;
                         };
 
                         sec_jr1: jr@2000 {
-                                compatible = "fsl,p4080-sec-v4.0-job-ring",
-                                             "fsl,sec-v4.0-job-ring";
+                                compatible = "fsl,sec-v4.0-job-ring";
                                 reg = <0x2000 0x1000>;
                                 interrupt-parent = <&mpic>;
                                 interrupts = <89 2>;
                         };
 
                         sec_jr2: jr@3000 {
-                                compatible = "fsl,p4080-sec-v4.0-job-ring",
-                                             "fsl,sec-v4.0-job-ring";
+                                compatible = "fsl,sec-v4.0-job-ring";
                                 reg = <0x3000 0x1000>;
                                 interrupt-parent = <&mpic>;
                                 interrupts = <90 2>;
                         };
 
                         sec_jr3: jr@4000 {
-                                compatible = "fsl,p4080-sec-v4.0-job-ring",
-                                             "fsl,sec-v4.0-job-ring";
+                                compatible = "fsl,sec-v4.0-job-ring";
                                 reg = <0x4000 0x1000>;
                                 interrupt-parent = <&mpic>;
                                 interrupts = <91 2>;
                         };
 
                         rtic@6000 {
-                                compatible = "fsl,p4080-sec-v4.0-rtic",
-                                             "fsl,sec-v4.0-rtic";
+                                compatible = "fsl,sec-v4.0-rtic";
                                 #address-cells = <1>;
                                 #size-cells = <1>;
                                 reg = <0x6000 0x100>;
                                 ranges = <0x0 0x6100 0xe00>;
 
                                 rtic_a: rtic-a@0 {
-                                        compatible = "fsl,p4080-sec-v4.0-rtic-memory",
-                                                     "fsl,sec-v4.0-rtic-memory";
+                                        compatible = "fsl,sec-v4.0-rtic-memory";
                                         reg = <0x00 0x20 0x100 0x80>;
                                 };
 
                                 rtic_b: rtic-b@20 {
-                                        compatible = "fsl,p4080-sec-v4.0-rtic-memory",
-                                                     "fsl,sec-v4.0-rtic-memory";
+                                        compatible = "fsl,sec-v4.0-rtic-memory";
                                         reg = <0x20 0x20 0x200 0x80>;
                                 };
 
                                 rtic_c: rtic-c@40 {
-                                        compatible = "fsl,p4080-sec-v4.0-rtic-memory",
-                                                     "fsl,sec-v4.0-rtic-memory";
+                                        compatible = "fsl,sec-v4.0-rtic-memory";
                                         reg = <0x40 0x20 0x300 0x80>;
                                 };
 
                                 rtic_d: rtic-d@60 {
-                                        compatible = "fsl,p4080-sec-v4.0-rtic-memory",
-                                                     "fsl,sec-v4.0-rtic-memory";
+                                        compatible = "fsl,sec-v4.0-rtic-memory";
                                         reg = <0x60 0x20 0x500 0x80>;
                                 };
                         };
                 };
 
                 sec_mon: sec_mon@314000 {
-                        compatible = "fsl,p4080-sec-v4.0-mon",
-                                     "fsl,sec-v4.0-mon";
+                        compatible = "fsl,sec-v4.0-mon";
                         reg = <0x314000 0x1000>;
                         interrupt-parent = <&mpic>;
                         interrupts = <93 2>;