Skip to contentSkip to conversation

mtd: dataflash: Add device-tree SPI IDs

PATCH Applied Jon Hunter 2 participants 5 messages Nov 15, 2021 – Nov 30, 2021

Subsystems (2)
lore
Share & tools
lore

Jon Hunter

author maintainer
#0 lore raw

PATCH 1/1 mtd: dataflash: Add device-tree SPI IDs

Commit 5fa6863ba692 ("spi: Check we have a spi_device_id for each DT compatible") added a test to check that every SPI driver has a spi_device_id for each DT compatiable string defined by the driver and warns if the spi_device_id is missing. The spi_device_ids are missing for the dataflash driver and the following warnings are now seen.

WARNING KERN SPI driver mtd_dataflash has no spi_device_id for atmel,at45 WARNING KERN SPI driver mtd_dataflash has no spi_device_id for atmel,dataflash

Fix this by adding the necessary spi_device_ids.

---
 drivers/mtd/devices/mtd_dataflash.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/mtd/devices/mtd_dataflash.c +8 -0
index 9802e265fca8..2b317ed6c103 100644
@@ -96,6 +96,13 @@ struct dataflash {
 	struct mtd_info		mtd;
 };
 
+static const struct spi_device_id dataflash_dev_ids[] = {
+	{ "at45" },
+	{ "dataflash" },
+	{ },
+};
+MODULE_DEVICE_TABLE(spi, dataflash_dev_ids);
+
 #ifdef CONFIG_OF
 static const struct of_device_id dataflash_dt_ids[] = {
 	{ .compatible = "atmel,at45", },
@@ -927,6 +934,7 @@ static struct spi_driver dataflash_driver = {
 		.name		= "mtd_dataflash",
 		.of_match_table = of_match_ptr(dataflash_dt_ids),
 	},
+	.id_table = dataflash_dev_ids,
 
 	.probe		= dataflash_probe,
 	.remove		= dataflash_remove,
Signature · 1 line
2.25.1
maintainer Applied
#1 lore raw
Quoted 7 lines · Jon Hunter

Commit 5fa6863ba692 ("spi: Check we have a spi_device_id for each DT compatible") added a test to check that every SPI driver has a spi_device_id for each DT compatiable string defined by the driver and warns if the spi_device_id is missing. The spi_device_ids are missing for the dataflash driver and the following warnings are now seen.

Quoted 6 lines

WARNING KERN SPI driver mtd_dataflash has no spi_device_id for atmel,at45 WARNING KERN SPI driver mtd_dataflash has no spi_device_id for atmel,dataflash

Fix this by adding the necessary spi_device_ids.

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.

Miquel

author maintainer
#2 lore raw

Hi Miquel,

Quoted 8 lines · Miquel Raynal
Quoted 7 lines · Jon Hunter

Commit 5fa6863ba692 ("spi: Check we have a spi_device_id for each DT compatible") added a test to check that every SPI driver has a spi_device_id for each DT compatiable string defined by the driver and warns if the spi_device_id is missing. The spi_device_ids are missing for the dataflash driver and the following warnings are now seen.

Quoted 8 lines
Quoted 6 lines

WARNING KERN SPI driver mtd_dataflash has no spi_device_id for atmel,at45 WARNING KERN SPI driver mtd_dataflash has no spi_device_id for atmel,dataflash

Fix this by adding the necessary spi_device_ids.

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.

Please can you submit as a fix for v5.16? The commit that introduced this is already in the mainline.

Thanks
Jon

Signature · 1 line
nvpublic
maintainer
#3 lore raw

Hi Jon,

[email protected] wrote on Tue, 30 Nov 2021 08:53:08 +0000:

Quoted 14 lines

Hi Miquel,

Quoted 11 lines · Miquel Raynal
Quoted 10 lines · Jon Hunter

Commit 5fa6863ba692 ("spi: Check we have a spi_device_id for each DT compatible") added a test to check that every SPI driver has a spi_device_id for each DT compatiable string defined by the driver and warns if the spi_device_id is missing. The spi_device_ids are missing for the dataflash driver and the following warnings are now seen.

WARNING KERN SPI driver mtd_dataflash has no spi_device_id for atmel,at45 WARNING KERN SPI driver mtd_dataflash has no spi_device_id for atmel,dataflash

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

Fix this by adding the necessary spi_device_ids.

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.

Please can you submit as a fix for v5.16? The commit that introduced this is already in the mainline.

Yes of course. Can you resubmit with a Fixes tag?

Quoted 4 lines

Thanks
Jon

Thanks,
Miquèl

author maintainer
#4 lore raw
Quoted 20 lines · Miquel Raynal

Hi Jon,

[email protected] wrote on Tue, 30 Nov 2021 08:53:08 +0000:

Quoted 16 lines

Hi Miquel,

Quoted 13 lines · Miquel Raynal
Quoted 12 lines · Jon Hunter

Commit 5fa6863ba692 ("spi: Check we have a spi_device_id for each DT compatible") added a test to check that every SPI driver has a spi_device_id for each DT compatiable string defined by the driver and warns if the spi_device_id is missing. The spi_device_ids are missing for the dataflash driver and the following warnings are now seen.

WARNING KERN SPI driver mtd_dataflash has no spi_device_id for atmel,at45 WARNING KERN SPI driver mtd_dataflash has no spi_device_id for atmel,dataflash

Fix this by adding the necessary spi_device_ids.

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.

Please can you submit as a fix for v5.16? The commit that introduced this is already in the mainline.

Yes of course. Can you resubmit with a Fixes tag?

Thanks. I have sent a V2. I used the same Fixes tag that Mark has used in similar changes for consistency.

Jon

Signature · 1 line
nvpublic