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

Commit c033a718 authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: stricten up generic group code 



Rename the symbol PINCTRL_GENERIC to PINCTRL_GENERIC_GROUPS since
it all pertains to groups. Replace everywhere.

ifdef out the radix tree and the struct when not using the
generic groups.

Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c7059c5a

drivers/pinctrl/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ config PINCTRL 
menu "Pin controllers"

	depends on PINCTRL



config GENERIC_PINCTRL

config GENERIC_PINCTRL_GROUPS

	bool



config PINMUX

drivers/pinctrl/core.c

+4 −2
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ void pinctrl_remove_gpio_range(struct pinctrl_dev *pctldev, 
}

EXPORT_SYMBOL_GPL(pinctrl_remove_gpio_range);



#ifdef CONFIG_GENERIC_PINCTRL

#ifdef CONFIG_GENERIC_PINCTRL_GROUPS



/**

 * pinctrl_generic_get_group_count() - returns the number of pin groups
@@ -714,7 +714,7 @@ static void pinctrl_generic_free_groups(struct pinctrl_dev *pctldev) 
static inline void pinctrl_generic_free_groups(struct pinctrl_dev *pctldev)

{

}

#endif /* CONFIG_GENERIC_PINCTRL */

#endif /* CONFIG_GENERIC_PINCTRL_GROUPS */



/**

 * pinctrl_get_group_selector() - returns the group selector for a group
@@ -1993,7 +1993,9 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc, 
	pctldev->desc = pctldesc;

	pctldev->driver_data = driver_data;

	INIT_RADIX_TREE(&pctldev->pin_desc_tree, GFP_KERNEL);

#ifdef CONFIG_GENERIC_PINCTRL_GROUPS

	INIT_RADIX_TREE(&pctldev->pin_group_tree, GFP_KERNEL);

#endif

	INIT_LIST_HEAD(&pctldev->gpio_ranges);

	INIT_DELAYED_WORK(&pctldev->late_init, pinctrl_late_init);

	pctldev->dev = dev;

drivers/pinctrl/core.h

+17 −15
Original line number Diff line number Diff line
@@ -43,8 +43,10 @@ struct pinctrl_dev { 
	struct list_head node;

	struct pinctrl_desc *desc;

	struct radix_tree_root pin_desc_tree;

#ifdef CONFIG_GENERIC_PINCTRL_GROUPS

	struct radix_tree_root pin_group_tree;

	unsigned int num_groups;

#endif

	struct list_head gpio_ranges;

	struct device *dev;

	struct module *owner;
@@ -165,6 +167,20 @@ struct pin_desc { 
#endif

};



/**

 * struct pinctrl_maps - a list item containing part of the mapping table

 * @node: mapping table list node

 * @maps: array of mapping table entries

 * @num_maps: the number of entries in @maps

 */

struct pinctrl_maps {

	struct list_head node;

	struct pinctrl_map const *maps;

	unsigned num_maps;

};



#ifdef CONFIG_GENERIC_PINCTRL_GROUPS



/**

 * struct group_desc - generic pin group descriptor

 * @name: name of the pin group
@@ -179,20 +195,6 @@ struct group_desc { 
	void *data;

};



/**

 * struct pinctrl_maps - a list item containing part of the mapping table

 * @node: mapping table list node

 * @maps: array of mapping table entries

 * @num_maps: the number of entries in @maps

 */

struct pinctrl_maps {

	struct list_head node;

	struct pinctrl_map const *maps;

	unsigned num_maps;

};



#ifdef CONFIG_GENERIC_PINCTRL



int pinctrl_generic_get_group_count(struct pinctrl_dev *pctldev);



const char *pinctrl_generic_get_group_name(struct pinctrl_dev *pctldev,
@@ -218,7 +220,7 @@ pinctrl_generic_remove_last_group(struct pinctrl_dev *pctldev) 
	return pinctrl_generic_remove_group(pctldev, pctldev->num_groups - 1);

}



#endif	/* CONFIG_GENERIC_PINCTRL */

#endif	/* CONFIG_GENERIC_PINCTRL_GROUPS */



struct pinctrl_dev *get_pinctrl_dev_from_devname(const char *dev_name);

struct pinctrl_dev *get_pinctrl_dev_from_of_node(struct device_node *np);