提交 bcfdf055 编写于 作者: A Andy Yan 提交者: Simon Glass

dm: core: make fixed-clock dt scan live dt compatible

dm_scan_fdt_node can't work when live dt is active,
we should use dm_scan_fdt_live instead.
Signed-off-by: NAndy Yan <andy.yan@rock-chips.com>
Reviewed-by: NSimon Glass <sjg@chromium.org>
上级 44683170
...@@ -333,7 +333,8 @@ static int dm_scan_fdt_node(struct udevice *parent, const void *blob, ...@@ -333,7 +333,8 @@ static int dm_scan_fdt_node(struct udevice *parent, const void *blob,
int dm_extended_scan_fdt(const void *blob, bool pre_reloc_only) int dm_extended_scan_fdt(const void *blob, bool pre_reloc_only)
{ {
int node, ret; int ret;
ofnode node;
ret = dm_scan_fdt(gd->fdt_blob, pre_reloc_only); ret = dm_scan_fdt(gd->fdt_blob, pre_reloc_only);
if (ret) { if (ret) {
...@@ -342,13 +343,18 @@ int dm_extended_scan_fdt(const void *blob, bool pre_reloc_only) ...@@ -342,13 +343,18 @@ int dm_extended_scan_fdt(const void *blob, bool pre_reloc_only)
} }
/* bind fixed-clock */ /* bind fixed-clock */
node = ofnode_to_offset(ofnode_path("/clocks")); node = ofnode_path("/clocks");
/* if no DT "clocks" node, no need to go further */ /* if no DT "clocks" node, no need to go further */
if (node < 0) if (!ofnode_valid(node))
return ret; return ret;
ret = dm_scan_fdt_node(gd->dm_root, gd->fdt_blob, node, #if CONFIG_IS_ENABLED(OF_LIVE)
pre_reloc_only); if (of_live_active())
ret = dm_scan_fdt_live(gd->dm_root, node.np, pre_reloc_only);
else
#endif
ret = dm_scan_fdt_node(gd->dm_root, gd->fdt_blob, node.of_offset,
pre_reloc_only);
if (ret) if (ret)
debug("dm_scan_fdt_node() failed: %d\n", ret); debug("dm_scan_fdt_node() failed: %d\n", ret);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册