]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
mtd: mchp23k256: Add SPI ID table
authorMark Brown <broonie@kernel.org>
Wed, 2 Feb 2022 14:34:03 +0000 (14:34 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Apr 2022 11:58:04 +0000 (13:58 +0200)
[ Upstream commit bc7ee2e34b219da6813c17a1680dd20766648883 ]

Currently autoloading for SPI devices does not use the DT ID table, it uses
SPI modalises. Supporting OF modalises is going to be difficult if not
impractical, an attempt was made but has been reverted, so ensure that
module autoloading works for this driver by adding an id_table listing the
SPI IDs for everything.

Fixes: 96c8395e2166 ("spi: Revert modalias changes")
Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Michael Walle <michael@walle.cc>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20220202143404.16070-3-broonie@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/mtd/devices/mchp23k256.c

index a8b31bddf14b8ddb44f52c8be183d871436c4bc8..1a840db207b5a3454ca145251802e1c96f160313 100644 (file)
@@ -231,6 +231,19 @@ static const struct of_device_id mchp23k256_of_table[] = {
 };
 MODULE_DEVICE_TABLE(of, mchp23k256_of_table);
 
+static const struct spi_device_id mchp23k256_spi_ids[] = {
+       {
+               .name = "mchp23k256",
+               .driver_data = (kernel_ulong_t)&mchp23k256_caps,
+       },
+       {
+               .name = "mchp23lcv1024",
+               .driver_data = (kernel_ulong_t)&mchp23lcv1024_caps,
+       },
+       {}
+};
+MODULE_DEVICE_TABLE(spi, mchp23k256_spi_ids);
+
 static struct spi_driver mchp23k256_driver = {
        .driver = {
                .name   = "mchp23k256",
@@ -238,6 +251,7 @@ static struct spi_driver mchp23k256_driver = {
        },
        .probe          = mchp23k256_probe,
        .remove         = mchp23k256_remove,
+       .id_table       = mchp23k256_spi_ids,
 };
 
 module_spi_driver(mchp23k256_driver);