Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-15 17:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dfu: sf: rely on DT for spi speed and mode

Browse source 
Align with cmd_sf, and try to rely on DT for spi speed and mode,
and still fallback on spi_flash_probe() if it fails.

With the current scheme, spi_flash_probe() will be called
with CONFIG_SF_DEFAULT_SPEED and CONFIG_SF_DEFAULT_MODE
with are set to 0 by default on DT platforms using DM_SPI_FLASH.

Like cmd_sf, keep the option to specify the speed and mode
from the dfu_alt_mode string, but rely on DT properties
if not specified.

Using CONFIG_SF_DEFAULT_SPEED and CONFIG_SF_DEFAULT_MODE
makes the SPIFC controller on Amlogic Meson G12B & SM1
hardware fail and is unable to recover until a system reboot.

Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Link: https://lore.kernel.org/r/20241001-uboot-topic-dfu-sf-dt-v2-2-67f7acfa3ff5@linaro.org
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
This commit is contained in:
Neil Armstrong 2024-10-01 18:06:12 +02:00 • committed by Mattijs Korpershoek
parent 0872ac098a
commit 97c29f868d
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/dfu/dfu_sf.c
View file

@ -123,6 +123,7 @@ static struct spi_flash *parse_dev(char *devstr)
unsigned int mode = CONFIG_SF_DEFAULT_MODE;
char *s, *endp;
struct spi_flash *dev;
bool use_dt = true;
s = strsep(&devstr, ":");
if (!s || !*s || (bus = simple_strtoul(s, &endp, 0), *endp)) {
@ -143,6 +144,8 @@ static struct spi_flash *parse_dev(char *devstr)
printf("Invalid SPI speed %s\n", s);
return NULL;
}
if (IS_ENABLED(CONFIG_DM_SPI_FLASH))
use_dt = false;
}
s = strsep(&devstr, ":");
@ -152,9 +155,20 @@ static struct spi_flash *parse_dev(char *devstr)
printf("Invalid SPI mode %s\n", s);
return NULL;
}
if (IS_ENABLED(CONFIG_DM_SPI_FLASH))
use_dt = false;
}
dev = spi_flash_probe(bus, cs, speed, mode);
if (IS_ENABLED(CONFIG_DM_SPI_FLASH) && use_dt) {
struct udevice *new;
if (!spi_flash_probe_bus_cs(bus, cs, &new))
dev = dev_get_uclass_priv(new);
else
dev = NULL;
} else {
dev = spi_flash_probe(bus, cs, speed, mode);
}
if (!dev) {
printf("Failed to create SPI flash at %u:%u:%u:%u\n",
bus, cs, speed, mode);