diff options
author | Patrick Delaunay <patrick.delaunay@st.com> | 2019-02-27 15:36:44 +0100 |
---|---|---|
committer | Jagan Teki <jagan@amarulasolutions.com> | 2019-04-12 11:54:50 +0530 |
commit | b0cc1b846fcb310c0ac2f8cbeb4ed5947dc52912 (patch) | |
tree | 7d112ac9bc6474fe26d616721e49d672b9413f51 /cmd/sf.c | |
parent | f909ddb3e1770a5ef18606b46000e0d3eaf63b2e (diff) | |
download | u-boot-b0cc1b846fcb310c0ac2f8cbeb4ed5947dc52912.tar.gz |
dm: spi: Read default speed and mode values from DT
This patch update the behavior introduced by
commit 96907c0fe50a ("dm: spi: Read default speed and mode values from DT")
In case of DT boot, don't read default speed and mode for SPI from
CONFIG_* but instead read from DT node. This will make sure that boards
with multiple SPI/QSPI controllers can be probed at different
bus frequencies and SPI modes.
Remove also use in boards of the value speed=0 (no more supported)
for ENV in SPI by using CONFIG_ENV_SPI_MAX_HZ=0.
DT values will be always used when available (full DM support of
SPI slave with available DT node) even if speed and mode are requested;
for example in splash screen support (in splash_sf_read_raw)
or in SPL boot (in spl_spi_load_image).
The caller of spi_get_bus_and_cs() no more need to force speed=0.
But the current behavior don't change if the SPI slave is not
present (device with generic driver is created automatically)
or if platdata is used (CONFIG_OF_PLATDATA).
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Acked-by: Jagan Teki <jagan@amarulasolutions.com>
Diffstat (limited to 'cmd/sf.c')
-rw-r--r-- | cmd/sf.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -81,14 +81,13 @@ static int do_spi_flash_probe(int argc, char * const argv[]) { unsigned int bus = CONFIG_SF_DEFAULT_BUS; unsigned int cs = CONFIG_SF_DEFAULT_CS; + /* In DM mode, defaults speed and mode will be taken from DT */ unsigned int speed = CONFIG_SF_DEFAULT_SPEED; unsigned int mode = CONFIG_SF_DEFAULT_MODE; char *endp; #ifdef CONFIG_DM_SPI_FLASH struct udevice *new, *bus_dev; int ret; - /* In DM mode defaults will be taken from DT */ - speed = 0, mode = 0; #else struct spi_flash *new; #endif |