aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/dsa/bcm_sf2.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index 077a24541584..e3ee27ce13dd 100644
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -30,7 +30,6 @@
30#include <linux/etherdevice.h> 30#include <linux/etherdevice.h>
31#include <net/switchdev.h> 31#include <net/switchdev.h>
32#include <linux/platform_data/b53.h> 32#include <linux/platform_data/b53.h>
33#include <linux/kexec.h>
34 33
35#include "bcm_sf2.h" 34#include "bcm_sf2.h"
36#include "bcm_sf2_regs.h" 35#include "bcm_sf2_regs.h"
@@ -1141,9 +1140,11 @@ static void bcm_sf2_sw_shutdown(struct platform_device *pdev)
1141 /* For a kernel about to be kexec'd we want to keep the GPHY on for a 1140 /* For a kernel about to be kexec'd we want to keep the GPHY on for a
1142 * successful MDIO bus scan to occur. If we did turn off the GPHY 1141 * successful MDIO bus scan to occur. If we did turn off the GPHY
1143 * before (e.g: port_disable), this will also power it back on. 1142 * before (e.g: port_disable), this will also power it back on.
1143 *
1144 * Do not rely on kexec_in_progress, just power the PHY on.
1144 */ 1145 */
1145 if (priv->hw_params.num_gphy == 1) 1146 if (priv->hw_params.num_gphy == 1)
1146 bcm_sf2_gphy_enable_set(priv->dev->ds, kexec_in_progress); 1147 bcm_sf2_gphy_enable_set(priv->dev->ds, true);
1147} 1148}
1148 1149
1149#ifdef CONFIG_PM_SLEEP 1150#ifdef CONFIG_PM_SLEEP