| Message ID | 20210927134403.32328-1-broonie@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | fpga: ice40-spi: Add SPI device ID table | expand |
On Mon, Sep 27, 2021 at 02:44:03PM +0100, 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 a SPI ID table. > > Fixes: 96c8395e2166 ("spi: Revert modalias changes") > Signed-off-by: Mark Brown <broonie@kernel.org> > --- > drivers/fpga/ice40-spi.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/fpga/ice40-spi.c b/drivers/fpga/ice40-spi.c > index 69dec5af23c3..029d3cdb918d 100644 > --- a/drivers/fpga/ice40-spi.c > +++ b/drivers/fpga/ice40-spi.c > @@ -192,12 +192,19 @@ static const struct of_device_id ice40_fpga_of_match[] = { > }; > MODULE_DEVICE_TABLE(of, ice40_fpga_of_match); > > +static const struct spi_device_id ice40_fpga_spi_ids[] = { > + { .name = "ice40-fpga-mgr", }, > + {}, > +}; > +MODULE_DEVICE_TABLE(spi, ice40_fpga_spi_ids); > + > static struct spi_driver ice40_fpga_driver = { > .probe = ice40_fpga_probe, > .driver = { > .name = "ice40spi", > .of_match_table = of_match_ptr(ice40_fpga_of_match), > }, > + .id_table = ice40_fpga_spi_ids, > }; > > module_spi_driver(ice40_fpga_driver); > -- > 2.20.1 > Applied to fixes, Thanks
On Mon, Sep 27, 2021 at 02:44:03PM +0100, 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 a SPI ID table. > > Fixes: 96c8395e2166 ("spi: Revert modalias changes") > Signed-off-by: Mark Brown <broonie@kernel.org> > --- > drivers/fpga/ice40-spi.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/fpga/ice40-spi.c b/drivers/fpga/ice40-spi.c > index 69dec5af23c3..029d3cdb918d 100644 > --- a/drivers/fpga/ice40-spi.c > +++ b/drivers/fpga/ice40-spi.c > @@ -192,12 +192,19 @@ static const struct of_device_id ice40_fpga_of_match[] = { > }; > MODULE_DEVICE_TABLE(of, ice40_fpga_of_match); > > +static const struct spi_device_id ice40_fpga_spi_ids[] = { > + { .name = "ice40-fpga-mgr", }, > + {}, > +}; > +MODULE_DEVICE_TABLE(spi, ice40_fpga_spi_ids); > + > static struct spi_driver ice40_fpga_driver = { > .probe = ice40_fpga_probe, > .driver = { > .name = "ice40spi", > .of_match_table = of_match_ptr(ice40_fpga_of_match), > }, > + .id_table = ice40_fpga_spi_ids, > }; > > module_spi_driver(ice40_fpga_driver); > -- > 2.20.1 > Ehr .. please ignore that ... I fatfingered sending that patch again. Sorry for the noise ... - Moritz
diff --git a/drivers/fpga/ice40-spi.c b/drivers/fpga/ice40-spi.c index 69dec5af23c3..029d3cdb918d 100644 --- a/drivers/fpga/ice40-spi.c +++ b/drivers/fpga/ice40-spi.c @@ -192,12 +192,19 @@ static const struct of_device_id ice40_fpga_of_match[] = { }; MODULE_DEVICE_TABLE(of, ice40_fpga_of_match); +static const struct spi_device_id ice40_fpga_spi_ids[] = { + { .name = "ice40-fpga-mgr", }, + {}, +}; +MODULE_DEVICE_TABLE(spi, ice40_fpga_spi_ids); + static struct spi_driver ice40_fpga_driver = { .probe = ice40_fpga_probe, .driver = { .name = "ice40spi", .of_match_table = of_match_ptr(ice40_fpga_of_match), }, + .id_table = ice40_fpga_spi_ids, }; module_spi_driver(ice40_fpga_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 a SPI ID table. Fixes: 96c8395e2166 ("spi: Revert modalias changes") Signed-off-by: Mark Brown <broonie@kernel.org> --- drivers/fpga/ice40-spi.c | 7 +++++++ 1 file changed, 7 insertions(+)