diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-07 17:51:17 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-07 17:51:17 +0400 |
| commit | 77445a14d6a3a1f920e3b031603541fc807f5f9b (patch) | |
| tree | 17a6a75a83fc602345969b29fdf7199afe2df526 /drivers/gpio/gpio-rcar.c | |
| parent | 57841439b62e3ddb5ee50e765aa50330dde612d0 (diff) | |
| parent | 702a4879ec337463f858c8ab467482cce260bf18 (diff) | |
| download | linux-77445a14d6a3a1f920e3b031603541fc807f5f9b.tar.xz | |
Merge remote-tracking branch 'spi/topic/bitbang' into HEAD
Diffstat (limited to 'drivers/gpio/gpio-rcar.c')
| -rw-r--r-- | drivers/gpio/gpio-rcar.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c index e3745eb07570..6038966ab045 100644 --- a/drivers/gpio/gpio-rcar.c +++ b/drivers/gpio/gpio-rcar.c @@ -293,10 +293,9 @@ static void gpio_rcar_parse_pdata(struct gpio_rcar_priv *p) if (pdata) { p->config = *pdata; } else if (IS_ENABLED(CONFIG_OF) && np) { - ret = of_parse_phandle_with_args(np, "gpio-ranges", - "#gpio-range-cells", 0, &args); - p->config.number_of_pins = ret == 0 && args.args_count == 3 - ? args.args[2] + ret = of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3, 0, + &args); + p->config.number_of_pins = ret == 0 ? args.args[2] : RCAR_MAX_GPIO_PER_BANK; p->config.gpio_base = -1; } |