leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: phy: Update uclass to support livetree

Browse Source 
Update the phy uclass to support livetree. Fix the xlate() method
which has no callers.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2017-05-18 20:09:47 -06:00
parent 5e1ff6480f
commit 23558bb67a
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/phy/phy-uclass.c
View File

@ -17,7 +17,7 @@ static inline struct phy_ops *phy_dev_ops(struct udevice *dev)
} }
static int generic_phy_xlate_offs_flags(struct phy *phy, static int generic_phy_xlate_offs_flags(struct phy *phy,
struct fdtdec_phandle_args *args) struct ofnode_phandle_args *args)
{ {
debug("%s(phy=%p)\n", __func__, phy); debug("%s(phy=%p)\n", __func__, phy);
@ -31,14 +31,13 @@ static int generic_phy_xlate_offs_flags(struct phy *phy,
else else
phy->id = 0; phy->id = 0;
return 0; return 0;
} }
int generic_phy_get_by_index(struct udevice *dev, int index, int generic_phy_get_by_index(struct udevice *dev, int index,
struct phy *phy) struct phy *phy)
{ {
struct fdtdec_phandle_args args; struct ofnode_phandle_args args;
struct phy_ops *ops; struct phy_ops *ops;
int ret; int ret;
struct udevice *phydev; struct udevice *phydev;
@ -46,18 +45,17 @@ int generic_phy_get_by_index(struct udevice *dev, int index,
debug("%s(dev=%p, index=%d, phy=%p)\n", __func__, dev, index, phy); debug("%s(dev=%p, index=%d, phy=%p)\n", __func__, dev, index, phy);
assert(phy); assert(phy);
ret = fdtdec_parse_phandle_with_args(gd->fdt_blob, dev_of_offset(dev), ret = dev_read_phandle_with_args(dev, "phys", "#phy-cells", 0, index,
"phys", "#phy-cells", 0, index, &args);
&args);
if (ret) { if (ret) {
debug("%s: fdtdec_parse_phandle_with_args failed: err=%d\n", debug("%s: dev_read_phandle_with_args failed: err=%d\n",
__func__, ret); __func__, ret);
return ret; return ret;
} }
ret = uclass_get_device_by_of_offset(UCLASS_PHY, args.node, &phydev); ret = uclass_get_device_by_ofnode(UCLASS_PHY, args.node, &phydev);
if (ret) { if (ret) {
debug("%s: uclass_get_device_by_of_offset failed: err=%d\n", debug("%s: uclass_get_device_by_ofnode failed: err=%d\n",
__func__, ret); __func__, ret);
return ret; return ret;
} }
@ -88,10 +86,9 @@ int generic_phy_get_by_name(struct udevice *dev, const char *phy_name,
debug("%s(dev=%p, name=%s, phy=%p)\n", __func__, dev, phy_name, phy); debug("%s(dev=%p, name=%s, phy=%p)\n", __func__, dev, phy_name, phy);
index = fdt_stringlist_search(gd->fdt_blob, dev_of_offset(dev), index = dev_read_stringlist_search(dev, "phy-names", phy_name);
"phy-names", phy_name);
if (index < 0) { if (index < 0) {
debug("fdt_stringlist_search() failed: %d\n", index); debug("dev_read_stringlist_search() failed: %d\n", index);
return index; return index;
} }

3
include/generic-phy.h
View File

@ -50,8 +50,7 @@ struct phy_ops {
* @args: The phy specifier values from device tree. * @args: The phy specifier values from device tree.
* @return 0 if OK, or a negative error code. * @return 0 if OK, or a negative error code.
*/ */
int (*of_xlate)(struct phy *phy, int (*of_xlate)(struct phy *phy, struct ofnode_phandle_args *args);
struct fdtdec_phandle_args *args);
/** /**
* init - initialize the hardware. * init - initialize the hardware.