From 137879f7ff23c635d2c6b2e43f4b39e2d305c3e2 Mon Sep 17 00:00:00 2001

From: Mark Brown <broonie@kernel.org>

Date: Wed, 22 Sep 2021 19:40:48 +0100

Subject: [PATCH] eeprom: 93xx46: Add SPI device ID table

Git-commit: 137879f7ff23c635d2c6b2e43f4b39e2d305c3e2

Patch-mainline: v5.15-rc6

References: git-fixes stable-5.14.14

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 a SPI device ID table.

Fixes: 96c8395e2166 ("spi: Revert modalias changes")

Signed-off-by: Mark Brown <broonie@kernel.org>

Link: https://lore.kernel.org/r/20210922184048.34770-1-broonie@kernel.org

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/misc/eeprom/eeprom_93xx46.c | 18 ++++++++++++++++++

 1 file changed, 18 insertions(+)

diff --git a/drivers/misc/eeprom/eeprom_93xx46.c b/drivers/misc/eeprom/eeprom_93xx46.c

index 29d8971ec558..660ee924f8b1 100644

--- a/drivers/misc/eeprom/eeprom_93xx46.c

+++ b/drivers/misc/eeprom/eeprom_93xx46.c

@@ -406,6 +406,23 @@ static const struct of_device_id eeprom_93xx46_of_table[] = {

 };

 MODULE_DEVICE_TABLE(of, eeprom_93xx46_of_table);

+static const struct spi_device_id eeprom_93xx46_spi_ids[] = {

+	{ .name = "eeprom-93xx46",

+	  .driver_data = (kernel_ulong_t)&at93c46_data, },

+	{ .name = "at93c46",

+	  .driver_data = (kernel_ulong_t)&at93c46_data, },

+	{ .name = "at93c46d",

+	  .driver_data = (kernel_ulong_t)&atmel_at93c46d_data, },

+	{ .name = "at93c56",

+	  .driver_data = (kernel_ulong_t)&at93c56_data, },

+	{ .name = "at93c66",

+	  .driver_data = (kernel_ulong_t)&at93c66_data, },

+	{ .name = "93lc46b",

+	  .driver_data = (kernel_ulong_t)&microchip_93lc46b_data, },

+	{}

+};

+MODULE_DEVICE_TABLE(of, eeprom_93xx46_of_table);

+

 static int eeprom_93xx46_probe_dt(struct spi_device *spi)

 {

 	const struct of_device_id *of_id =

@@ -555,6 +572,7 @@ static struct spi_driver eeprom_93xx46_driver = {

 	},

 	.probe		= eeprom_93xx46_probe,

 	.remove		= eeprom_93xx46_remove,

+	.id_table	= eeprom_93xx46_spi_ids,

 };

 module_spi_driver(eeprom_93xx46_driver);

-- 

2.26.2