Merge branch 'spi-4.19' into spi-next

This commit is contained in:
Mark Brown 2018-08-10 17:51:52 +01:00
commit c1acb21b32
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
27 changed files with 1167 additions and 609 deletions

View file

@ -202,6 +202,9 @@ static int m25p_probe(struct spi_mem *spimem)
if (data && data->name)
nor->mtd.name = data->name;
if (!nor->mtd.name)
nor->mtd.name = spi_mem_get_name(spimem);
/* For some (historical?) reason many platforms provide two different
* names in flash_platform_data: "name" and "type". Quite often name is
* set to "m25p80" and then "type" provides a real chip name.