diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2022-09-14 15:28:47 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2022-09-14 15:28:47 +0300 |
| commit | 94bc967b8d3b9cc7e69094aa7fc99dbb9036d727 (patch) | |
| tree | 22d9462f4b19ca61707cf43d0f8a29ca6eaf4c76 /drivers/pinctrl | |
| parent | 3f668365bcd8d17b4bcd0fdb62e5c748753196ec (diff) | |
| parent | 9d9292576810d0b36897718c24dfbc1a2835314b (diff) | |
| download | linux-94bc967b8d3b9cc7e69094aa7fc99dbb9036d727.tar.xz | |
Merge tag 'samsung-pinctrl-6.1' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung into devel
Samsung pinctrl drivers changes for v6.1
1. Minor fix in order of initializing pinctrl driver - GPIOs should be
configured before registering gpiolib.
2. Final steps to deprecated bindings headers with register constants.
The constants were moved to include files in DTS directories, because
these are not suitable for bindings. Remove final references and
mark binding header as deprecated to warn any users.
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/samsung/pinctrl-samsung.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c index 4837bceb767b..bd13b5ef246d 100644 --- a/drivers/pinctrl/samsung/pinctrl-samsung.c +++ b/drivers/pinctrl/samsung/pinctrl-samsung.c @@ -1166,15 +1166,15 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) if (ret) goto err_put_banks; - ret = samsung_gpiolib_register(pdev, drvdata); - if (ret) - goto err_unregister; - if (ctrl->eint_gpio_init) ctrl->eint_gpio_init(drvdata); if (ctrl->eint_wkup_init) ctrl->eint_wkup_init(drvdata); + ret = samsung_gpiolib_register(pdev, drvdata); + if (ret) + goto err_unregister; + platform_set_drvdata(pdev, drvdata); return 0; |