qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

memory: Update of_memory lpddr2 revision-id binding 

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2135064

commit a06bf59d07f45a0a6ab4ab8ac69c1d708d3fadcb
Author: Julius Werner <jwerner@chromium.org>
Date: Wed, 23 Feb 2022 16:34:20 -0800

    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>

Signed-off-by: Mark Salter <msalter@redhat.com>
This commit is contained in:
Mark Salter 2022-10-15 16:38:00 -04:00
parent 36a8c6f255
commit e6ca52c6ec
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/memory/of_memory.c
View File

@ -318,14 +318,21 @@ const struct lpddr2_info
struct property *prop;
const char *cp;
int err;
u32 revision_id[2];
err = of_property_read_u32(np, "revision-id1", &info.revision_id1);
if (err)
info.revision_id1 = -ENOENT;
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, "revision-id2", &info.revision_id2);
if (err)
info.revision_id2 = -ENOENT;
}
err = of_property_read_u32(np, "io-width", &info.io_width);
if (err)