1 files changed, 16 insertions, 45 deletions

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 63fb1af2c431..1c38f86bf63a 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -14,7 +14,6 @@
 #include "jr.h"
 #include "desc_constr.h"
 #include "error.h"
-#include "ctrl.h"
 
 /*
  * Descriptor to instantiate RNG State Handle 0 in normal mode and
@@ -352,32 +351,17 @@ static void kick_trng(struct platform_device *pdev, int ent_delay)
 
 /**
  * caam_get_era() - Return the ERA of the SEC on SoC, based
- * on the SEC_VID register.
- * Returns the ERA number (1..4) or -ENOTSUPP if the ERA is unknown.
- * @caam_id - the value of the SEC_VID register
+ * on "sec-era" propery in the DTS. This property is updated by u-boot.
  **/
-int caam_get_era(u64 caam_id)
+int caam_get_era(void)
 {
-        struct sec_vid *sec_vid = (struct sec_vid *)&caam_id;
-        static const struct {
-                u16 ip_id;
-                u8 maj_rev;
-                u8 era;
-        } caam_eras[] = {
-                {0x0A10, 1, 1},
-                {0x0A10, 2, 2},
-                {0x0A12, 1, 3},
-                {0x0A14, 1, 3},
-                {0x0A14, 2, 4},
-                {0x0A16, 1, 4},
-                {0x0A11, 1, 4}
-        };
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(caam_eras); i++)
-                if (caam_eras[i].ip_id == sec_vid->ip_id &&
-                        caam_eras[i].maj_rev == sec_vid->maj_rev)
-                                return caam_eras[i].era;
+        struct device_node *caam_node;
+        for_each_compatible_node(caam_node, NULL, "fsl,sec-v4.0") {
+                const uint32_t *prop = (uint32_t *)of_get_property(caam_node,
+                                "fsl,sec-era",
+                                NULL);
+                return prop ? *prop : -ENOTSUPP;
+        }
 
         return -ENOTSUPP;
 }
@@ -443,13 +427,10 @@ static int caam_probe(struct platform_device *pdev)
          * for all, then go probe each one.
          */
         rspec = 0;
-        for_each_compatible_node(np, NULL, "fsl,sec-v4.0-job-ring")
-                rspec++;
-        if (!rspec) {
-                /* for backward compatible with device trees */
-                for_each_compatible_node(np, NULL, "fsl,sec4.0-job-ring")
+        for_each_available_child_of_node(nprop, np)
+                if (of_device_is_compatible(np, "fsl,sec-v4.0-job-ring") ||
+                    of_device_is_compatible(np, "fsl,sec4.0-job-ring"))
                         rspec++;
-        }
 
         ctrlpriv->jrpdev = kzalloc(sizeof(struct platform_device *) * rspec,
                                                                 GFP_KERNEL);
@@ -460,18 +441,9 @@ static int caam_probe(struct platform_device *pdev)
 
         ring = 0;
         ctrlpriv->total_jobrs = 0;
-        for_each_compatible_node(np, NULL, "fsl,sec-v4.0-job-ring") {
-                ctrlpriv->jrpdev[ring] =
-                                of_platform_device_create(np, NULL, dev);
-                if (!ctrlpriv->jrpdev[ring]) {
-                        pr_warn("JR%d Platform device creation error\n", ring);
-                        continue;
-                }
-                ctrlpriv->total_jobrs++;
-                ring++;
-        }
-        if (!ring) {
-                for_each_compatible_node(np, NULL, "fsl,sec4.0-job-ring") {
+        for_each_available_child_of_node(nprop, np)
+                if (of_device_is_compatible(np, "fsl,sec-v4.0-job-ring") ||
+                    of_device_is_compatible(np, "fsl,sec4.0-job-ring")) {
                         ctrlpriv->jrpdev[ring] =
                                 of_platform_device_create(np, NULL, dev);
                         if (!ctrlpriv->jrpdev[ring]) {
@@ -482,7 +454,6 @@ static int caam_probe(struct platform_device *pdev)
                         ctrlpriv->total_jobrs++;
                         ring++;
                 }
-        }
 
         /* Check to see if QI present. If so, enable */
         ctrlpriv->qi_present = !!(rd_reg64(&topregs->ctrl.perfmon.comp_parms) &
@@ -564,7 +535,7 @@ static int caam_probe(struct platform_device *pdev)
 
         /* Report "alive" for developer to see */
         dev_info(dev, "device ID = 0x%016llx (Era %d)\n", caam_id,
-                 caam_get_era(caam_id));
+                 caam_get_era());
         dev_info(dev, "job rings = %d, qi = %d\n",
                  ctrlpriv->total_jobrs, ctrlpriv->qi_present);