Skip to content

Commit 815cdfa

Browse files
committed
Merge tag 'mvebu-drivers-6.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/drivers
mvebu drivers for 6.8 (part 1) moxtet bus fixes * tag 'mvebu-drivers-6.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu: bus: moxtet: Add spi device table bus: moxtet: Mark the irq as shared Link: https://lore.kernel.org/r/87il4sbym0.fsf@BL-laptop Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents ec5b7be + aaafe88 commit 815cdfa

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

drivers/bus/moxtet.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ static int moxtet_irq_setup(struct moxtet *moxtet)
755755
moxtet->irq.masked = ~0;
756756

757757
ret = request_threaded_irq(moxtet->dev_irq, NULL, moxtet_irq_thread_fn,
758-
IRQF_ONESHOT, "moxtet", moxtet);
758+
IRQF_SHARED | IRQF_ONESHOT, "moxtet", moxtet);
759759
if (ret < 0)
760760
goto err_free;
761761

@@ -830,6 +830,12 @@ static void moxtet_remove(struct spi_device *spi)
830830
mutex_destroy(&moxtet->lock);
831831
}
832832

833+
static const struct spi_device_id moxtet_spi_ids[] = {
834+
{ "moxtet" },
835+
{ },
836+
};
837+
MODULE_DEVICE_TABLE(spi, moxtet_spi_ids);
838+
833839
static const struct of_device_id moxtet_dt_ids[] = {
834840
{ .compatible = "cznic,moxtet" },
835841
{},
@@ -841,6 +847,7 @@ static struct spi_driver moxtet_spi_driver = {
841847
.name = "moxtet",
842848
.of_match_table = moxtet_dt_ids,
843849
},
850+
.id_table = moxtet_spi_ids,
844851
.probe = moxtet_probe,
845852
.remove = moxtet_remove,
846853
};

0 commit comments

Comments
 (0)