Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77a59883 authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: changes hog mechanism to be self-referential 



Instead of a specific boolean field to indicate if a map entry shall
be hogged, treat self-reference as an indication of desired hogging.
This drops one field off the map struct and has a nice Douglas R.
Hofstadter-feel to it.

Acked-by: default avatarDong Aisheng <dong.aisheng@linaro.org>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent befe5bdf

Documentation/pinctrl.txt

+4 −4
Original line number Diff line number Diff line
@@ -989,21 +989,21 @@ is registered. This means that the core will attempt to call pinctrl_get() and 
pinctrl_enable() on it immediately after the pin control device has been

registered.



This is enabled by simply setting the .hog_on_boot field in the map to true,

like this:

This is enabled by simply setting the .dev_name field in the map to the name

of the pin controller itself, like this:



{

	.name = "POWERMAP"

	.ctrl_dev_name = "pinctrl-foo",

	.function = "power_func",

	.hog_on_boot = true,

	.dev_name = "pinctrl-foo",

},



Since it may be common to request the core to hog a few always-applicable

mux settings on the primary pin controller, there is a convenience macro for

this:



PIN_MAP_PRIMARY_SYS_HOG("POWERMAP", "power_func")

PIN_MAP_PRIMARY_SYS_HOG("POWERMAP", "pinctrl-foo", "power_func")



This gives the exact same result as the above construction.

drivers/pinctrl/core.c

+2 −4
Original line number Diff line number Diff line
@@ -793,11 +793,9 @@ int pinctrl_hog_maps(struct pinctrl_dev *pctldev) 
	for (i = 0; i < pinctrl_maps_num; i++) {

		struct pinctrl_map const *map = &pinctrl_maps[i];



		if (!map->hog_on_boot)

			continue;



		if (map->ctrl_dev_name &&

		    !strcmp(map->ctrl_dev_name, devname)) {

		    !strcmp(map->ctrl_dev_name, devname) &&

		    !strcmp(map->dev_name, devname)) {

			/* OK time to hog! */

			ret = pinctrl_hog_map(pctldev, map);

			if (ret)

include/linux/pinctrl/machine.h

+6 −12
Original line number Diff line number Diff line
@@ -26,13 +26,9 @@ 
 *	selects a certain specific pin group to activate for the function, if

 *	left as NULL, the first applicable group will be used

 * @dev_name: the name of the device using this specific mapping, the name

 *	must be the same as in your struct device*

 * @hog_on_boot: if this is set to true, the pin control subsystem will itself

 *	hog the mappings as the pinmux device drivers are attached, so this is

 *	typically used with system maps (mux mappings without an assigned

 *	device) that you want to get hogged and enabled by default as soon as

 *	a pinmux device supporting it is registered. These maps will not be

 *	disabled and put until the system shuts down.

 *	must be the same as in your struct device*. If this name is set to the

 *	same name as the pin controllers own dev_name(), the map entry will be

 *	hogged by the driver itself upon registration

 */

struct pinctrl_map {

	const char *name;
@@ -40,7 +36,6 @@ struct pinctrl_map { 
	const char *function;

	const char *group;

	const char *dev_name;

	bool hog_on_boot;

};



/*
@@ -62,8 +57,7 @@ struct pinctrl_map { 
 * to be hogged by the pin control core until the system shuts down.

 */

#define PIN_MAP_SYS_HOG(a, b, c) \

	{ .name = a, .ctrl_dev_name = b, .function = c, \

	  .hog_on_boot = true }

	{ .name = a, .ctrl_dev_name = b, .dev_name = b, .function = c, }



/*

 * Convenience macro to map a system function onto a certain pinctrl device
@@ -71,8 +65,8 @@ struct pinctrl_map { 
 * system shuts down.

 */

#define PIN_MAP_SYS_HOG_GROUP(a, b, c, d)		\

	{ .name = a, .ctrl_dev_name = b, .function = c, .group = d, \

	  .hog_on_boot = true }

	{ .name = a, .ctrl_dev_name = b, .dev_name = b, .function = c, \

	  .group = d, }



#ifdef CONFIG_PINMUX