brcm63xx-arm: panther: Sync patches for BCM SDK 5.04L.02p1

iopsys-brcm63xx-arm/panther/bsp-patches/0001-Disable-EXT1-RGMII-in-u-boot-for-panther-devices.patch

-From a09e39ab4af6101a4d5a8668d451fb7f3e488f01 Mon Sep 17 00:00:00 2001
+From df38b166cc9cd2dd614e63bb030d1a96002fa9bf Mon Sep 17 00:00:00 2001
 From: Markus Gothe <markus.gothe@genexis.eu>
 Date: Tue, 22 Jun 2021 11:41:51 +0200
-Subject: [PATCH] Disable EXT1/RGMII in u-boot for panther devices. The driver
- is not working and breaks the expected behaviour.
+Subject: [PATCH 1/2] Disable EXT1/RGMII in u-boot for panther devices
 
+The driver is not working and breaks the expected behaviour.
 ---
  .../u-boot-2019.07/drivers/net/bcmbca/phy/Makefile        | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/bcm963xx/bootloaders/u-boot-2019.07/drivers/net/bcmbca/phy/Makefile b/bcm963xx/bootloaders/u-boot-2019.07/drivers/net/bcmbca/phy/Makefile
-index d670f53d0..e7d28a0ff 100644
+index 1da7a545e..4f0e5e48e 100644
 --- a/bcm963xx/bootloaders/u-boot-2019.07/drivers/net/bcmbca/phy/Makefile
 +++ b/bcm963xx/bootloaders/u-boot-2019.07/drivers/net/bcmbca/phy/Makefile
-@@ -57,11 +57,11 @@ ifeq ($(strip ${BRCM_CHIP}),6846)
+@@ -75,11 +75,11 @@ ifeq ($(strip ${BRCM_CHIP}),6846)
      DRV_OBJS += bus_drv_mdio_v1.o
      DRV_OBJS += mac_drv_unimac.o
      DRV_OBJS += phy_drv_6846_egphy.o
@@ -29,5 +29,5 @@ index d670f53d0..e7d28a0ff 100644
  ifeq ($(strip ${BRCM_CHIP}),6878)
      DRV_OBJS += mdio_drv_common.o
 -- 
-2.32.0
+2.31.1
 

iopsys-brcm63xx-arm/panther/bsp-patches/0002-Force-full-duplex-on-RGMII.patch

-From 9892a67806ca56e453afb9c314a04249006d0d15 Mon Sep 17 00:00:00 2001
+From 41c594c4ac10047fb1815835bd6d98857f11528e Mon Sep 17 00:00:00 2001
 From: Markus Gothe <markus.gothe@genexis.eu>
 Date: Tue, 22 Jun 2021 14:27:31 +0200
-Subject: [PATCH] Force full duplex on RGMII.
+Subject: [PATCH 2/2] Force full duplex on RGMII.
 
 ---
  bcm963xx/bcmdrivers/opensource/phy/phy_drv_ext1.c | 13 ++++++++++++-
  1 file changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/bcm963xx/bcmdrivers/opensource/phy/phy_drv_ext1.c b/bcm963xx/bcmdrivers/opensource/phy/phy_drv_ext1.c
-index 99f60ce45..496239d49 100644
+index 9d43577e0..68dad09d1 100644
 --- a/bcm963xx/bcmdrivers/opensource/phy/phy_drv_ext1.c
 +++ b/bcm963xx/bcmdrivers/opensource/phy/phy_drv_ext1.c
-@@ -69,6 +69,17 @@ Exit:
-     return ret;
+@@ -75,6 +75,17 @@ static int _phy_leds_init(phy_dev_t *phy_dev, void *leds_info)
+     return xrdp_leds_init(leds_info);
  }
  
 +static int _brcm_read_status(phy_dev_t *phy_dev)
@@ -29,15 +29,15 @@ index 99f60ce45..496239d49 100644
  phy_drv_t phy_drv_ext1 =
  {
      .phy_type = PHY_TYPE_EXT1,
-@@ -77,7 +88,7 @@ phy_drv_t phy_drv_ext1 =
+@@ -83,7 +94,7 @@ phy_drv_t phy_drv_ext1 =
      .power_set = mii_power_set,
      .apd_get = brcm_shadow_1c_apd_get,
      .apd_set = brcm_shadow_1c_apd_set,
--    .read_status = brcm_read_status,
+-    .read_status = brcm_read_status_rgmii_ib_override,
 +    .read_status = _brcm_read_status,
      .speed_set = mii_speed_set,
      .caps_get = mii_caps_get,
      .caps_set = mii_caps_set,
 -- 
-2.32.0
+2.31.1