diff options
| author | Tom Rini <[email protected]> | 2019-04-13 08:27:35 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-04-13 08:27:35 -0400 |
| commit | cf5eebeb18f7790d5030eb94f51fca0ebcd6e406 (patch) | |
| tree | f4c9c40f9353fbe4104875779c7eedd3ed2342cc /drivers/clk | |
| parent | 0a5228be868622894a5f8f226203cd7bac562187 (diff) | |
| parent | 73c02e5e4fc1ef53d06289232edd6cc52e3d73f6 (diff) | |
Merge tag 'pull-12apr19' of git://git.denx.de/u-boot-dm
fdtdec tests and improvements for carve-outs
pinctrl race-condition fix
various other fixes in sandbox, sound, mkimage, etc.
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/altera/clk-arria10.c | 3 | ||||
| -rw-r--r-- | drivers/clk/at91/pmc.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c index 612a1718dcb..179869df45f 100644 --- a/drivers/clk/altera/clk-arria10.c +++ b/drivers/clk/altera/clk-arria10.c @@ -254,7 +254,8 @@ static int socfpga_a10_clk_bind(struct udevice *dev) fdt_node_check_compatible(fdt, offset, "fixed-clock")) continue; - if (pre_reloc_only && !dm_fdt_pre_reloc(fdt, offset)) + if (pre_reloc_only && + !dm_ofnode_pre_reloc(offset_to_ofnode(offset))) continue; ret = device_bind_driver_to_node(dev, "clk-a10", name, diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c index 7cfbabc96d3..6b55ec59d6d 100644 --- a/drivers/clk/at91/pmc.c +++ b/drivers/clk/at91/pmc.c @@ -61,7 +61,7 @@ int at91_clk_sub_device_bind(struct udevice *dev, const char *drv_name) offset > 0; offset = fdt_next_subnode(fdt, offset)) { if (pre_reloc_only && - !dm_fdt_pre_reloc(fdt, offset)) + !dm_ofnode_pre_reloc(offset_to_ofnode(offset))) continue; /* * If this node has "compatible" property, this is not |