diff options
| author | Simon Glass <sjg@chromium.org> | 2017-05-31 03:47:29 (GMT) |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2017-06-01 13:03:14 (GMT) |
| commit | aa9bb0944acecf5459971c4f0f195c59f1af1fe1 (patch) | |
| tree | 388a39f78fc3db2f3f75ce35ecb2891f75705590 /drivers/clk | |
| parent | a4e0ef50dae404939f14e46493a3d5c2111a9d4c (diff) | |
| download | u-boot-fsl-qoriq-aa9bb0944acecf5459971c4f0f195c59f1af1fe1.tar.xz | |
dm: clk: Update uclass to support livetree
Update the clk uclass to support a live device tree.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/clk-uclass.c | 17 | ||||
| -rw-r--r-- | drivers/clk/clk_zynq.c | 2 |
2 files changed, 8 insertions, 11 deletions
diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c index f6194b6..83b6328 100644 --- a/drivers/clk/clk-uclass.c +++ b/drivers/clk/clk-uclass.c @@ -58,23 +58,22 @@ static int clk_of_xlate_default(struct clk *clk, int clk_get_by_index(struct udevice *dev, int index, struct clk *clk) { int ret; - struct fdtdec_phandle_args args; + struct ofnode_phandle_args args; struct udevice *dev_clk; struct clk_ops *ops; debug("%s(dev=%p, index=%d, clk=%p)\n", __func__, dev, index, clk); assert(clk); - ret = fdtdec_parse_phandle_with_args(gd->fdt_blob, dev_of_offset(dev), - "clocks", "#clock-cells", 0, index, - &args); + ret = dev_read_phandle_with_args(dev, "clocks", "#clock-cells", 0, + index, &args); if (ret) { debug("%s: fdtdec_parse_phandle_with_args failed: err=%d\n", __func__, ret); return ret; } - ret = uclass_get_device_by_of_offset(UCLASS_CLK, args.node, &dev_clk); + ret = uclass_get_device_by_ofnode(UCLASS_CLK, args.node, &dev_clk); if (ret) { debug("%s: uclass_get_device_by_of_offset failed: err=%d\n", __func__, ret); @@ -86,10 +85,9 @@ int clk_get_by_index(struct udevice *dev, int index, struct clk *clk) ops = clk_dev_ops(dev_clk); if (ops->of_xlate) - ret = ops->of_xlate(clk, (struct ofnode_phandle_args *)&args); + ret = ops->of_xlate(clk, &args); else - ret = clk_of_xlate_default(clk, - (struct ofnode_phandle_args *)&args); + ret = clk_of_xlate_default(clk, &args); if (ret) { debug("of_xlate() failed: %d\n", ret); return ret; @@ -105,8 +103,7 @@ int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk) debug("%s(dev=%p, name=%s, clk=%p)\n", __func__, dev, name, clk); - index = fdt_stringlist_search(gd->fdt_blob, dev_of_offset(dev), - "clock-names", name); + index = dev_read_stringlist_search(dev, "clock-names", name); if (index < 0) { debug("fdt_stringlist_search() failed: %d\n", index); return index; diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c index b997545..50f2a65 100644 --- a/drivers/clk/clk_zynq.c +++ b/drivers/clk/clk_zynq.c @@ -459,7 +459,7 @@ static int zynq_clk_probe(struct udevice *dev) for (i = 0; i < 2; i++) { sprintf(name, "gem%d_emio_clk", i); ret = clk_get_by_name(dev, name, &priv->gem_emio_clk[i]); - if (ret < 0 && ret != -FDT_ERR_NOTFOUND) { + if (ret < 0 && ret != -ENODATA) { dev_err(dev, "failed to get %s clock\n", name); return ret; } |