sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

pinctrl: at91: retrieve device id in non dtb probe 

We need to retrieve the device id in device tree/non device tree case.

Signed-off-by: Raphaël Poggi <poggi.raph@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Raphaël Poggi 2014-09-08 15:07:57 +02:00 committed by Sascha Hauer
parent 9c885a2a6f
commit 5dc6c89d84
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/pinctrl/pinctrl-at91.c
View File

@ -620,9 +620,14 @@ static int at91_gpio_probe(struct device_d *dev)
struct at91_gpio_chip *at91_gpio;
struct clk *clk;
int ret;
int alias_idx = of_alias_get_id(dev->device_node, "gpio");
int alias_idx;
BUG_ON(dev->id > MAX_GPIO_BANKS);
if (dev->device_node)
alias_idx = of_alias_get_id(dev->device_node, "gpio");
else
alias_idx = dev->id;
BUG_ON(alias_idx > MAX_GPIO_BANKS);
at91_gpio = &gpio_chip[alias_idx];
@ -654,7 +659,7 @@ static int at91_gpio_probe(struct device_d *dev)
at91_gpio->chip.ops = &at91_gpio_ops;
at91_gpio->chip.ngpio = MAX_NB_GPIO_PER_BANK;
at91_gpio->chip.dev = dev;
at91_gpio->chip.base = dev->id * MAX_NB_GPIO_PER_BANK;
at91_gpio->chip.base = alias_idx * MAX_NB_GPIO_PER_BANK;
ret = gpiochip_add(&at91_gpio->chip);
if (ret) {