From 2099cb15573a112b3f35814fc3a7dae259b2f30a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sat, 11 Jan 2020 21:46:25 +0100 Subject: [PATCH] Fix broken Tinkerboard booting due to changes in stmmac driver (#1734) --- config/kernel/linux-rockchip-current.config | 2 +- .../general-temporary-ethernet-fixup.patch | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 patch/kernel/rockchip-current/general-temporary-ethernet-fixup.patch diff --git a/config/kernel/linux-rockchip-current.config b/config/kernel/linux-rockchip-current.config index dc305d8b1d95..61d5397aef2f 100644 --- a/config/kernel/linux-rockchip-current.config +++ b/config/kernel/linux-rockchip-current.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.4.6 Kernel Configuration +# Linux/arm 5.4.10 Kernel Configuration # # diff --git a/patch/kernel/rockchip-current/general-temporary-ethernet-fixup.patch b/patch/kernel/rockchip-current/general-temporary-ethernet-fixup.patch new file mode 100644 index 000000000000..7bea4e6b9d1b --- /dev/null +++ b/patch/kernel/rockchip-current/general-temporary-ethernet-fixup.patch @@ -0,0 +1,23 @@ +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" }, + {},