Merge tag 'pci-v5.18-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / mtd / devices / mchp48l640.c

diff --git a/drivers/mtd/devices/mchp48l640.c b/drivers/mtd/devices/mchp48l640.c
index a3fd426df74bedde629e0e2dfeb525c4f4f293dd..40cd5041174c9649c930b9a1985a5fe259f43d5e 100644 (file)
--- a/drivers/mtd/devices/mchp48l640.c
+++ b/drivers/mtd/devices/mchp48l640.c
@@ -357,13 +357,23 @@ static const struct of_device_id mchp48l640_of_table[] = {
 };
 MODULE_DEVICE_TABLE(of, mchp48l640_of_table);
 
+static const struct spi_device_id mchp48l640_spi_ids[] = {
+       {
+               .name = "48l640",
+               .driver_data = (kernel_ulong_t)&mchp48l640_caps,
+       },
+       {}
+};
+MODULE_DEVICE_TABLE(spi, mchp48l640_spi_ids);
+
 static struct spi_driver mchp48l640_driver = {
        .driver = {
                .name   = "mchp48l640",
-               .of_match_table = of_match_ptr(mchp48l640_of_table),
+               .of_match_table = mchp48l640_of_table,
        },
        .probe          = mchp48l640_probe,
        .remove         = mchp48l640_remove,
+       .id_table       = mchp48l640_spi_ids,
 };
 
 module_spi_driver(mchp48l640_driver);