Now that gpiolib recognizes wlf,reset legacy GPIO and will handle it
even if DTS uses it without -gpio[s] suffix, we can switch to more
standard devm_gpiod_get() and later remove devm_gpiod_get_from_of_node().
Note that we will lose "arizona /RESET" custom GPIO label, but since we
do not set such custom label when using the modern binding, I opted to
not having it here either.
Signed-off-by: Dmitry Torokhov <[email protected]>
---
drivers/mfd/arizona-core.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 4a31907a4525..f73cf76d1373 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -814,11 +814,7 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
int ret, i;
/* Handle old non-standard DT binding */
- pdata->reset = devm_gpiod_get_from_of_node(arizona->dev,
- arizona->dev->of_node,
- "wlf,reset", 0,
- GPIOD_OUT_LOW,
- "arizona /RESET");
+ pdata->reset = devm_gpiod_get(arizona->dev, "wlf,reset", GPIOD_OUT_LOW);
if (IS_ERR(pdata->reset)) {
ret = PTR_ERR(pdata->reset);
--
2.23.0.444.g18eeb5a265-goog
--
Dmitry
On Wed, Oct 02, 2019 at 05:28:32PM -0700, Dmitry Torokhov wrote:
> Now that gpiolib recognizes wlf,reset legacy GPIO and will handle it
> even if DTS uses it without -gpio[s] suffix, we can switch to more
> standard devm_gpiod_get() and later remove devm_gpiod_get_from_of_node().
>
> Note that we will lose "arizona /RESET" custom GPIO label, but since we
> do not set such custom label when using the modern binding, I opted to
> not having it here either.
>
> Signed-off-by: Dmitry Torokhov <[email protected]>
> ---
Acked-by: Charles Keepax <[email protected]>
Thanks,
Charles
On Wed, 02 Oct 2019, Dmitry Torokhov wrote:
> Now that gpiolib recognizes wlf,reset legacy GPIO and will handle it
> even if DTS uses it without -gpio[s] suffix, we can switch to more
> standard devm_gpiod_get() and later remove devm_gpiod_get_from_of_node().
>
> Note that we will lose "arizona /RESET" custom GPIO label, but since we
> do not set such custom label when using the modern binding, I opted to
> not having it here either.
>
> Signed-off-by: Dmitry Torokhov <[email protected]>
> ---
> drivers/mfd/arizona-core.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
Applied, thanks.
--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog