5.15-stable patches

added patches:
	mmc-spi-add-device-tree-spi-ids.patch
	mtd-dataflash-add-device-tree-spi-ids.patch

diff --git a/queue-5.15/mmc-spi-add-device-tree-spi-ids.patch b/queue-5.15/mmc-spi-add-device-tree-spi-ids.patch
new file mode 100644 (file)
index 0000000..a91cdc2
--- /dev/null
+++ b/queue-5.15/mmc-spi-add-device-tree-spi-ids.patch
@@ -0,0 +1,55 @@
+From 5f719948b5d43eb39356e94e8d0b462568915381 Mon Sep 17 00:00:00 2001
+From: Jon Hunter <jonathanh@nvidia.com>
+Date: Mon, 15 Nov 2021 11:38:13 +0000
+Subject: mmc: spi: Add device-tree SPI IDs
+
+From: Jon Hunter <jonathanh@nvidia.com>
+
+commit 5f719948b5d43eb39356e94e8d0b462568915381 upstream.
+
+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_id is
+missing for the MMC SPI driver and the following warning is now seen.
+
+ WARNING KERN SPI driver mmc_spi has no spi_device_id for mmc-spi-slot
+
+Fix this by adding the necessary spi_device_id.
+
+Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
+Link: https://lore.kernel.org/r/20211115113813.238044-1-jonathanh@nvidia.com
+Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/mmc/host/mmc_spi.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
+index f4c8e1a61f53..b431cdd27353 100644
+--- a/drivers/mmc/host/mmc_spi.c
++++ b/drivers/mmc/host/mmc_spi.c
+@@ -1514,6 +1514,12 @@ static int mmc_spi_remove(struct spi_device *spi)
+       return 0;
+ }
+ 
++static const struct spi_device_id mmc_spi_dev_ids[] = {
++      { "mmc-spi-slot"},
++      { },
++};
++MODULE_DEVICE_TABLE(spi, mmc_spi_dev_ids);
++
+ static const struct of_device_id mmc_spi_of_match_table[] = {
+       { .compatible = "mmc-spi-slot", },
+       {},
+@@ -1525,6 +1531,7 @@ static struct spi_driver mmc_spi_driver = {
+               .name =         "mmc_spi",
+               .of_match_table = mmc_spi_of_match_table,
+       },
++      .id_table =     mmc_spi_dev_ids,
+       .probe =        mmc_spi_probe,
+       .remove =       mmc_spi_remove,
+ };
+-- 
+2.34.1
+

diff --git a/queue-5.15/mtd-dataflash-add-device-tree-spi-ids.patch b/queue-5.15/mtd-dataflash-add-device-tree-spi-ids.patch
new file mode 100644 (file)
index 0000000..86b95cb
--- /dev/null
+++ b/queue-5.15/mtd-dataflash-add-device-tree-spi-ids.patch
@@ -0,0 +1,54 @@
+From 27a030e8729255b2068f35c1cd609b532b263311 Mon Sep 17 00:00:00 2001
+From: Jon Hunter <jonathanh@nvidia.com>
+Date: Tue, 30 Nov 2021 11:24:43 +0000
+Subject: mtd: dataflash: Add device-tree SPI IDs
+
+From: Jon Hunter <jonathanh@nvidia.com>
+
+commit 27a030e8729255b2068f35c1cd609b532b263311 upstream.
+
+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.
+
+Fixes: 96c8395e2166 ("spi: Revert modalias changes")
+Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
+Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
+Link: https://lore.kernel.org/linux-mtd/20211130112443.107730-1-jonathanh@nvidia.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/mtd/devices/mtd_dataflash.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- 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_drive
+               .name           = "mtd_dataflash",
+               .of_match_table = of_match_ptr(dataflash_dt_ids),
+       },
++      .id_table = dataflash_dev_ids,
+ 
+       .probe          = dataflash_probe,
+       .remove         = dataflash_remove,

diff --git a/queue-5.15/series b/queue-5.15/series
index 6b5adb464ed2a6ccbf6b4e43e45a313e28e039e3..64bdf2ccfbef32bab28bfceb474852b5e139a8ea 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -9,3 +9,5 @@ hid-add-usb_hid-dependancy-on-some-usb-hid-drivers.patch
 hid-bigbenff-prevent-null-pointer-dereference.patch
 hid-wacom-fix-problems-when-device-is-not-a-valid-usb-device.patch
 hid-check-for-valid-usb-device-for-many-hid-drivers.patch
+mtd-dataflash-add-device-tree-spi-ids.patch
+mmc-spi-add-device-tree-spi-ids.patch