Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / drivers / pinctrl / sh-pfc / core.c

diff --git a/kernel/drivers/pinctrl/sh-pfc/core.c b/kernel/drivers/pinctrl/sh-pfc/core.c
index 181ea98..2b0d702 100644 (file)
--- a/kernel/drivers/pinctrl/sh-pfc/core.c
+++ b/kernel/drivers/pinctrl/sh-pfc/core.c
@@ -545,7 +545,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)