Commit a06bf59d authored by Julius Werner's avatar Julius Werner Committed by Krzysztof Kozlowski
Browse files

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: default avatarJulius Werner <jwerner@chromium.org>
Link: https://lore.kernel.org/r/20220224003421.3440124-3-jwerner@chromium.org


Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
parent 80ce9173

drivers/memory/of_memory.c

+15 −8
Original line number Diff line number Diff line
@@ -318,7 +318,13 @@ const struct lpddr2_info 
	struct property *prop;

	const char *cp;

	int err;

	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;
@@ -326,6 +332,7 @@ const struct lpddr2_info 
		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)