Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-26 20:37:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

dm: spi-flash: Convert uclass to livetree

Browse source 
Update the SPI flash uclass to support a live device tree.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2017-05-18 20:09:57 -06:00
parent 2ceb6484c2
commit 656f29d1ca
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/mtd/spi/spi_flash.c
View file

@ -914,14 +914,13 @@ static int set_quad_mode(struct spi_flash *flash,
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) #if CONFIG_IS_ENABLED(OF_CONTROL)
int spi_flash_decode_fdt(const void *blob, struct spi_flash *flash) int spi_flash_decode_fdt(struct spi_flash *flash)
{ {
#ifdef CONFIG_DM_SPI_FLASH #ifdef CONFIG_DM_SPI_FLASH
fdt_addr_t addr; fdt_addr_t addr;
fdt_size_t size; fdt_size_t size;
int node = dev_of_offset(flash->dev);
addr = fdtdec_get_addr_size(blob, node, "memory-map", &size); addr = dev_read_addr_size(flash->dev, "memory-map", &size);
if (addr == FDT_ADDR_T_NONE) { if (addr == FDT_ADDR_T_NONE) {
debug("%s: Cannot decode address\n", __func__); debug("%s: Cannot decode address\n", __func__);
return 0; return 0;
@ -1081,7 +1080,7 @@ int spi_flash_scan(struct spi_flash *flash)
#endif #endif
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
ret = spi_flash_decode_fdt(gd->fdt_blob, flash); ret = spi_flash_decode_fdt(flash);
if (ret) { if (ret) {
debug("SF: FDT decode error\n"); debug("SF: FDT decode error\n");
return -EINVAL; return -EINVAL;