sunxi: driver refresh for 3.13

[openwrt.git] / target / linux / sunxi / patches-3.13 / 151-8-stmmac-fixup-8.patch

diff --git a/target/linux/sunxi/patches-3.13/151-8-stmmac-fixup-8.patch b/target/linux/sunxi/patches-3.13/151-8-stmmac-fixup-8.patch
new file mode 100644 (file)
index 0000000..b4ffecb
--- /dev/null
+++ b/target/linux/sunxi/patches-3.13/151-8-stmmac-fixup-8.patch
@@ -0,0 +1,50 @@
+From db88f10ad6a84c5bcb71bf51f0988a4bb1733bea Mon Sep 17 00:00:00 2001
+From: Srinivas Kandagatla <srinivas.kandagatla@st.com>
+Date: Thu, 16 Jan 2014 10:52:52 +0000
+Subject: [PATCH] net: stmmac: restore pinstate in pm resume.
+
+This patch adds code to restore default pinstate of the pins when it
+comes back from low power state. Without this patch the state of the
+pins would be unknown and the driver would not work.
+
+This patch also adds code to put the pins in to sleep state when the
+driver enters low power state.
+
+Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
+Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+index c1298a0..df7d8d6 100644
+--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+@@ -43,6 +43,7 @@
+ #include <linux/dma-mapping.h>
+ #include <linux/slab.h>
+ #include <linux/prefetch.h>
++#include <linux/pinctrl/consumer.h>
+ #ifdef CONFIG_STMMAC_DEBUG_FS
+ #include <linux/debugfs.h>
+ #include <linux/seq_file.h>
+@@ -2864,6 +2865,7 @@ int stmmac_suspend(struct net_device *ndev)
+               priv->hw->mac->pmt(priv->ioaddr, priv->wolopts);
+       else {
+               stmmac_set_mac(priv->ioaddr, false);
++              pinctrl_pm_select_sleep_state(priv->device);
+               /* Disable clock in case of PWM is off */
+               clk_disable_unprepare(priv->stmmac_clk);
+       }
+@@ -2890,6 +2892,7 @@ int stmmac_resume(struct net_device *ndev)
+       if (device_may_wakeup(priv->device)) {
+               priv->hw->mac->pmt(priv->ioaddr, 0);
+       } else {
++              pinctrl_pm_select_default_state(priv->device);
+               /* enable the clk prevously disabled */
+               clk_prepare_enable(priv->stmmac_clk);
+               /* reset the phy so that it's ready */
+-- 
+1.8.5.5
+