redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

regulator: gpio-regulator: fix forgotten gpios-states reading 

Commit 934624d6e9 ("regulator: gpio-regulator: do not open-code counting
and access of dt array elements") forgot to convert the recently added
gpios-states property using the same pattern.

Convert this instance to use the of-helpers too, resolving the build error.

Signed-off-by: Heiko Stuebner <heiko.stuebner@bqreaders.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
hifive-unleashed-5.1
Heiko Stuebner 2014-02-13 16:34:32 +01:00 committed by Mark Brown
parent 934624d6e9
commit 1f5a9623eb
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/regulator/gpio-regulator.c
View File

@ -171,13 +171,14 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np)
if (!config->gpios)
return ERR_PTR(-ENOMEM);
prop = of_find_property(np, "gpios-states", NULL);
if (prop) {
proplen = prop->length / sizeof(int);
if (proplen != config->nr_gpios) {
dev_warn(dev, "gpios <-> gpios-states mismatch\n");
prop = NULL;
}
proplen = of_property_count_u32_elems(np, "gpios-states");
/* optional property */
if (proplen < 0)
proplen = 0;
if (proplen > 0 && proplen != config->nr_gpios) {
dev_warn(dev, "gpios <-> gpios-states mismatch\n");
proplen = 0;
}
for (i = 0; i < config->nr_gpios; i++) {
@ -185,8 +186,11 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np)
if (gpio < 0)
break;
config->gpios[i].gpio = gpio;
if (prop && be32_to_cpup((int *)prop->value + i))
config->gpios[i].flags = GPIOF_OUT_INIT_HIGH;
if (proplen > 0) {
of_property_read_u32_index(np, "gpios-states", i, &ret);
if (ret)
config->gpios[i].flags = GPIOF_OUT_INIT_HIGH;
}
}
/* Fetch states. */