aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-06-23 11:19:14 +0200
committerLinus Walleij <linus.walleij@linaro.org>2016-06-23 11:19:14 +0200
commitdd032e8dc55254cb22b529901889c5a5b9c03177 (patch)
tree972ce7afece5db6481f90d0f43ed64f5f967a437
parentpinctrl: Flag strict is a field in struct pinmux_ops (diff)
parentpinctrl: pinconf: Add generic helper function for freeing mappings (diff)
downloadlinux-dev-dd032e8dc55254cb22b529901889c5a5b9c03177.tar.xz
linux-dev-dd032e8dc55254cb22b529901889c5a5b9c03177.zip
Merge branch 'devel-dt-free-map' into devel
-rw-r--r--drivers/pinctrl/pinconf-generic.c8
-rw-r--r--include/linux/pinctrl/pinconf-generic.h2
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic.c
index 34b601b06764..5020ae534479 100644
--- a/drivers/pinctrl/pinconf-generic.c
+++ b/drivers/pinctrl/pinconf-generic.c
@@ -395,4 +395,12 @@ exit:
}
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
diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h
index d921afd5f109..12343caa114e 100644
--- a/include/linux/pinctrl/pinconf-generic.h
+++ b/include/linux/pinctrl/pinconf-generic.h
@@ -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,
struct device_node *np_config, struct pinctrl_map **map,
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(
struct pinctrl_dev *pctldev, struct device_node *np_config,