diff mbox series

mtd: dataflash: Add device-tree SPI IDs

Message ID 20211115113655.237785-1-jonathanh@nvidia.com
State Superseded
Headers show
Series mtd: dataflash: Add device-tree SPI IDs | expand

Commit Message

Jon Hunter Nov. 15, 2021, 11:36 a.m. UTC
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.

Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
---
 drivers/mtd/devices/mtd_dataflash.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Miquel Raynal Nov. 19, 2021, 6:33 p.m. UTC | #1
On Mon, 2021-11-15 at 11:36:55 UTC, Jon Hunter wrote:
> 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.
> 
> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>

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

Miquel
Jon Hunter Nov. 30, 2021, 8:53 a.m. UTC | #2
Hi Miquel,

On 19/11/2021 18:33, Miquel Raynal wrote:
> On Mon, 2021-11-15 at 11:36:55 UTC, Jon Hunter wrote:
>> 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.
>>
>> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
> 
> 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
Miquel Raynal Nov. 30, 2021, 11:11 a.m. UTC | #3
Hi Jon,

jonathanh@nvidia.com wrote on Tue, 30 Nov 2021 08:53:08 +0000:

> Hi Miquel,
> 
> On 19/11/2021 18:33, Miquel Raynal wrote:
> > On Mon, 2021-11-15 at 11:36:55 UTC, Jon Hunter wrote:  
> >> 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.
> >>
> >> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>  
> > 
> > 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
> Jon
> 


Thanks,
Miquèl
Jon Hunter Nov. 30, 2021, 11:26 a.m. UTC | #4
On 30/11/2021 11:11, Miquel Raynal wrote:
> Hi Jon,
> 
> jonathanh@nvidia.com wrote on Tue, 30 Nov 2021 08:53:08 +0000:
> 
>> Hi Miquel,
>>
>> On 19/11/2021 18:33, Miquel Raynal wrote:
>>> On Mon, 2021-11-15 at 11:36:55 UTC, Jon Hunter wrote:
>>>> 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.
>>>>
>>>> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
>>>
>>> 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
diff mbox series

Patch

diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 9802e265fca8..2b317ed6c103 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -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,