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

Commit dfa7573e authored by Thierry Reding's avatar Thierry Reding
Browse files

Merge branch 'devel-dt-free-map' of... 

Merge branch 'devel-dt-free-map' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl into drm/tegra/for-next
parents 1a695a90 8dfebf57

drivers/pinctrl/pinconf-generic.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -391,4 +391,12 @@ int pinconf_generic_dt_node_to_map(struct pinctrl_dev *pctldev, 
}

}

EXPORT_SYMBOL_GPL(pinconf_generic_dt_node_to_map);

EXPORT_SYMBOL_GPL(pinconf_generic_dt_node_to_map);





void pinconf_generic_dt_free_map(struct pinctrl_dev *pctldev,

				 struct pinctrl_map *map,

				 unsigned num_maps)

{

	pinctrl_utils_free_map(pctldev, map, num_maps);

}

EXPORT_SYMBOL_GPL(pinconf_generic_dt_free_map);



#endif
 
#endif

include/linux/pinctrl/pinconf-generic.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -175,6 +175,8 @@ int pinconf_generic_dt_subnode_to_map(struct pinctrl_dev *pctldev, 
int pinconf_generic_dt_node_to_map(struct pinctrl_dev *pctldev,

int pinconf_generic_dt_node_to_map(struct pinctrl_dev *pctldev,

		struct device_node *np_config, struct pinctrl_map **map,

		struct device_node *np_config, struct pinctrl_map **map,

		unsigned *num_maps, enum pinctrl_map_type type);

		unsigned *num_maps, enum pinctrl_map_type type);

void pinconf_generic_dt_free_map(struct pinctrl_dev *pctldev,

		struct pinctrl_map *map, unsigned num_maps);





static inline int pinconf_generic_dt_node_to_map_group(

static inline int pinconf_generic_dt_node_to_map_group(

		struct pinctrl_dev *pctldev, struct device_node *np_config,

		struct pinctrl_dev *pctldev, struct device_node *np_config,