[openwrt/openwrt] generic: fix BCM54612E suspend/resume backport patch

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/d7f638bc692a7a81cf13c8ca50c7dc4a73c0fed9

commit d7f638bc692a7a81cf13c8ca50c7dc4a73c0fed9
Author: Marco von Rosenberg <marcovr at selfnet.de>
AuthorDate: Wed Dec 18 23:32:42 2024 +0100

    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: 06cdc07f8cc7 ("ath79: add support for Huawei AP5030DN")
    Signed-off-by: Marco von Rosenberg <marcovr at selfnet.de>
    Link: https://github.com/openwrt/openwrt/pull/17312
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 ...-0260-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch | 4 ++--
 .../950-0382-Populate-phy-driver-block-for-BCM54213PE.patch         | 2 +-
 .../734-v6.8-net-phy-bcm54612e-add-suspend-resume.patch             | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/target/linux/bcm27xx/patches-6.6/950-0260-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch b/target/linux/bcm27xx/patches-6.6/950-0260-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch
index 69008c65de..b413315091 100644
--- a/target/linux/bcm27xx/patches-6.6/950-0260-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-0260-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch
@@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell <jonathan at raspberrypi.org>
  		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 <jonathan at raspberrypi.org>
  	.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,
  }, {
diff --git a/target/linux/bcm27xx/patches-6.6/950-0382-Populate-phy-driver-block-for-BCM54213PE.patch b/target/linux/bcm27xx/patches-6.6/950-0382-Populate-phy-driver-block-for-BCM54213PE.patch
index 218743e942..e74d2d361d 100644
--- a/target/linux/bcm27xx/patches-6.6/950-0382-Populate-phy-driver-block-for-BCM54213PE.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-0382-Populate-phy-driver-block-for-BCM54213PE.patch
@@ -16,7 +16,7 @@ Signed-off-by: Jonathan Lemon <jonathan.lemon at gmail.com>
 
 --- 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 */
diff --git a/target/linux/generic/backport-6.6/734-v6.8-net-phy-bcm54612e-add-suspend-resume.patch b/target/linux/generic/backport-6.6/734-v6.8-net-phy-bcm54612e-add-suspend-resume.patch
index 28524a3dcf..12a89dae74 100644
--- a/target/linux/generic/backport-6.6/734-v6.8-net-phy-bcm54612e-add-suspend-resume.patch
+++ b/target/linux/generic/backport-6.6/734-v6.8-net-phy-bcm54612e-add-suspend-resume.patch
@@ -16,12 +16,12 @@ Signed-off-by: David S. Miller <davem at davemloft.net>
 
 --- 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,