memory: Update of_memory lpddr2 revision-id binding

This patch updates the code parsing the "jedec,lpddr2" device tree
binding to use the new `revision-id` property instead of the deprecated
`revision-id1` and `revision-id2` properties if available.

Signed-off-by: Julius Werner <jwerner@chromium.org>
Link: https://lore.kernel.org/r/20220224003421.3440124-3-jwerner@chromium.org
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>

diff --git a/drivers/memory/of_memory.c b/drivers/memory/of_memory.c
index bac5c7f3493692320e51bc8c7b4704785328f274..dbdf87bc0b78efd89f6df696149d899df9bccf21 100644 (file)
--- a/drivers/memory/of_memory.c
+++ b/drivers/memory/of_memory.c
@@ -318,14 +318,21 @@ const struct lpddr2_info
        struct property *prop;
        const char *cp;
        int err;
-
-       err = of_property_read_u32(np, "revision-id1", &info.revision_id1);
-       if (err)
-               info.revision_id1 = -ENOENT;
-
-       err = of_property_read_u32(np, "revision-id2", &info.revision_id2);
-       if (err)
-               info.revision_id2 = -ENOENT;
+       u32 revision_id[2];
+
+       err = of_property_read_u32_array(np, "revision-id", revision_id, 2);
+       if (!err) {
+               info.revision_id1 = revision_id[0];
+               info.revision_id2 = revision_id[1];
+       } else {
+               err = of_property_read_u32(np, "revision-id1", &info.revision_id1);
+               if (err)
+                       info.revision_id1 = -ENOENT;
+
+               err = of_property_read_u32(np, "revision-id2", &info.revision_id2);
+               if (err)
+                       info.revision_id2 = -ENOENT;
+       }
 
        err = of_property_read_u32(np, "io-width", &info.io_width);
        if (err)