From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> To: linus.walleij@linaro.org, krzk@kernel.org Cc: tomasz.figa@gmail.com, s.nawrocki@samsung.com, linux-gpio@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.wolfsonmicro.com Subject: [PATCH v2 2/4] pinctrl: samsung: Register pinctrl before GPIO Date: Thu, 16 Feb 2017 13:27:14 +0000 [thread overview] Message-ID: <1487251636-2480-2-git-send-email-ckeepax@opensource.wolfsonmicro.com> (raw) In-Reply-To: <1487251636-2480-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> If we request a GPIO hog, then gpiochip_add_data will attempt to request some of its own GPIOs. The driver also uses gpiochip_generic_request which means that for any GPIO request to succeed the pinctrl needs to be registered. Currently however the driver registers the GPIO and then the pinctrl meaning all GPIO hog requests will fail, which then in turn causes the whole driver to fail probe. Fix this up by ensuring we register the pinctrl first. Although currently there are no users of GPIO hogs in mainline there are plenty of Samsung based boards that are widely used for development purposes of other hardware. Indeed we hit this issue whilst attaching some additional hardware to an Arndale system. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> --- Changes since v1: - Updated commit message drivers/pinctrl/samsung/pinctrl-samsung.c | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c index d79eada..1134bc3 100644 --- a/drivers/pinctrl/samsung/pinctrl-samsung.c +++ b/drivers/pinctrl/samsung/pinctrl-samsung.c @@ -893,6 +893,19 @@ static int samsung_pinctrl_register(struct platform_device *pdev, return 0; } +/* unregister the pinctrl interface with the pinctrl subsystem */ +static int samsung_pinctrl_unregister(struct platform_device *pdev, + struct samsung_pinctrl_drv_data *drvdata) +{ + struct samsung_pin_bank *bank = drvdata->pin_banks; + int i; + + for (i = 0; i < drvdata->nr_banks; ++i, ++bank) + pinctrl_remove_gpio_range(drvdata->pctl_dev, &bank->grange); + + return 0; +} + static const struct gpio_chip samsung_gpiolib_chip = { .request = gpiochip_generic_request, .free = gpiochip_generic_free, @@ -939,19 +952,6 @@ static int samsung_gpiolib_register(struct platform_device *pdev, return ret; } -/* unregister the gpiolib interface with the gpiolib subsystem */ -static int samsung_gpiolib_unregister(struct platform_device *pdev, - struct samsung_pinctrl_drv_data *drvdata) -{ - struct samsung_pin_bank *bank = drvdata->pin_banks; - int i; - - for (i = 0; i < drvdata->nr_banks; ++i, ++bank) - gpiochip_remove(&bank->gpio_chip); - - return 0; -} - /* retrieve the soc specific data */ static const struct samsung_pin_ctrl * samsung_pinctrl_get_soc_data(struct samsung_pinctrl_drv_data *d, @@ -1063,13 +1063,13 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) return PTR_ERR(drvdata->retention_ctrl); } - ret = samsung_gpiolib_register(pdev, drvdata); + ret = samsung_pinctrl_register(pdev, drvdata); if (ret) return ret; - ret = samsung_pinctrl_register(pdev, drvdata); + ret = samsung_gpiolib_register(pdev, drvdata); if (ret) { - samsung_gpiolib_unregister(pdev, drvdata); + samsung_pinctrl_unregister(pdev, drvdata); return ret; } -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> To: <linus.walleij@linaro.org>, <krzk@kernel.org> Cc: <tomasz.figa@gmail.com>, <s.nawrocki@samsung.com>, <linux-gpio@vger.kernel.org>, <linux-samsung-soc@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <patches@opensource.wolfsonmicro.com> Subject: [PATCH v2 2/4] pinctrl: samsung: Register pinctrl before GPIO Date: Thu, 16 Feb 2017 13:27:14 +0000 [thread overview] Message-ID: <1487251636-2480-2-git-send-email-ckeepax@opensource.wolfsonmicro.com> (raw) In-Reply-To: <1487251636-2480-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> If we request a GPIO hog, then gpiochip_add_data will attempt to request some of its own GPIOs. The driver also uses gpiochip_generic_request which means that for any GPIO request to succeed the pinctrl needs to be registered. Currently however the driver registers the GPIO and then the pinctrl meaning all GPIO hog requests will fail, which then in turn causes the whole driver to fail probe. Fix this up by ensuring we register the pinctrl first. Although currently there are no users of GPIO hogs in mainline there are plenty of Samsung based boards that are widely used for development purposes of other hardware. Indeed we hit this issue whilst attaching some additional hardware to an Arndale system. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> --- Changes since v1: - Updated commit message drivers/pinctrl/samsung/pinctrl-samsung.c | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c index d79eada..1134bc3 100644 --- a/drivers/pinctrl/samsung/pinctrl-samsung.c +++ b/drivers/pinctrl/samsung/pinctrl-samsung.c @@ -893,6 +893,19 @@ static int samsung_pinctrl_register(struct platform_device *pdev, return 0; } +/* unregister the pinctrl interface with the pinctrl subsystem */ +static int samsung_pinctrl_unregister(struct platform_device *pdev, + struct samsung_pinctrl_drv_data *drvdata) +{ + struct samsung_pin_bank *bank = drvdata->pin_banks; + int i; + + for (i = 0; i < drvdata->nr_banks; ++i, ++bank) + pinctrl_remove_gpio_range(drvdata->pctl_dev, &bank->grange); + + return 0; +} + static const struct gpio_chip samsung_gpiolib_chip = { .request = gpiochip_generic_request, .free = gpiochip_generic_free, @@ -939,19 +952,6 @@ static int samsung_gpiolib_register(struct platform_device *pdev, return ret; } -/* unregister the gpiolib interface with the gpiolib subsystem */ -static int samsung_gpiolib_unregister(struct platform_device *pdev, - struct samsung_pinctrl_drv_data *drvdata) -{ - struct samsung_pin_bank *bank = drvdata->pin_banks; - int i; - - for (i = 0; i < drvdata->nr_banks; ++i, ++bank) - gpiochip_remove(&bank->gpio_chip); - - return 0; -} - /* retrieve the soc specific data */ static const struct samsung_pin_ctrl * samsung_pinctrl_get_soc_data(struct samsung_pinctrl_drv_data *d, @@ -1063,13 +1063,13 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) return PTR_ERR(drvdata->retention_ctrl); } - ret = samsung_gpiolib_register(pdev, drvdata); + ret = samsung_pinctrl_register(pdev, drvdata); if (ret) return ret; - ret = samsung_pinctrl_register(pdev, drvdata); + ret = samsung_gpiolib_register(pdev, drvdata); if (ret) { - samsung_gpiolib_unregister(pdev, drvdata); + samsung_pinctrl_unregister(pdev, drvdata); return ret; } -- 2.1.4
next prev parent reply other threads:[~2017-02-16 13:26 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-02-16 13:27 [PATCH v2 1/4] pinctrl: Fix trivial spelling typo in a comment Charles Keepax 2017-02-16 13:27 ` Charles Keepax 2017-02-16 13:27 ` Charles Keepax [this message] 2017-02-16 13:27 ` [PATCH v2 2/4] pinctrl: samsung: Register pinctrl before GPIO Charles Keepax 2017-02-22 14:37 ` Linus Walleij 2017-02-22 14:37 ` Linus Walleij 2017-02-23 17:23 ` Charles Keepax 2017-02-23 17:23 ` Charles Keepax 2017-02-23 17:54 ` [PATCH] pinctrl: samsung: Calculate GPIO base for pinctrl_add_gpio_range Charles Keepax 2017-02-23 17:54 ` Charles Keepax 2017-02-27 2:13 ` Tomasz Figa 2017-02-27 2:13 ` Tomasz Figa 2017-02-28 9:01 ` Charles Keepax 2017-02-28 9:01 ` Charles Keepax 2017-02-28 17:04 ` [PATCH v2] " Charles Keepax 2017-02-28 17:04 ` Charles Keepax 2017-03-04 11:20 ` Tomasz Figa 2017-03-04 11:20 ` Tomasz Figa 2017-03-06 16:49 ` Charles Keepax 2017-03-06 16:49 ` Charles Keepax 2017-03-20 18:39 ` Krzysztof Kozlowski 2017-03-20 18:39 ` Krzysztof Kozlowski 2017-03-21 9:32 ` Charles Keepax 2017-03-21 9:32 ` Charles Keepax 2017-03-14 13:44 ` [PATCH v2 2/4] pinctrl: samsung: Register pinctrl before GPIO Linus Walleij 2017-03-14 13:44 ` Linus Walleij 2017-03-14 13:58 ` Krzysztof Kozlowski 2017-03-14 13:58 ` Krzysztof Kozlowski 2017-03-16 15:28 ` Linus Walleij 2017-03-16 15:28 ` Linus Walleij 2017-02-16 13:27 ` [PATCH v2 3/4] pinctrl: samsung: Remove unused local variable Charles Keepax 2017-02-16 13:27 ` Charles Keepax 2017-02-22 14:38 ` Linus Walleij 2017-02-22 14:38 ` Linus Walleij 2017-02-16 13:27 ` [PATCH v2 4/4] pinctrl: samsung: Use devres version of gpiochip_add_data Charles Keepax 2017-02-16 13:27 ` Charles Keepax 2017-02-17 13:35 ` Krzysztof Kozlowski 2017-02-17 13:52 ` Charles Keepax 2017-02-17 13:52 ` Charles Keepax 2017-03-20 18:44 ` Krzysztof Kozlowski 2017-03-23 9:47 ` Linus Walleij 2017-03-23 9:47 ` Linus Walleij 2017-03-23 11:34 ` Krzysztof Kozlowski 2017-03-23 11:34 ` Krzysztof Kozlowski
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1487251636-2480-2-git-send-email-ckeepax@opensource.wolfsonmicro.com \ --to=ckeepax@opensource.wolfsonmicro.com \ --cc=krzk@kernel.org \ --cc=linus.walleij@linaro.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=patches@opensource.wolfsonmicro.com \ --cc=s.nawrocki@samsung.com \ --cc=tomasz.figa@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.