diff options
| author |   Wolfram Sang <wsa+renesas@sang-engineering.com> | 2016-03-07 19:40:57 +0100 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2016-03-30 10:57:51 +0200 |
| commit | 0129801be4b87226bf502f18f5a9eabd356d1058 (patch) | |
| tree | d3b58ef9a573f8a65efc1a27a6c3fd62cc965731 /drivers/pinctrl/sh-pfc/core.c | |
| parent | Linux 4.6-rc1 (diff) | |
| download | linux-dev-0129801be4b87226bf502f18f5a9eabd356d1058.tar.xz linux-dev-0129801be4b87226bf502f18f5a9eabd356d1058.zip | |
pinctrl: sh-pfc: only use dummy states for non-DT platforms
If pinctrl_provide_dummies() is used unconditionally, then the dummy
state will be used even on DT platforms when the "init" state was
intentionally left out. Instead of "default", the dummy "init" state
will then be used during probe. Thus, when probing an I2C controller on
cold boot, communication triggered by bus notifiers broke because the
pins were not initialized.
Do it like OMAP2: use the dummy state only for non-DT platforms.
Cc: stable@vger.kernel.org
Fixes: ef0eebc05130 ("drivers/pinctrl: Add the concept of an "init" state")
Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/sh-pfc/core.c')
| -rw-r--r-- | drivers/pinctrl/sh-pfc/core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c index dc3609f0c60b..ee0c1f2567d9 100644 --- a/drivers/pinctrl/sh-pfc/core.c +++ b/drivers/pinctrl/sh-pfc/core.c @@ -546,7 +546,9 @@ static int sh_pfc_probe(struct platform_device *pdev) return ret; } - pinctrl_provide_dummies(); + /* Enable dummy states for those platforms without pinctrl support */ + if (!of_have_populated_dt()) + pinctrl_provide_dummies(); ret = sh_pfc_init_ranges(pfc); if (ret < 0) |