mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'spi-4.19' into spi-next
This commit is contained in:
commit
c1acb21b32
27 changed files with 1167 additions and 609 deletions
|
|
@ -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.
|
||||
|
|
|
|||
Loading…
Reference in a new issue