summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-07-10 09:24:47 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-07-10 09:24:51 +0200
commit3f44fcb45ea874251fe0544cc6fd76518adaab0f (patch)
treed3ab99b0028c54e3610c9c439e746594580f480b /drivers/net
parentaa8a42ac0a259187c88e8a4aca5f3d4f4f4b753a (diff)
downloadbarebox-3f44fcb45ea874251fe0544cc6fd76518adaab0f.tar.gz
net: cpsw: adopt to upstream device tree changes
Upstream device trees no longer have a "cpsw-phy-sel" property to find the phy_sel register, instead they have a child device of the pinctrl node compatible to "ti,am3352-phy-gmii-sel". Also the "rmii-clock-ext" property is no longer global to the cpsw but instead can be selected per slave. To adopt to these changes take the short way out for now and find the new node by its compatible and hardcode the "rmii-clock-ext" setting (which is set to true in am33xx-l4.dtsi and not overwritten by any board). This makes the cpsw driver work again. Tested on Beaglebone black board. Fixes: 1dc748b3b2 ("dts: update to v5.1-rc1") Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/cpsw.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c
index 65f71c6..df8981d 100644
--- a/drivers/net/cpsw.c
+++ b/drivers/net/cpsw.c
@@ -993,8 +993,13 @@ static int cpsw_phy_sel_init(struct cpsw_priv *priv, struct device_node *np)
phy_sel_addr = (void *)addr;
- if (of_property_read_bool(np, "rmii-clock-ext"))
- rmii_clock_external = true;
+ /*
+ * As of Linux-5.1 this is set to true in am33xx-l4.dtsi and not
+ * overwritten by any board. This is set to false in am437x-l4.dtsi
+ * though, so once we support this SoC we have to configure this from
+ * the device tree.
+ */
+ rmii_clock_external = true;
return 0;
}
@@ -1062,11 +1067,10 @@ static int cpsw_probe_dt(struct cpsw_priv *priv)
priv->slaves = xzalloc(sizeof(struct cpsw_slave) * priv->num_slaves);
- physel = of_parse_phandle(dev->device_node, "cpsw-phy-sel", 0);
+ physel = of_find_compatible_node(NULL, NULL, "ti,am3352-phy-gmii-sel");
if (!physel) {
- physel = of_get_child_by_name(dev->device_node, "cpsw-phy-sel");
- if (!physel)
- dev_err(dev, "Phy mode node not found\n");
+ dev_err(dev, "Cannot find ti,am3352-phy-gmii-sel node\n");
+ return -EINVAL;
}
ret = cpsw_phy_sel_init(priv, physel);
if (ret)