Merge git://git.denx.de/u-boot-fsl-qoriq

This commit is contained in:
Tom Rini
2016-07-26 17:34:28 -04:00
38 changed files with 889 additions and 106 deletions

View File

@@ -583,12 +583,11 @@ static int fsl_i2c_set_bus_speed(struct udevice *bus, unsigned int speed)
static int fsl_i2c_ofdata_to_platdata(struct udevice *bus)
{
struct fsl_i2c_dev *dev = dev_get_priv(bus);
u64 reg;
u32 addr, size;
fdt_addr_t addr;
fdt_size_t size;
reg = fdtdec_get_addr(gd->fdt_blob, bus->of_offset, "reg");
addr = reg >> 32;
size = reg & 0xFFFFFFFF;
addr = fdtdec_get_addr_size_auto_noparent(gd->fdt_blob, bus->of_offset,
"reg", 0, &size);
dev->base = map_sysmem(CONFIG_SYS_IMMR + addr, size);