forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
generic: fix BCM54612E suspend/resume backport patch
This backport patch inserted suspend/resume callbacks for the wrong PHY driver. The fixed patch is needed for Huawei AP5030DN to initialize its second PHY. Refresh all affected patch with make target/linux/refresh. Fixes: 06cdc07 ("ath79: add support for Huawei AP5030DN") Signed-off-by: Marco von Rosenberg <[email protected]>
- Loading branch information
1 parent
31e45f6
commit 3cea233
Showing
3 changed files
with
6 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
| return; | ||
|
|
||
| val = bcm_phy_read_shadow(phydev, BCM54XX_SHD_SCR3); | ||
| @@ -1021,7 +1022,7 @@ static struct phy_driver broadcom_driver | ||
| @@ -1019,7 +1020,7 @@ static struct phy_driver broadcom_driver | ||
| .link_change_notify = bcm54xx_link_change_notify, | ||
| }, { | ||
| .phy_id = PHY_ID_BCM54210E, | ||
|
|
@@ -35,7 +35,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
| .name = "Broadcom BCM54210E", | ||
| /* PHY_GBIT_FEATURES */ | ||
| .flags = PHY_ALWAYS_CALL_SUSPEND, | ||
| @@ -1039,6 +1040,13 @@ static struct phy_driver broadcom_driver | ||
| @@ -1037,6 +1038,13 @@ static struct phy_driver broadcom_driver | ||
| .set_wol = bcm54xx_phy_set_wol, | ||
| .led_brightness_set = bcm_phy_led_brightness_set, | ||
| }, { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,7 @@ Signed-off-by: Jonathan Lemon <[email protected]> | |
|
|
||
| --- a/drivers/net/phy/broadcom.c | ||
| +++ b/drivers/net/phy/broadcom.c | ||
| @@ -1052,8 +1052,14 @@ static struct phy_driver broadcom_driver | ||
| @@ -1050,8 +1050,14 @@ static struct phy_driver broadcom_driver | ||
| .phy_id_mask = 0xffffffff, | ||
| .name = "Broadcom BCM54213PE", | ||
| /* PHY_GBIT_FEATURES */ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,12 +16,12 @@ Signed-off-by: David S. Miller <[email protected]> | |
|
|
||
| --- a/drivers/net/phy/broadcom.c | ||
| +++ b/drivers/net/phy/broadcom.c | ||
| @@ -1001,6 +1001,8 @@ static struct phy_driver broadcom_driver | ||
| .config_intr = bcm_phy_config_intr, | ||
| @@ -1061,6 +1061,8 @@ static struct phy_driver broadcom_driver | ||
| .handle_interrupt = bcm_phy_handle_interrupt, | ||
| .link_change_notify = bcm54xx_link_change_notify, | ||
| .led_brightness_set = bcm_phy_led_brightness_set, | ||
| + .suspend = bcm54xx_suspend, | ||
| + .resume = bcm54xx_resume, | ||
| }, { | ||
| .phy_id = PHY_ID_BCM5421, | ||
| .phy_id = PHY_ID_BCM54616S, | ||
| .phy_id_mask = 0xfffffff0, | ||