diff options
author | Tom Rini <trini@konsulko.com> | 2020-09-15 15:22:00 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-09-15 15:22:00 -0400 |
commit | bd4e8944cf7e36f8ad39466c40f8fc197c9df1c5 (patch) | |
tree | 0a600fbc0f5507e6ae5d3ba63759545a916af7db /drivers/spi/spi-uclass.c | |
parent | 23e92c124b878e7c5d9a23c46f363874890260cf (diff) | |
parent | 5ba2883160d15b669957dcc50be2733a9b4abe94 (diff) |
Merge tag 'ti-v2021.01-next' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti into next
- Hyperflash boot for J7200
- Update Main R5FSS lockstep mode
- R5F remoteproc support for J7200
- Minor env fixes
- Add SPI boot support for am335x-icev2
Diffstat (limited to 'drivers/spi/spi-uclass.c')
-rw-r--r-- | drivers/spi/spi-uclass.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index cffd9cf0b0e..55a8eed8901 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -497,7 +497,7 @@ UCLASS_DRIVER(spi) = { .id = UCLASS_SPI, .name = "spi", .flags = DM_UC_FLAG_SEQ_ALIAS, -#if !CONFIG_IS_ENABLED(OF_PLATDATA) +#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .post_bind = dm_scan_fdt_dev, #endif .post_probe = spi_post_probe, |