diff options
| author | Simon Glass <sjg@chromium.org> | 2016-11-13 14:22:01 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-11-25 17:59:30 -0700 |
| commit | 71634f289de5850503738635cc96753c9b2c5d09 (patch) | |
| tree | 2d64e3193229aa0e69202dd593c655cf0340789a /drivers/mtd | |
| parent | d844efec472d7ea16b229d1c2c854bed70082278 (diff) | |
| download | u-boot-imx-71634f289de5850503738635cc96753c9b2c5d09.zip u-boot-imx-71634f289de5850503738635cc96753c9b2c5d09.tar.gz u-boot-imx-71634f289de5850503738635cc96753c9b2c5d09.tar.bz2 | |
spi: Add of-platdata support to SPI and SPI flash
Some boards may want to use these subsystems with of-platdata in SPL. Add
support for this by avoiding any device tree access in this case.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/spi/spi_flash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index 2576c2c..94c0b00 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -1138,7 +1138,7 @@ int spi_flash_scan(struct spi_flash *flash) return ret; #endif -#if CONFIG_IS_ENABLED(OF_CONTROL) +#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) ret = spi_flash_decode_fdt(gd->fdt_blob, flash); if (ret) { debug("SF: FDT decode error\n"); |