drop a mcp3911 patch from 5.10, 5.15, and 5.4

diff --git a/queue-5.10/iio-adc-mcp3911-correct-microchip-device-addr-proper.patch b/queue-5.10/iio-adc-mcp3911-correct-microchip-device-addr-proper.patch
deleted file mode 100644 (file)
index fee7e98..0000000
--- a/queue-5.10/iio-adc-mcp3911-correct-microchip-device-addr-proper.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From cb169726751dc4d3ac964e476db7f7329c4e12b5 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 22 Jul 2022 15:07:19 +0200
-Subject: iio: adc: mcp3911: correct "microchip,device-addr" property
-
-From: Marcus Folkesson <marcus.folkesson@gmail.com>
-
-[ Upstream commit cfbd76d5c9c449739bb74288d982bccf9ff822f4 ]
-
-Go for the right property name that is documented in the bindings.
-
-Fixes: 3a89b289df5d ("iio: adc: add support for mcp3911")
-Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
-Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
-Link: https://lore.kernel.org/r/20220722130726.7627-3-marcus.folkesson@gmail.com
-Cc: <Stable@vger.kernel.org>
-Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/iio/adc/mcp3911.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c
-index 608842632925..7eecbfd491a4 100644
---- a/drivers/iio/adc/mcp3911.c
-+++ b/drivers/iio/adc/mcp3911.c
-@@ -217,7 +217,14 @@ static int mcp3911_config(struct mcp3911 *adc)
-       u32 configreg;
-       int ret;
- 
--      device_property_read_u32(dev, "device-addr", &adc->dev_addr);
-+      ret = device_property_read_u32(dev, "microchip,device-addr", &adc->dev_addr);
-+
-+      /*
-+       * Fallback to "device-addr" due to historical mismatch between
-+       * dt-bindings and implementation
-+       */
-+      if (ret)
-+              device_property_read_u32(dev, "device-addr", &adc->dev_addr);
-       if (adc->dev_addr > 3) {
-               dev_err(&adc->spi->dev,
-                       "invalid device address (%i). Must be in range 0-3.\n",
--- 
-2.35.1
-

diff --git a/queue-5.10/iio-adc-mcp3911-switch-to-generic-firmware-propertie.patch b/queue-5.10/iio-adc-mcp3911-switch-to-generic-firmware-propertie.patch
deleted file mode 100644 (file)
index 0f69105..0000000
--- a/queue-5.10/iio-adc-mcp3911-switch-to-generic-firmware-propertie.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From e86692c086eb19c81a5bf3028e1e20afb4f6734a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 5 Dec 2021 17:01:36 +0000
-Subject: iio:adc:mcp3911: Switch to generic firmware properties.
-
-From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-
-[ Upstream commit 4efc1c614d334883cce09c38aa3fe74d3fb0bbf0 ]
-
-This allows use of the driver with other types of firmware such as ACPI
-PRP0001 based probing.
-
-Also part of a general attempt to remove direct use of of_ specific
-accessors from IIO.
-
-Added an include for mod_devicetable.h whilst here to cover the
-struct of_device_id definition.
-
-Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
-Cc: Kent Gustavsson <kent@minoris.se>
-Reviewed-by: Marcus Folkesson <marcus.folkesson@gmail.com>
-Stable-dep-of: cfbd76d5c9c4 ("iio: adc: mcp3911: correct "microchip,device-addr" property")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/iio/adc/mcp3911.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c
-index 65278270a75c..608842632925 100644
---- a/drivers/iio/adc/mcp3911.c
-+++ b/drivers/iio/adc/mcp3911.c
-@@ -10,6 +10,8 @@
- #include <linux/err.h>
- #include <linux/iio/iio.h>
- #include <linux/module.h>
-+#include <linux/mod_devicetable.h>
-+#include <linux/property.h>
- #include <linux/regulator/consumer.h>
- #include <linux/spi/spi.h>
- 
-@@ -209,12 +211,13 @@ static const struct iio_info mcp3911_info = {
-       .write_raw = mcp3911_write_raw,
- };
- 
--static int mcp3911_config(struct mcp3911 *adc, struct device_node *of_node)
-+static int mcp3911_config(struct mcp3911 *adc)
- {
-+      struct device *dev = &adc->spi->dev;
-       u32 configreg;
-       int ret;
- 
--      of_property_read_u32(of_node, "device-addr", &adc->dev_addr);
-+      device_property_read_u32(dev, "device-addr", &adc->dev_addr);
-       if (adc->dev_addr > 3) {
-               dev_err(&adc->spi->dev,
-                       "invalid device address (%i). Must be in range 0-3.\n",
-@@ -298,7 +301,7 @@ static int mcp3911_probe(struct spi_device *spi)
-               }
-       }
- 
--      ret = mcp3911_config(adc, spi->dev.of_node);
-+      ret = mcp3911_config(adc);
-       if (ret)
-               goto clk_disable;
- 
--- 
-2.35.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index d3d7f554ce927e0f395ae7792bc321a42c1a9208..a4e493db88e30e6b157611d917267178ab531c12 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -17,8 +17,6 @@ usb-xhci-mtk-add-a-function-to-un-load-bandwidth-inf.patch
 usb-xhci-mtk-add-some-schedule-error-number.patch
 usb-xhci-mtk-allow-multiple-start-split-in-a-microfr.patch
 usb-xhci-mtk-relax-tt-periodic-bandwidth-allocation.patch
-iio-adc-mcp3911-switch-to-generic-firmware-propertie.patch
-iio-adc-mcp3911-correct-microchip-device-addr-proper.patch
 mmc-core-fix-inconsistent-sd3_bus_mode-at-uhs-i-sd-v.patch
 serial-atmel-remove-redundant-assignment-in-rs485_co.patch
 tty-serial-atmel-preserve-previous-usart-mode-if-rs4.patch

diff --git a/queue-5.15/iio-adc-mcp3911-correct-microchip-device-addr-proper.patch b/queue-5.15/iio-adc-mcp3911-correct-microchip-device-addr-proper.patch
deleted file mode 100644 (file)
index 24c9ddd..0000000
--- a/queue-5.15/iio-adc-mcp3911-correct-microchip-device-addr-proper.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2dd64f7c6962c18d86d7cf6702143ae4b984a426 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 22 Jul 2022 15:07:19 +0200
-Subject: iio: adc: mcp3911: correct "microchip,device-addr" property
-
-From: Marcus Folkesson <marcus.folkesson@gmail.com>
-
-[ Upstream commit cfbd76d5c9c449739bb74288d982bccf9ff822f4 ]
-
-Go for the right property name that is documented in the bindings.
-
-Fixes: 3a89b289df5d ("iio: adc: add support for mcp3911")
-Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
-Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
-Link: https://lore.kernel.org/r/20220722130726.7627-3-marcus.folkesson@gmail.com
-Cc: <Stable@vger.kernel.org>
-Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/iio/adc/mcp3911.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c
-index 608842632925..7eecbfd491a4 100644
---- a/drivers/iio/adc/mcp3911.c
-+++ b/drivers/iio/adc/mcp3911.c
-@@ -217,7 +217,14 @@ static int mcp3911_config(struct mcp3911 *adc)
-       u32 configreg;
-       int ret;
- 
--      device_property_read_u32(dev, "device-addr", &adc->dev_addr);
-+      ret = device_property_read_u32(dev, "microchip,device-addr", &adc->dev_addr);
-+
-+      /*
-+       * Fallback to "device-addr" due to historical mismatch between
-+       * dt-bindings and implementation
-+       */
-+      if (ret)
-+              device_property_read_u32(dev, "device-addr", &adc->dev_addr);
-       if (adc->dev_addr > 3) {
-               dev_err(&adc->spi->dev,
-                       "invalid device address (%i). Must be in range 0-3.\n",
--- 
-2.35.1
-

diff --git a/queue-5.15/iio-adc-mcp3911-switch-to-generic-firmware-propertie.patch b/queue-5.15/iio-adc-mcp3911-switch-to-generic-firmware-propertie.patch
deleted file mode 100644 (file)
index e507fb8..0000000
--- a/queue-5.15/iio-adc-mcp3911-switch-to-generic-firmware-propertie.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 92871497273d9f3d3ef377073a6fb668e7ba461c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 5 Dec 2021 17:01:36 +0000
-Subject: iio:adc:mcp3911: Switch to generic firmware properties.
-
-From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-
-[ Upstream commit 4efc1c614d334883cce09c38aa3fe74d3fb0bbf0 ]
-
-This allows use of the driver with other types of firmware such as ACPI
-PRP0001 based probing.
-
-Also part of a general attempt to remove direct use of of_ specific
-accessors from IIO.
-
-Added an include for mod_devicetable.h whilst here to cover the
-struct of_device_id definition.
-
-Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
-Cc: Kent Gustavsson <kent@minoris.se>
-Reviewed-by: Marcus Folkesson <marcus.folkesson@gmail.com>
-Stable-dep-of: cfbd76d5c9c4 ("iio: adc: mcp3911: correct "microchip,device-addr" property")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/iio/adc/mcp3911.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c
-index 65278270a75c..608842632925 100644
---- a/drivers/iio/adc/mcp3911.c
-+++ b/drivers/iio/adc/mcp3911.c
-@@ -10,6 +10,8 @@
- #include <linux/err.h>
- #include <linux/iio/iio.h>
- #include <linux/module.h>
-+#include <linux/mod_devicetable.h>
-+#include <linux/property.h>
- #include <linux/regulator/consumer.h>
- #include <linux/spi/spi.h>
- 
-@@ -209,12 +211,13 @@ static const struct iio_info mcp3911_info = {
-       .write_raw = mcp3911_write_raw,
- };
- 
--static int mcp3911_config(struct mcp3911 *adc, struct device_node *of_node)
-+static int mcp3911_config(struct mcp3911 *adc)
- {
-+      struct device *dev = &adc->spi->dev;
-       u32 configreg;
-       int ret;
- 
--      of_property_read_u32(of_node, "device-addr", &adc->dev_addr);
-+      device_property_read_u32(dev, "device-addr", &adc->dev_addr);
-       if (adc->dev_addr > 3) {
-               dev_err(&adc->spi->dev,
-                       "invalid device address (%i). Must be in range 0-3.\n",
-@@ -298,7 +301,7 @@ static int mcp3911_probe(struct spi_device *spi)
-               }
-       }
- 
--      ret = mcp3911_config(adc, spi->dev.of_node);
-+      ret = mcp3911_config(adc);
-       if (ret)
-               goto clk_disable;
- 
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index ad9a6179f512417913ea3779f65bb5131322a0b6..58fcb52faf6507d7d12b0f3adb97349d0ebb8240 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -8,8 +8,6 @@ usb-dwc3-gadget-prevent-repeat-pullup.patch
 usb-dwc3-gadget-refactor-pullup.patch
 usb-dwc3-gadget-don-t-modify-gevntcount-in-pullup.patch
 usb-dwc3-gadget-avoid-duplicate-requests-to-enable-r.patch
-iio-adc-mcp3911-switch-to-generic-firmware-propertie.patch
-iio-adc-mcp3911-correct-microchip-device-addr-proper.patch
 powerpc-rtas-move-rtas-entry-assembly-into-its-own-f.patch
 powerpc-rtas-fix-rtas-msr-hv-handling-for-cell.patch
 usb-add-quirks-for-lenovo-onelink-dock.patch

diff --git a/queue-5.4/iio-adc-mcp3911-correct-microchip-device-addr-proper.patch b/queue-5.4/iio-adc-mcp3911-correct-microchip-device-addr-proper.patch
deleted file mode 100644 (file)
index e137c7f..0000000
--- a/queue-5.4/iio-adc-mcp3911-correct-microchip-device-addr-proper.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 5e686f7bfe633b5d077bf394a128b7bee56966f7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 22 Jul 2022 15:07:19 +0200
-Subject: iio: adc: mcp3911: correct "microchip,device-addr" property
-
-From: Marcus Folkesson <marcus.folkesson@gmail.com>
-
-[ Upstream commit cfbd76d5c9c449739bb74288d982bccf9ff822f4 ]
-
-Go for the right property name that is documented in the bindings.
-
-Fixes: 3a89b289df5d ("iio: adc: add support for mcp3911")
-Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
-Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
-Link: https://lore.kernel.org/r/20220722130726.7627-3-marcus.folkesson@gmail.com
-Cc: <Stable@vger.kernel.org>
-Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/iio/adc/mcp3911.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c
-index cd8b1bab9cf0..0299f9ea9692 100644
---- a/drivers/iio/adc/mcp3911.c
-+++ b/drivers/iio/adc/mcp3911.c
-@@ -217,7 +217,14 @@ static int mcp3911_config(struct mcp3911 *adc)
-       u32 configreg;
-       int ret;
- 
--      device_property_read_u32(dev, "device-addr", &adc->dev_addr);
-+      ret = device_property_read_u32(dev, "microchip,device-addr", &adc->dev_addr);
-+
-+      /*
-+       * Fallback to "device-addr" due to historical mismatch between
-+       * dt-bindings and implementation
-+       */
-+      if (ret)
-+              device_property_read_u32(dev, "device-addr", &adc->dev_addr);
-       if (adc->dev_addr > 3) {
-               dev_err(&adc->spi->dev,
-                       "invalid device address (%i). Must be in range 0-3.\n",
--- 
-2.35.1
-

diff --git a/queue-5.4/iio-adc-mcp3911-switch-to-generic-firmware-propertie.patch b/queue-5.4/iio-adc-mcp3911-switch-to-generic-firmware-propertie.patch
deleted file mode 100644 (file)
index 5b1db1b..0000000
--- a/queue-5.4/iio-adc-mcp3911-switch-to-generic-firmware-propertie.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 9eeb24d3c3ed00e5f0905af4f6b3e4d6d8ce3897 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 5 Dec 2021 17:01:36 +0000
-Subject: iio:adc:mcp3911: Switch to generic firmware properties.
-
-From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-
-[ Upstream commit 4efc1c614d334883cce09c38aa3fe74d3fb0bbf0 ]
-
-This allows use of the driver with other types of firmware such as ACPI
-PRP0001 based probing.
-
-Also part of a general attempt to remove direct use of of_ specific
-accessors from IIO.
-
-Added an include for mod_devicetable.h whilst here to cover the
-struct of_device_id definition.
-
-Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
-Cc: Kent Gustavsson <kent@minoris.se>
-Reviewed-by: Marcus Folkesson <marcus.folkesson@gmail.com>
-Stable-dep-of: cfbd76d5c9c4 ("iio: adc: mcp3911: correct "microchip,device-addr" property")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/iio/adc/mcp3911.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c
-index 4e2e8e819b1e..cd8b1bab9cf0 100644
---- a/drivers/iio/adc/mcp3911.c
-+++ b/drivers/iio/adc/mcp3911.c
-@@ -10,6 +10,8 @@
- #include <linux/err.h>
- #include <linux/iio/iio.h>
- #include <linux/module.h>
-+#include <linux/mod_devicetable.h>
-+#include <linux/property.h>
- #include <linux/regulator/consumer.h>
- #include <linux/spi/spi.h>
- 
-@@ -209,12 +211,13 @@ static const struct iio_info mcp3911_info = {
-       .write_raw = mcp3911_write_raw,
- };
- 
--static int mcp3911_config(struct mcp3911 *adc, struct device_node *of_node)
-+static int mcp3911_config(struct mcp3911 *adc)
- {
-+      struct device *dev = &adc->spi->dev;
-       u32 configreg;
-       int ret;
- 
--      of_property_read_u32(of_node, "device-addr", &adc->dev_addr);
-+      device_property_read_u32(dev, "device-addr", &adc->dev_addr);
-       if (adc->dev_addr > 3) {
-               dev_err(&adc->spi->dev,
-                       "invalid device address (%i). Must be in range 0-3.\n",
-@@ -298,7 +301,7 @@ static int mcp3911_probe(struct spi_device *spi)
-               }
-       }
- 
--      ret = mcp3911_config(adc, spi->dev.of_node);
-+      ret = mcp3911_config(adc);
-       if (ret)
-               goto clk_disable;
- 
--- 
-2.35.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 96fa823d003b23ac15e3879e77baa1c843faecab..08d34712c2e12e21adc833b84a62acc2deed7bc3 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -37,8 +37,6 @@ usb-xhci-mtk-add-a-function-to-un-load-bandwidth-inf.patch
 usb-xhci-mtk-add-some-schedule-error-number.patch
 usb-xhci-mtk-allow-multiple-start-split-in-a-microfr.patch
 usb-xhci-mtk-relax-tt-periodic-bandwidth-allocation.patch
-iio-adc-mcp3911-switch-to-generic-firmware-propertie.patch
-iio-adc-mcp3911-correct-microchip-device-addr-proper.patch
 wifi-mac80211-fix-uaf-in-ieee80211_scan_rx.patch
 tty-serial-atmel-rs485-iso7816-wait-for-txrdy-before.patch
 serial-atmel-remove-redundant-assignment-in-rs485_co.patch