diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-03-14 10:10:25 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-03-14 10:10:25 +0100 |
| commit | 26dc1bf751724540716a4a17a80f7605ebf61b3a (patch) | |
| tree | abdbff429227f48dfd0855dac8ad6381ee8b9ac1 /drivers/pinctrl/pinctrl-stm32.c | |
| parent | d8ef1573dfc3475d4f5dffa37cb4444b5d6f21eb (diff) | |
| parent | 79d2a2d4a4608fd0ca9f1eeb06e4aee0fb095f19 (diff) | |
| download | barebox-26dc1bf751724540716a4a17a80f7605ebf61b3a.tar.gz barebox-26dc1bf751724540716a4a17a80f7605ebf61b3a.tar.xz | |
Merge branch 'for-next/stm32'
Diffstat (limited to 'drivers/pinctrl/pinctrl-stm32.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-stm32.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/pinctrl/pinctrl-stm32.c b/drivers/pinctrl/pinctrl-stm32.c index ceaa4254c4..cee10636ce 100644 --- a/drivers/pinctrl/pinctrl-stm32.c +++ b/drivers/pinctrl/pinctrl-stm32.c @@ -303,7 +303,7 @@ static int stm32_gpiochip_add(struct stm32_gpio_bank *bank, enum { PINCTRL_PHANDLE, GPIOCTRL_OFFSET, PINCTRL_OFFSET, PINCOUNT, GPIO_RANGE_NCELLS }; const __be32 *gpio_ranges; u32 ngpios; - int id, ret, size; + int ret, size; dev = of_platform_device_create(np, parent); if (!dev) @@ -347,17 +347,7 @@ static int stm32_gpiochip_add(struct stm32_gpio_bank *bank, bank->base = IOMEM(iores->start); - if (dev->id >= 0) { - id = dev->id; - } else { - id = of_alias_get_id(np, "gpio"); - if (id < 0) { - dev_err(dev, "Failed to get GPIO alias\n"); - return id; - } - } - - bank->chip.base = id * STM32_GPIO_PINS_PER_BANK; + bank->chip.base = be32_to_cpu(gpio_ranges[PINCTRL_OFFSET]); bank->chip.ops = &stm32_gpio_ops; bank->chip.dev = dev; bank->clk = clk_get(dev, NULL); |