u-boot: remove now-upstreamed rock-pi-e patches
PATCH 1/1 u-boot: remove now-upstreamed rock-pi-e patches
These patches were back-ported from upstream to fix an issue with automatically handling different ethernet PHY chips on different spins of the rock-pi-e board. Now that the version of U-Boot has been updated in oe-core master, these pack-ports are no longer required to be applied explicitly.
Signed-off-by Trevor Woerner <[email protected]>
--- ...are_Reset_eth_phy_before_phy_connect.patch | 83 ------------------- ...-e_Enable_DM_ETH_PHY_and_PHY_REALTEK.patch | 65 --------------- recipes-bsp/u-boot/u-boot_%.bbappend | 6 -- 3 files changed, 154 deletions(-) delete mode 100644 recipes-bsp/u-boot/files/PATCH_1-2_net_designware_Reset_eth_phy_before_phy_connect.patch delete mode 100644 recipes-bsp/u-boot/files/PATCH_2-2_rockchip_rk3328-rock-pi-e_Enable_DM_ETH_PHY_and_PHY_REALTEK.patch
recipes-bsp/u-boot/files/PATCH_1-2_net_designware_Reset_eth_phy_before_phy_connect.patch deleted +0 -83
@@ -1,83 +0,0 @@ -From: Jonas Karlman <[email protected]> -To: Kever Yang <[email protected]>, Ramon Fried - <[email protected]>, Joe Hershberger <[email protected]>, Simon - Glass <[email protected]>, Banglang Huang <[email protected]> -Cc: Trevor Woerner <[email protected]>, [email protected], Jonas - Karlman <[email protected]> -Subject: [PATCH 1/2] net: designware: Reset eth phy before phy connect -Date: Thu, 18 Jan 2024 07:19:45 +0000 -Message-ID: <[email protected]> -X-Mailer: git-send-email 2.43.0 -In-Reply-To: <[email protected]> -References: <[email protected]> -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -X-Report-Abuse-To: [email protected] -X-Report-Abuse: [email protected] -X-Complaints-To: [email protected] -X-ForwardEmail-Version: 0.4.40 -X-ForwardEmail-Sender: rfc822; [email protected], smtp.forwardemail.net, - 149.28.215.223 -X-ForwardEmail-ID: 65a8d11ed66eecd94fbb691a - -Some ethernet PHY require being reset before a phy-id can be read back -on the MDIO bus. This can result in the following message being show -on e.g. a Radxa ROCK Pi E v1.21 with a RTL8211F ethernet PHY. - - Could not get PHY for ethernet@ff540000: addr -1 - -Add support to designware ethernet driver to reset eth phy by calling -the eth phy uclass function eth_phy_set_mdio_bus(). The call use NULL -as bus parameter to not set a shared mdio bus reference that would be -freed when probe fails. Also add a eth_phy_get_addr() call to try and -get the phy addr from DT when DM_MDIO is disabled. - -This help fix ethernet on Radxa ROCK Pi E v1.21: - - => mdio list - ethernet@ff540000: - 1 - RealTek RTL8211F <--> ethernet@ff540000 - -Upstream-Status: Submitted -Reported-by: Trevor Woerner <[email protected]> -Signed-off-by: Jonas Karlman <[email protected]> ---- - drivers/net/designware.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/drivers/net/designware.c b/drivers/net/designware.c -index a174344b3ef5..9aa5d8a1409e 100644 ---- a/drivers/net/designware.c -+++ b/drivers/net/designware.c -@@ -13,6 +13,7 @@ - #include <cpu_func.h> - #include <dm.h> - #include <errno.h> -+#include <eth_phy.h> - #include <log.h> - #include <miiphy.h> - #include <malloc.h> -@@ -576,6 +577,9 @@ static int dw_phy_init(struct dw_eth_dev *priv, void *dev) - struct phy_device *phydev; - int ret; - -+ if (IS_ENABLED(CONFIG_DM_ETH_PHY)) -+ eth_phy_set_mdio_bus(dev, NULL); -+ - #if IS_ENABLED(CONFIG_DM_MDIO) - phydev = dm_eth_phy_connect(dev); - if (!phydev) -@@ -583,6 +587,9 @@ static int dw_phy_init(struct dw_eth_dev *priv, void *dev) - #else - int phy_addr = -1; - -+ if (IS_ENABLED(CONFIG_DM_ETH_PHY)) -+ phy_addr = eth_phy_get_addr(dev); -+ - #ifdef CONFIG_PHY_ADDR - phy_addr = CONFIG_PHY_ADDR; - #endif --- -2.43.0 - -
recipes-bsp/u-boot/files/PATCH_2-2_rockchip_rk3328-rock-pi-e_Enable_DM_ETH_PHY_and_PHY_REALTEK.patch deleted +0 -65
65 lines not on this page · raw message
recipes-bsp/u-boot/u-boot_%.bbappend +0 -6
@@ -1,9 +1,3 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI:append:rock-pi-e = " \ - file://PATCH_1-2_net_designware_Reset_eth_phy_before_phy_connect.patch \ - file://PATCH_2-2_rockchip_rk3328-rock-pi-e_Enable_DM_ETH_PHY_and_PHY_REALTEK.patch \ - " - # various machines require the pyelftools library for parsing dtb files DEPENDS:append = " python3-pyelftools-native" DEPENDS:append:rk3308 = " u-boot-tools-native"
Signature · 1 line
2.44.0.478.g7774cfed6261
Trevor Woerner
AppliedQuoted 5 lines · Trevor Woerner
These patches were back-ported from upstream to fix an issue with automatically handling different ethernet PHY chips on different spins of the rock-pi-e board. Now that the version of U-Boot has been updated in oe-core master, these pack-ports are no longer required to be applied explicitly.
Quoted 8 lines
Signed-off-by Trevor Woerner <[email protected]>--- ...are_Reset_eth_phy_before_phy_connect.patch | 83 ------------------- ...-e_Enable_DM_ETH_PHY_and_PHY_REALTEK.patch | 65 --------------- recipes-bsp/u-boot/u-boot_%.bbappend | 6 -- 3 files changed, 154 deletions(-) delete mode 100644 recipes-bsp/u-boot/files/PATCH_1-2_net_designware_Reset_eth_phy_before_phy_connect.patch delete mode 100644 recipes-bsp/u-boot/files/PATCH_2-2_rockchip_rk3328-rock-pi-e_Enable_DM_ETH_PHY_and_PHY_REALTEK.patch
Applied to meta-rockchip, master branch.