Revert "Merge tag 'dm-pull-20jul20' of git://git.denx.de/u-boot-dm"
This reverts commit5d3a21df66, reversing changes made to56d37f1c56. Unfortunately this is causing CI failures: https://travis-ci.org/github/trini/u-boot/jobs/711313649 Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -507,7 +507,7 @@ static int atmel_hlcdc_ofdata_to_platdata(struct udevice *dev)
|
||||
const void *blob = gd->fdt_blob;
|
||||
int node = dev_of_offset(dev);
|
||||
|
||||
priv->regs = dev_read_addr_ptr(dev);
|
||||
priv->regs = (struct atmel_hlcd_regs *)devfdt_get_addr(dev);
|
||||
if (!priv->regs) {
|
||||
debug("%s: No display controller address\n", __func__);
|
||||
return -EINVAL;
|
||||
|
||||
@@ -884,7 +884,7 @@ static int exynos_dp_ofdata_to_platdata(struct udevice *dev)
|
||||
unsigned int node = dev_of_offset(dev);
|
||||
fdt_addr_t addr;
|
||||
|
||||
addr = dev_read_addr(dev);
|
||||
addr = devfdt_get_addr(dev);
|
||||
if (addr == FDT_ADDR_T_NONE) {
|
||||
debug("Can't get the DP base address\n");
|
||||
return -EINVAL;
|
||||
|
||||
@@ -486,7 +486,7 @@ int exynos_fb_ofdata_to_platdata(struct udevice *dev)
|
||||
const void *blob = gd->fdt_blob;
|
||||
fdt_addr_t addr;
|
||||
|
||||
addr = dev_read_addr(dev);
|
||||
addr = devfdt_get_addr(dev);
|
||||
if (addr == FDT_ADDR_T_NONE) {
|
||||
debug("Can't get the FIMD base address\n");
|
||||
return -EINVAL;
|
||||
|
||||
@@ -346,7 +346,7 @@ static int tegra_lcd_ofdata_to_platdata(struct udevice *dev)
|
||||
int rgb;
|
||||
int ret;
|
||||
|
||||
priv->disp = dev_read_addr_ptr(dev);
|
||||
priv->disp = (struct disp_ctlr *)devfdt_get_addr(dev);
|
||||
if (!priv->disp) {
|
||||
debug("%s: No display controller address\n", __func__);
|
||||
return -EINVAL;
|
||||
|
||||
Reference in New Issue
Block a user