diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-06 09:32:47 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-06 09:32:47 +0100 |
| commit | f5bced9f34355d2b12779eebdf2634cb27c18cff (patch) | |
| tree | d636906d3aeb78eecc48b6d1e5d0b44b58cd8016 /drivers/mmc/host/mmc_spi.c | |
| parent | 13a5fad39a7b781c21d9528bcf52a5f5babafe99 (diff) | |
| parent | 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 (diff) | |
| download | linux-f5bced9f34355d2b12779eebdf2634cb27c18cff.tar.gz linux-f5bced9f34355d2b12779eebdf2634cb27c18cff.tar.bz2 linux-f5bced9f34355d2b12779eebdf2634cb27c18cff.zip | |
Merge 5.16-rc4 into tty-next
We need the tty/serial driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mmc/host/mmc_spi.c')
| -rw-r--r-- | drivers/mmc/host/mmc_spi.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c index f4c8e1a61f53..b431cdd27353 100644 --- a/drivers/mmc/host/mmc_spi.c +++ b/drivers/mmc/host/mmc_spi.c @@ -1514,6 +1514,12 @@ static int mmc_spi_remove(struct spi_device *spi) return 0; } +static const struct spi_device_id mmc_spi_dev_ids[] = { + { "mmc-spi-slot"}, + { }, +}; +MODULE_DEVICE_TABLE(spi, mmc_spi_dev_ids); + static const struct of_device_id mmc_spi_of_match_table[] = { { .compatible = "mmc-spi-slot", }, {}, @@ -1525,6 +1531,7 @@ static struct spi_driver mmc_spi_driver = { .name = "mmc_spi", .of_match_table = mmc_spi_of_match_table, }, + .id_table = mmc_spi_dev_ids, .probe = mmc_spi_probe, .remove = mmc_spi_remove, }; |