projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pinctrl: abx500: force-convert to generic config bindings
[cascardo/linux.git]
/
drivers
/
pinctrl
/
nomadik
/
pinctrl-abx500.c
diff --git
a/drivers/pinctrl/nomadik/pinctrl-abx500.c
b/drivers/pinctrl/nomadik/pinctrl-abx500.c
index
2289728
..
7130cd6
100644
(file)
--- a/
drivers/pinctrl/nomadik/pinctrl-abx500.c
+++ b/
drivers/pinctrl/nomadik/pinctrl-abx500.c
@@
-893,12
+893,13
@@
static int abx500_dt_subnode_to_map(struct pinctrl_dev *pctldev,
unsigned int nconfigs = 0;
bool has_config = 0;
struct property *prop;
unsigned int nconfigs = 0;
bool has_config = 0;
struct property *prop;
- const char *group, *gpio_name;
struct device_node *np_config;
struct device_node *np_config;
- ret = of_property_read_string(np, "
ste,
function", &function);
+ ret = of_property_read_string(np, "function", &function);
if (ret >= 0) {
if (ret >= 0) {
- ret = of_property_count_strings(np, "ste,pins");
+ const char *group;
+
+ ret = of_property_count_strings(np, "groups");
if (ret < 0)
goto exit;
if (ret < 0)
goto exit;
@@
-907,7
+908,7
@@
static int abx500_dt_subnode_to_map(struct pinctrl_dev *pctldev,
if (ret < 0)
goto exit;
if (ret < 0)
goto exit;
- of_property_for_each_string(np, "
ste,pin
s", prop, group) {
+ of_property_for_each_string(np, "
group
s", prop, group) {
ret = abx500_dt_add_map_mux(map, reserved_maps,
num_maps, group, function);
if (ret < 0)
ret = abx500_dt_add_map_mux(map, reserved_maps,
num_maps, group, function);
if (ret < 0)
@@
-927,7
+928,10
@@
static int abx500_dt_subnode_to_map(struct pinctrl_dev *pctldev,
has_config |= nconfigs;
}
if (has_config) {
has_config |= nconfigs;
}
if (has_config) {
- ret = of_property_count_strings(np, "ste,pins");
+ const char *gpio_name;
+ const char *pin;
+
+ ret = of_property_count_strings(np, "pins");
if (ret < 0)
goto exit;
if (ret < 0)
goto exit;
@@
-937,8
+941,8
@@
static int abx500_dt_subnode_to_map(struct pinctrl_dev *pctldev,
if (ret < 0)
goto exit;
if (ret < 0)
goto exit;
- of_property_for_each_string(np, "
ste,pins", prop, group
) {
- gpio_name = abx500_find_pin_name(pctldev,
group
);
+ of_property_for_each_string(np, "
pins", prop, pin
) {
+ gpio_name = abx500_find_pin_name(pctldev,
pin
);
ret = abx500_dt_add_map_configs(map, reserved_maps,
num_maps, gpio_name, configs, 1);
ret = abx500_dt_add_map_configs(map, reserved_maps,
num_maps, gpio_name, configs, 1);