Commit 68d16195 authored by Rob Herring's avatar Rob Herring
Browse files

of: Support using 'mask' in making device bus id 



Commit 25b892b5 ("ARM: dts: arm: Update register-bit-led nodes
'reg' and node names") added a 'reg' property to nodes. This change has
the side effect of changing how the kernel generates the device name.
The assumption was a translatable 'reg' address is unique. However, in
the case of the register-bit-led binding (and a few others) that is not
the case. The 'mask' property must also be used in this case to make a
unique device name.

Fixes: 25b892b5 ("ARM: dts: arm: Update register-bit-led nodes 'reg' and node names")
Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Cc: stable@vger.kernel.org
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20211109164650.2233507-2-robh@kernel.org


Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent f4eedebd

drivers/of/platform.c

+8 −2
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ static void of_device_make_bus_id(struct device *dev) 
	struct device_node *node = dev->of_node;

	const __be32 *reg;

	u64 addr;

	u32 mask;



	/* Construct the name, using parent nodes if necessary to ensure uniqueness */

	while (node->parent) {
@@ -85,6 +86,11 @@ static void of_device_make_bus_id(struct device *dev) 
		 */

		reg = of_get_property(node, "reg", NULL);

		if (reg && (addr = of_translate_address(node, reg)) != OF_BAD_ADDR) {

			if (!of_property_read_u32(node, "mask", &mask))

				dev_set_name(dev, dev_name(dev) ? "%llx.%x.%pOFn:%s" : "%llx.%x.%pOFn",

					     addr, ffs(mask) - 1, node, dev_name(dev));



			else

				dev_set_name(dev, dev_name(dev) ? "%llx.%pOFn:%s" : "%llx.%pOFn",

					     addr, node, dev_name(dev));

			return;