diff options
| author | Tom Rini | 2024-03-11 13:40:06 -0400 |
|---|---|---|
| committer | Tom Rini | 2024-03-11 15:27:20 -0400 |
| commit | 20a0ce574d6642e0dfe651467159039fac48cc4f (patch) | |
| tree | 9a76dcd90a2e27e65963b4a74d1621cd10fe91f0 /drivers/net | |
| parent | beedf675b36841ce1e077779157a87a6505317e6 (diff) | |
| parent | f3c979dd0053c082d2df170446923e7ce5edbc2d (diff) | |
Merge tag 'v2024.04-rc4' into next
Prepare v2024.04-rc4
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/mv88e6xxx.c | 8 | ||||
| -rw-r--r-- | drivers/net/phy/ethernet_id.c | 3 | ||||
| -rw-r--r-- | drivers/net/ravb.c | 4 |
3 files changed, 13 insertions, 2 deletions
diff --git a/drivers/net/mv88e6xxx.c b/drivers/net/mv88e6xxx.c index c073f81e72d..8fbbc1cacca 100644 --- a/drivers/net/mv88e6xxx.c +++ b/drivers/net/mv88e6xxx.c @@ -745,6 +745,7 @@ static int mv88e6xxx_probe(struct udevice *dev) { struct dsa_pdata *dsa_pdata = dev_get_uclass_plat(dev); struct mv88e6xxx_priv *priv = dev_get_priv(dev); + fdt_addr_t smi_addr; int val, ret; if (ofnode_valid(dev_ofnode(dev)) && @@ -753,6 +754,13 @@ static int mv88e6xxx_probe(struct udevice *dev) return -ENODEV; } + smi_addr = dev_read_addr(dev); + if (smi_addr == FDT_ADDR_T_NONE) { + dev_err(dev, "Missing SMI address\n"); + return -EINVAL; + } + priv->smi_addr = smi_addr; + /* probe internal mdio bus */ ret = mv88e6xxx_probe_mdio(dev); if (ret) diff --git a/drivers/net/phy/ethernet_id.c b/drivers/net/phy/ethernet_id.c index 877a51c3d00..6cb1fd4453e 100644 --- a/drivers/net/phy/ethernet_id.c +++ b/drivers/net/phy/ethernet_id.c @@ -71,6 +71,9 @@ struct phy_device *phy_connect_phy_id(struct mii_dev *bus, struct udevice *dev, } } + if (phyaddr == -1) + phyaddr = ofnode_read_u32_default(phandle_args.node, "reg", -1); + id = vendor << 16 | device; phydev = phy_device_create(bus, phyaddr, id, false); if (phydev) diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c index 0bcd6cfd3f3..4764bca7082 100644 --- a/drivers/net/ravb.c +++ b/drivers/net/ravb.c @@ -392,8 +392,8 @@ static int ravb_dmac_init(struct udevice *dev) writel(0x00222210, eth->iobase + RAVB_REG_TGC); /* Delay CLK: 2ns (not applicable on R-Car E3/D3) */ - if ((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A77990) || - (rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A77995)) + if ((renesas_get_cpu_type() == RENESAS_CPU_TYPE_R8A77990) || + (renesas_get_cpu_type() == RENESAS_CPU_TYPE_R8A77995)) return 0; if (!dev_read_u32(dev, "rx-internal-delay-ps", &delay)) { |