Skip to content

Commit

Permalink
Fix broken Tinkerboard booting due to changes in stmmac driver (#1734)
Browse files Browse the repository at this point in the history
  • Loading branch information
igorpecovnik authored Jan 11, 2020
1 parent 0c38be8 commit 2099cb1
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
2 changes: 1 addition & 1 deletion config/kernel/linux-rockchip-current.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 5.4.6 Kernel Configuration
# Linux/arm 5.4.10 Kernel Configuration
#

#
Expand Down
Original file line number Diff line number Diff line change
@@ -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" },
{},

0 comments on commit 2099cb1

Please sign in to comment.