mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 08:42:12 +02:00
Merge tag 'dm-pull-20jul20-take2a' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
binman support for FIT new UCLASS_SOC patman switch 'test' command minor fdt fixes patman usability improvements
This commit is contained in:
@@ -553,7 +553,7 @@ static int socfpga_clk_ofdata_to_platdata(struct udevice *dev)
|
||||
struct socfpga_clk_platdata *plat = dev_get_platdata(dev);
|
||||
fdt_addr_t addr;
|
||||
|
||||
addr = devfdt_get_addr(dev);
|
||||
addr = dev_read_addr(dev);
|
||||
if (addr == FDT_ADDR_T_NONE)
|
||||
return -EINVAL;
|
||||
plat->regs = (void __iomem *)addr;
|
||||
|
@@ -285,7 +285,7 @@ static int socfpga_a10_clk_probe(struct udevice *dev)
|
||||
socfpga_a10_handoff_workaround(dev);
|
||||
|
||||
if (!fdt_node_check_compatible(fdt, offset, "altr,clk-mgr")) {
|
||||
plat->regs = devfdt_get_addr(dev);
|
||||
plat->regs = dev_read_addr(dev);
|
||||
} else {
|
||||
pdev = dev_get_parent(dev);
|
||||
if (!pdev)
|
||||
|
@@ -95,7 +95,7 @@ static int exynos7420_clk_topc_probe(struct udevice *dev)
|
||||
fdt_addr_t base;
|
||||
int ret;
|
||||
|
||||
base = devfdt_get_addr(dev);
|
||||
base = dev_read_addr(dev);
|
||||
if (base == FDT_ADDR_T_NONE)
|
||||
return -EINVAL;
|
||||
|
||||
@@ -149,7 +149,7 @@ static int exynos7420_clk_top0_probe(struct udevice *dev)
|
||||
if (!priv)
|
||||
return -EINVAL;
|
||||
|
||||
base = devfdt_get_addr(dev);
|
||||
base = dev_read_addr(dev);
|
||||
if (base == FDT_ADDR_T_NONE)
|
||||
return -EINVAL;
|
||||
|
||||
|
@@ -283,7 +283,7 @@ int gen2_clk_probe(struct udevice *dev)
|
||||
u32 cpg_mode;
|
||||
int ret;
|
||||
|
||||
priv->base = (struct gen2_base *)devfdt_get_addr(dev);
|
||||
priv->base = dev_read_addr_ptr(dev);
|
||||
if (!priv->base)
|
||||
return -EINVAL;
|
||||
|
||||
|
@@ -359,7 +359,7 @@ int gen3_clk_probe(struct udevice *dev)
|
||||
u32 cpg_mode;
|
||||
int ret;
|
||||
|
||||
priv->base = (struct gen3_base *)devfdt_get_addr(dev);
|
||||
priv->base = dev_read_addr_ptr(dev);
|
||||
if (!priv->base)
|
||||
return -EINVAL;
|
||||
|
||||
|
@@ -253,7 +253,7 @@ static int uniphier_clk_probe(struct udevice *dev)
|
||||
struct uniphier_clk_priv *priv = dev_get_priv(dev);
|
||||
fdt_addr_t addr;
|
||||
|
||||
addr = devfdt_get_addr(dev->parent);
|
||||
addr = dev_read_addr(dev->parent);
|
||||
if (addr == FDT_ADDR_T_NONE)
|
||||
return -EINVAL;
|
||||
|
||||
|
Reference in New Issue
Block a user