diff options
| author | Tom Rini <trini@konsulko.com> | 2019-09-04 16:02:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-09-04 16:02:03 -0400 |
| commit | ece9834f7d223097cec92e3d3c70cd37b3768482 (patch) | |
| tree | d2935e582cb3494364bf2b7bc89a3d227d616e97 /net/mdio-uclass.c | |
| parent | 448f11f7503995746a7b71e5e3b3a831c4651be9 (diff) | |
| parent | 5a5d1def59024dd3225e2a6142f8ee3ee10180a8 (diff) | |
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-net
- Assorted CVE fixes
- Other fixes
Diffstat (limited to 'net/mdio-uclass.c')
| -rw-r--r-- | net/mdio-uclass.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c index 36a404ff449..6f922e80b6f 100644 --- a/net/mdio-uclass.c +++ b/net/mdio-uclass.c @@ -23,6 +23,17 @@ void dm_mdio_probe_devices(void) static int dm_mdio_post_bind(struct udevice *dev) { + const char *dt_name; + + /* set a custom name for the MDIO device, if present in DT */ + if (ofnode_valid(dev->node)) { + dt_name = ofnode_read_string(dev->node, "device-name"); + if (dt_name) { + debug("renaming dev %s to %s\n", dev->name, dt_name); + device_set_name(dev, dt_name); + } + } + /* * MDIO command doesn't like spaces in names, don't allow them to keep * it happy @@ -75,7 +86,7 @@ static int dm_mdio_post_probe(struct udevice *dev) pdata->mii_bus->write = mdio_write; pdata->mii_bus->reset = mdio_reset; pdata->mii_bus->priv = dev; - strncpy(pdata->mii_bus->name, dev->name, MDIO_NAME_LEN); + strncpy(pdata->mii_bus->name, dev->name, MDIO_NAME_LEN - 1); return mdio_register(pdata->mii_bus); } |