| Message ID | 1531745857-5561-3-git-send-email-alexandre.torgue@st.com |
|---|---|
| State | New |
| Headers | show |
| Series | STM32 pinctrl updates | expand |
On Mon, Jul 16, 2018 at 2:57 PM Alexandre Torgue <alexandre.torgue@st.com> wrote: > Register a new GPIO bank only if GPIO bank node is enabled. This patch also > adds checks on ranges which are defined only if a bank is registered. > > Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com> Patch applied. Alexandre can you check the discussion we've had about using GPIOLIB_IRQCHIP for multi-bank GPIOs with several IRQ lines as per drivers/gpio/gpio-tegra186.c? Is this approach applicable for STM32 so we can pull more stuff in under GPIOLIB_IRQCHIP? Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Linus On 07/29/2018 10:11 PM, Linus Walleij wrote: > On Mon, Jul 16, 2018 at 2:57 PM Alexandre Torgue > <alexandre.torgue@st.com> wrote: > >> Register a new GPIO bank only if GPIO bank node is enabled. This patch also >> adds checks on ranges which are defined only if a bank is registered. >> >> Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com> > > Patch applied. > Thanks > Alexandre can you check the discussion we've had about using > GPIOLIB_IRQCHIP for multi-bank GPIOs with several IRQ > lines as per drivers/gpio/gpio-tegra186.c? > > Is this approach applicable for STM32 so we can pull > more stuff in under GPIOLIB_IRQCHIP? > Ok. I'm going to check what's possible to do. I let you know soon. regards Alex > Yours, > Linus Walleij > -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c index eb6ae14..111225e 100644 --- a/drivers/pinctrl/stm32/pinctrl-stm32.c +++ b/drivers/pinctrl/stm32/pinctrl-stm32.c @@ -639,6 +639,11 @@ static int stm32_pmx_set_mux(struct pinctrl_dev *pctldev, } range = pinctrl_find_gpio_range_from_pin(pctldev, g->pin); + if (!range) { + dev_err(pctl->dev, "No gpio range defined.\n"); + return -EINVAL; + } + bank = gpiochip_get_data(range->gc); pin = stm32_gpio_pin(g->pin); @@ -807,11 +812,17 @@ static int stm32_pconf_parse_conf(struct pinctrl_dev *pctldev, unsigned int pin, enum pin_config_param param, enum pin_config_param arg) { + struct stm32_pinctrl *pctl = pinctrl_dev_get_drvdata(pctldev); struct pinctrl_gpio_range *range; struct stm32_gpio_bank *bank; int offset, ret = 0; range = pinctrl_find_gpio_range_from_pin(pctldev, pin); + if (!range) { + dev_err(pctl->dev, "No gpio range defined.\n"); + return -EINVAL; + } + bank = gpiochip_get_data(range->gc); offset = stm32_gpio_pin(pin); @@ -893,6 +904,9 @@ static void stm32_pconf_dbg_show(struct pinctrl_dev *pctldev, bool val; range = pinctrl_find_gpio_range_from_pin_nolock(pctldev, pin); + if (!range) + return; + bank = gpiochip_get_data(range->gc); offset = stm32_gpio_pin(pin); @@ -1173,7 +1187,7 @@ int stm32_pctl_probe(struct platform_device *pdev) return PTR_ERR(pctl->pctl_dev); } - for_each_child_of_node(np, child) + for_each_available_child_of_node(np, child) if (of_property_read_bool(child, "gpio-controller")) banks++; @@ -1186,7 +1200,7 @@ int stm32_pctl_probe(struct platform_device *pdev) if (!pctl->banks) return -ENOMEM; - for_each_child_of_node(np, child) { + for_each_available_child_of_node(np, child) { if (of_property_read_bool(child, "gpio-controller")) { ret = stm32_gpiolib_register_bank(pctl, child); if (ret)
Register a new GPIO bank only if GPIO bank node is enabled. This patch also adds checks on ranges which are defined only if a bank is registered. Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>