diff options
| author | Tom Rini | 2020-07-10 16:22:57 -0400 |
|---|---|---|
| committer | Tom Rini | 2020-07-10 16:22:57 -0400 |
| commit | 4a9146c29573dbfa661918280d9522a01f6ca919 (patch) | |
| tree | b1b135237dcfee94a27e8df7ce2208230c28b894 /drivers/mtd | |
| parent | f30924739975b4f60c0862b539790fdcdb7da20c (diff) | |
| parent | 6c3fc50ee59366df62e8345ea9fd86c3ace0c3f1 (diff) | |
Merge tag 'dm-pull-10jul20' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
of-platdata: better phandle and compatible-string support
patman support for Python3 on Ubuntu 14.04
new checkpatch check to avoid #ifdefs
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/spi/sandbox.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/spi/sf-uclass.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/spi/sf_probe.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c index 8cbe97ee207..0b602dc9140 100644 --- a/drivers/mtd/spi/sandbox.c +++ b/drivers/mtd/spi/sandbox.c @@ -44,7 +44,6 @@ enum sandbox_sf_state { SF_WRITE_STATUS, /* write the flash's status register */ }; -#if CONFIG_IS_ENABLED(LOG) static const char *sandbox_sf_state_name(enum sandbox_sf_state state) { static const char * const states[] = { @@ -53,7 +52,6 @@ static const char *sandbox_sf_state_name(enum sandbox_sf_state state) }; return states[state]; } -#endif /* LOG */ /* Bits for the status register */ #define STAT_WIP (1 << 0) diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c index 9ce2ecb99ac..09c11439b08 100644 --- a/drivers/mtd/spi/sf-uclass.c +++ b/drivers/mtd/spi/sf-uclass.c @@ -68,7 +68,7 @@ int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs, str = strdup(name); #endif ret = spi_get_bus_and_cs(busnum, cs, max_hz, spi_mode, - "spi_flash_std", str, &bus, &slave); + "jedec_spi_nor", str, &bus, &slave); if (ret) return ret; diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index afda241dd06..475f6c31dbd 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -160,8 +160,8 @@ static const struct udevice_id spi_flash_std_ids[] = { { } }; -U_BOOT_DRIVER(spi_flash_std) = { - .name = "spi_flash_std", +U_BOOT_DRIVER(jedec_spi_nor) = { + .name = "jedec_spi_nor", .id = UCLASS_SPI_FLASH, .of_match = spi_flash_std_ids, .probe = spi_flash_std_probe, @@ -170,4 +170,6 @@ U_BOOT_DRIVER(spi_flash_std) = { .ops = &spi_flash_std_ops, }; +U_BOOT_DRIVER_ALIAS(jedec_spi_nor, spansion_m25p16) + #endif /* CONFIG_DM_SPI_FLASH */ |