diff options
| author | Mario Six <mario.six@gdsys.cc> | 2018-03-28 14:38:41 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2018-04-16 09:55:59 +0200 |
| commit | 8bfeb33c463296af38432c3dbfb976f45545e381 (patch) | |
| tree | ddb7cb2c73f19d9559e5cab8429c2ac6603dd8b7 | |
| parent | ebca902aeb3af3eaedd2787928184ad84a86b98f (diff) | |
| download | u-boot-8bfeb33c463296af38432c3dbfb976f45545e381.tar.gz u-boot-8bfeb33c463296af38432c3dbfb976f45545e381.tar.bz2 u-boot-8bfeb33c463296af38432c3dbfb976f45545e381.zip | |
mtd: cfi_flash: Make live-tree compatible
Make the cfi_flash driver compatible with a live device tree.
Signed-off-by: Mario Six <mario.six@gdsys.cc>
Signed-off-by: Stefan Roese <sr@denx.de>
| -rw-r--r-- | drivers/mtd/cfi_flash.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index da44e6184e..e5509fe353 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -2461,27 +2461,28 @@ unsigned long flash_init(void) #ifdef CONFIG_CFI_FLASH /* for driver model */ static int cfi_flash_probe(struct udevice *dev) { - void *blob = (void *)gd->fdt_blob; - int node = dev_of_offset(dev); const fdt32_t *cell; - phys_addr_t addr; - int parent, addrc, sizec; + int addrc, sizec; int len, idx; - parent = fdt_parent_offset(blob, node); - fdt_support_default_count_cells(blob, parent, &addrc, &sizec); - /* decode regs, there may be multiple reg tuples. */ - cell = fdt_getprop(blob, node, "reg", &len); + addrc = dev_read_addr_cells(dev); + sizec = dev_read_size_cells(dev); + + /* decode regs; there may be multiple reg tuples. */ + cell = dev_read_prop(dev, "reg", &len); if (!cell) return -ENOENT; idx = 0; len /= sizeof(fdt32_t); while (idx < len) { - addr = fdt_translate_address((void *)blob, - node, cell + idx); + phys_addr_t addr; + + addr = dev_translate_address(dev, cell + idx); + flash_info[cfi_flash_num_flash_banks].dev = dev; flash_info[cfi_flash_num_flash_banks].base = addr; cfi_flash_num_flash_banks++; + idx += addrc + sizec; } gd->bd->bi_flashstart = flash_info[0].base; |