| Message ID | 20220202143404.16070-3-broonie@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | mtd: Ensure DT compatibles have SPI device IDs | expand |
> 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> > --- > drivers/mtd/devices/mchp23k256.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/drivers/mtd/devices/mchp23k256.c b/drivers/mtd/devices/mchp23k256.c > index a8b31bddf14b..1a840db207b5 100644 > --- a/drivers/mtd/devices/mchp23k256.c > +++ b/drivers/mtd/devices/mchp23k256.c > @@ -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); Reviewed-by: Michael Walle <michael@walle.cc> -michael
On Wed, 2022-02-02 at 14:34:03 UTC, Mark Brown wrote: > 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> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks. Miquel
diff --git a/drivers/mtd/devices/mchp23k256.c b/drivers/mtd/devices/mchp23k256.c index a8b31bddf14b..1a840db207b5 100644 --- a/drivers/mtd/devices/mchp23k256.c +++ b/drivers/mtd/devices/mchp23k256.c @@ -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);
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> --- drivers/mtd/devices/mchp23k256.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)