Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[cascardo/linux.git] / drivers / net / ethernet / ti / cpsw.c

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index ab48cef..05a1674 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -35,6 +35,7 @@
 #include <linux/if_vlan.h>
 
 #include <linux/platform_data/cpsw.h>
+#include <linux/pinctrl/consumer.h>
 
 #include "cpsw_ale.h"
 #include "cpts.h"
@@ -1691,6 +1692,9 @@ static int cpsw_probe(struct platform_device *pdev)
         */
        pm_runtime_enable(&pdev->dev);
 
+       /* Select default pin state */
+       pinctrl_pm_select_default_state(&pdev->dev);
+
        if (cpsw_probe_dt(&priv->data, pdev)) {
                pr_err("cpsw: platform data missing\n");
                ret = -ENODEV;
@@ -1982,6 +1986,9 @@ static int cpsw_suspend(struct device *dev)
        soft_reset("sliver 1", &priv->slaves[1].sliver->soft_reset);
        pm_runtime_put_sync(&pdev->dev);
 
+       /* Select sleep pin state */
+       pinctrl_pm_select_sleep_state(&pdev->dev);
+
        return 0;
 }
 
@@ -1991,6 +1998,10 @@ static int cpsw_resume(struct device *dev)
        struct net_device       *ndev = platform_get_drvdata(pdev);
 
        pm_runtime_get_sync(&pdev->dev);
+
+       /* Select default pin state */
+       pinctrl_pm_select_default_state(&pdev->dev);
+
        if (netif_running(ndev))
                cpsw_ndo_open(ndev);
        return 0;