Merge pull request hardkernel#53 from aiguo-zhao/khadas-vims-4.9.y

VIM3: WOL: Solve Wol not effective
Dangku · Dec 15, 2021 · 20dad82 · 20dad82
2 parents 0bf9e54 + c66403b
commit 20dad82
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
@@ -610,6 +610,9 @@ void meson6_dwmac_shutdown(struct platform_device *pdev)
 }
 
 #endif
+
+extern int wol_enable;
+
 static int meson6_dwmac_probe(struct platform_device *pdev)
 {
 	struct plat_stmmacenet_data *plat_dat;
@@ -660,7 +663,7 @@ static int meson6_dwmac_probe(struct platform_device *pdev)
 	ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
 	if (ret)
 		goto err_remove_config_dt;
-	if (support_mac_wol)
+	if (wol_enable)
 		device_init_wakeup(&pdev->dev, 1);
 	return 0;
 

diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
@@ -46,7 +46,7 @@ MODULE_AUTHOR("Johnson Leung");
 MODULE_LICENSE("GPL");
 
 struct phy_device *g_phydev;
-static int wol_enable = 0;
+int wol_enable = 0;
 
 #ifdef CONFIG_AMLOGIC_ETH_PRIVE
 unsigned int support_external_phy_wol;