@@ -15,15 +15,16 @@
DECLARE_GLOBAL_DATA_PTR;
-int fixedphy_probe(struct phy_device *phydev)
+static int fixedphy_of_init(struct phy_device *phydev)
{
+ ofnode node = phy_get_ofnode(phydev);
struct fixed_link *priv;
- int ofnode = phydev->addr;
u32 val;
- /* check for mandatory properties within fixed-link node */
- val = fdt_getprop_u32_default_node(gd->fdt_blob,
- ofnode, 0, "speed", 0);
+ if (!ofnode_valid(node))
+ return -EINVAL;
+
+ val = ofnode_read_u32_default(node, "speed", 0);
if (val != SPEED_10 && val != SPEED_100 && val != SPEED_1000) {
printf("ERROR: no/invalid speed given in fixed-link node!");
return -EINVAL;
@@ -32,14 +33,26 @@ int fixedphy_probe(struct phy_device *phydev)
priv = malloc(sizeof(*priv));
if (!priv)
return -ENOMEM;
+
memset(priv, 0, sizeof(*priv));
phydev->priv = priv;
priv->link_speed = val;
- priv->duplex = fdtdec_get_bool(gd->fdt_blob, ofnode, "full-duplex");
- priv->pause = fdtdec_get_bool(gd->fdt_blob, ofnode, "pause");
- priv->asym_pause = fdtdec_get_bool(gd->fdt_blob, ofnode, "asym-pause");
+ priv->duplex = ofnode_read_bool(node, "full-duplex");
+ priv->pause = ofnode_read_bool(node, "pause");
+ priv->asym_pause = ofnode_read_bool(node, "asym-pause");
+
+ return 0;
+}
+
+static int fixedphy_config(struct phy_device *phydev)
+{
+ int err;
+
+ err = fixedphy_of_init(phydev);
+ if (err)
+ return err;
/* fixed-link phy must not be reset by core phy code */
phydev->flags |= PHY_FLAG_BROKEN_RESET;
@@ -70,7 +83,7 @@ static struct phy_driver fixedphy_driver = {
.mask = 0xffffffff,
.name = "Fixed PHY",
.features = PHY_GBIT_FEATURES | SUPPORTED_MII,
- .probe = fixedphy_probe,
+ .config = fixedphy_config,
.startup = fixedphy_startup,
.shutdown = fixedphy_shutdown,
};
@@ -987,19 +987,23 @@ static struct phy_device *phy_connect_fixed(struct mii_dev *bus,
phy_interface_t interface)
#endif
{
+ ofnode node = dev_ofnode(dev), subnode;
struct phy_device *phydev = NULL;
- int sn;
const char *name;
- sn = fdt_first_subnode(gd->fdt_blob, dev_of_offset(dev));
- while (sn > 0) {
- name = fdt_get_name(gd->fdt_blob, sn, NULL);
- if (name && strcmp(name, "fixed-link") == 0) {
- phydev = phy_device_create(bus, sn, PHY_FIXED_ID, false,
- interface);
- break;
- }
- sn = fdt_next_subnode(gd->fdt_blob, sn);
+ for (subnode = ofnode_first_subnode(node); ofnode_valid(subnode);
+ subnode = ofnode_next_subnode(node)) {
+ name = ofnode_get_name(subnode);
+
+ if (!name || strcmp(name, "fixed-link") != 0)
+ continue;
+
+ phydev = phy_device_create(bus, 0, PHY_FIXED_ID, false,
+ interface);
+ if (phydev)
+ phydev->node = subnode;
+
+ break;
}
return phydev;