summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/nomadik
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-07-22 19:21:13 +0200
committerLinus Walleij <linus.walleij@linaro.org>2015-07-27 15:12:29 +0200
commit802bb9b67de75ea75638b8b1ca4b21a76a03bebf (patch)
tree0b105306f6fa64525f0cf7c2680d1e7bd0bcb637 /drivers/pinctrl/nomadik
parentee04139d916a61454850f3e3c687f50f891fc8bd (diff)
downloadlinux-802bb9b67de75ea75638b8b1ca4b21a76a03bebf.tar.gz
linux-802bb9b67de75ea75638b8b1ca4b21a76a03bebf.tar.bz2
linux-802bb9b67de75ea75638b8b1ca4b21a76a03bebf.zip
pinctrl: nomadik: depromote GPIO to subsystem_init()
We no longer have to do GPIO initialization before the pinctrl initialization, instead we can initialize the pinctrl portions of the driver first and then the GPIO. Thus we can move GPIO initialization to a subsystem_initcall(), but not yet to a device_initcall(). Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/nomadik')
-rw-r--r--drivers/pinctrl/nomadik/pinctrl-nomadik.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
index 8c87b2ec29c1..181fa546b298 100644
--- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c
+++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
@@ -2102,15 +2102,15 @@ static struct platform_driver nmk_pinctrl_driver = {
static int __init nmk_gpio_init(void)
{
- int ret;
+ return platform_driver_register(&nmk_gpio_driver);
+}
+subsys_initcall(nmk_gpio_init);
- ret = platform_driver_register(&nmk_gpio_driver);
- if (ret)
- return ret;
+static int __init nmk_pinctrl_init(void)
+{
return platform_driver_register(&nmk_pinctrl_driver);
}
-
-core_initcall(nmk_gpio_init);
+core_initcall(nmk_pinctrl_init);
MODULE_AUTHOR("Prafulla WADASKAR and Alessandro Rubini");
MODULE_DESCRIPTION("Nomadik GPIO Driver");