]> git.itanic.dy.fi Git - linux-stable/commitdiff
rtc: mcp795: Add SPI ID table
authorMark Brown <broonie@kernel.org>
Mon, 27 Sep 2021 13:02:40 +0000 (14:02 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Nov 2021 18:16:59 +0000 (19:16 +0100)
[ Upstream commit 3109151c47343c80300177ec7704e0757064efdc ]

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>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20210927130240.33693-1-broonie@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/rtc/rtc-mcp795.c

index bad7792b6ca585f23c0317a0c2287f7479aa302d..0d515b3df57103fa30a6bea5c8df4af6c14bdcaf 100644 (file)
@@ -430,12 +430,19 @@ static const struct of_device_id mcp795_of_match[] = {
 MODULE_DEVICE_TABLE(of, mcp795_of_match);
 #endif
 
+static const struct spi_device_id mcp795_spi_ids[] = {
+       { .name = "mcp795" },
+       { }
+};
+MODULE_DEVICE_TABLE(spi, mcp795_spi_ids);
+
 static struct spi_driver mcp795_driver = {
                .driver = {
                                .name = "rtc-mcp795",
                                .of_match_table = of_match_ptr(mcp795_of_match),
                },
                .probe = mcp795_probe,
+               .id_table = mcp795_spi_ids,
 };
 
 module_spi_driver(mcp795_driver);