From fd6b14d15cb267f96ced6b7ae36c25d329d7152c Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sun, 12 Jan 2020 21:02:56 +0100 Subject: [PATCH] Revert "Fix broken Tinkerboard booting due to changes in stmmac driver (#1734)" This reverts commit 2099cb15573a112b3f35814fc3a7dae259b2f30a. --- .../general-temporary-ethernet-fixup.patch | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 patch/kernel/rockchip-current/general-temporary-ethernet-fixup.patch diff --git a/patch/kernel/rockchip-current/general-temporary-ethernet-fixup.patch b/patch/kernel/rockchip-current/general-temporary-ethernet-fixup.patch deleted file mode 100644 index 7bea4e6b9d1b..000000000000 --- a/patch/kernel/rockchip-current/general-temporary-ethernet-fixup.patch +++ /dev/null @@ -1,23 +0,0 @@ -This is a temporary fix for ethernet with kernels 5.4.7+ - -It reverts the following change: https://patchwork.ozlabs.org/patch/1213121/ -which disabled mdio init for most of the boards except NanoPi M4(V2) -or NanoPC T4 which have proper device tree definition for mdio/phy. - -The proper fix will be to add phy device tree node for boards that miss -it. - ---- -diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c -index 170c3a052b14..1f230bd854c4 100644 ---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c -+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c -@@ -320,7 +320,7 @@ out: - static int stmmac_dt_phy(struct plat_stmmacenet_data *plat, - struct device_node *np, struct device *dev) - { -- bool mdio = false; -+ bool mdio = true; - static const struct of_device_id need_mdio_ids[] = { - { .compatible = "snps,dwc-qos-ethernet-4.10" }, - {},