diff --git a/[refs] b/[refs] index 40fb180541b5..a2687e0af20b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f7e22283cec597e532b75d5a455ce6ed75de362 +refs/heads/master: 277ed0d542778182c863c30bdbd2441dee3f964c diff --git a/trunk/drivers/w1/masters/w1-gpio.c b/trunk/drivers/w1/masters/w1-gpio.c index 6012c4ea3206..aec35bd46506 100644 --- a/trunk/drivers/w1/masters/w1-gpio.c +++ b/trunk/drivers/w1/masters/w1-gpio.c @@ -16,6 +16,8 @@ #include #include #include +#include +#include #include "../w1.h" #include "../w1_int.h" @@ -85,8 +87,13 @@ static int __init w1_gpio_probe(struct platform_device *pdev) { struct w1_bus_master *master; struct w1_gpio_platform_data *pdata; + struct pinctrl *pinctrl; int err; + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); + if (IS_ERR(pinctrl)) + dev_warn(&pdev->dev, "unable to select pin group\n"); + err = w1_gpio_probe_dt(pdev); if (err < 0) return err;