Commit 4dc1d1be authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mfd-fixes-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd 

Pull MFD fix from Lee Jones:

 - Fix syscon users not specifying the "syscon" compatible

* tag 'mfd-fixes-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
  mfd: syscon: Restore device_node_to_regmap() for non-syscon nodes
parents 09fbf3d5 5728c92a

drivers/mfd/syscon.c

+26 −3
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ static struct syscon *of_syscon_register(struct device_node *np, bool check_res) 
}



static struct regmap *device_node_get_regmap(struct device_node *np,

					     bool create_regmap,

					     bool check_res)

{

	struct syscon *entry, *syscon = NULL;
@@ -172,7 +173,7 @@ static struct regmap *device_node_get_regmap(struct device_node *np, 
		}



	if (!syscon) {

		if (of_device_is_compatible(np, "syscon"))

		if (create_regmap)

			syscon = of_syscon_register(np, check_res);

		else

			syscon = ERR_PTR(-EINVAL);
@@ -233,15 +234,37 @@ int of_syscon_register_regmap(struct device_node *np, struct regmap *regmap) 
}

EXPORT_SYMBOL_GPL(of_syscon_register_regmap);



/**

 * device_node_to_regmap() - Get or create a regmap for specified device node

 * @np: Device tree node

 *

 * Get a regmap for the specified device node. If there's not an existing

 * regmap, then one is instantiated. This function should not be used if the

 * device node has a custom regmap driver or has resources (clocks, resets) to

 * be managed. Use syscon_node_to_regmap() instead for those cases.

 *

 * Return: regmap ptr on success, negative error code on failure.

 */

struct regmap *device_node_to_regmap(struct device_node *np)

{

	return device_node_get_regmap(np, false);

	return device_node_get_regmap(np, true, false);

}

EXPORT_SYMBOL_GPL(device_node_to_regmap);



/**

 * syscon_node_to_regmap() - Get or create a regmap for specified syscon device node

 * @np: Device tree node

 *

 * Get a regmap for the specified device node. If there's not an existing

 * regmap, then one is instantiated if the node is a generic "syscon". This

 * function is safe to use for a syscon registered with

 * of_syscon_register_regmap().

 *

 * Return: regmap ptr on success, negative error code on failure.

 */

struct regmap *syscon_node_to_regmap(struct device_node *np)

{

	return device_node_get_regmap(np, true);

	return device_node_get_regmap(np, of_device_is_compatible(np, "syscon"), true);

}

EXPORT_SYMBOL_GPL(syscon_node_to_regmap);