drop queue-5.4/iio-adc-ad7124-fix-chip-id-mismatch.patch

diff --git a/queue-5.4/iio-adc-ad7124-fix-chip-id-mismatch.patch b/queue-5.4/iio-adc-ad7124-fix-chip-id-mismatch.patch
deleted file mode 100644 (file)
index 4bee9db..0000000
--- a/queue-5.4/iio-adc-ad7124-fix-chip-id-mismatch.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 96f9ab0d5933c1c00142dd052f259fce0bc3ced2 Mon Sep 17 00:00:00 2001
-From: Dumitru Ceclan <mitrutzceclan@gmail.com>
-Date: Wed, 31 Jul 2024 15:37:22 +0300
-Subject: iio: adc: ad7124: fix chip ID mismatch
-
-From: Dumitru Ceclan <mitrutzceclan@gmail.com>
-
-commit 96f9ab0d5933c1c00142dd052f259fce0bc3ced2 upstream.
-
-The ad7124_soft_reset() function has the assumption that the chip will
-assert the "power-on reset" bit in the STATUS register after a software
-reset without any delay. The POR bit =0 is used to check if the chip
-initialization is done.
-
-A chip ID mismatch probe error appears intermittently when the probe
-continues too soon and the ID register does not contain the expected
-value.
-
-Fix by adding a 200us delay after the software reset command is issued.
-
-Fixes: b3af341bbd96 ("iio: adc: Add ad7124 support")
-Signed-off-by: Dumitru Ceclan <dumitru.ceclan@analog.com>
-Reviewed-by: Nuno Sa <nuno.sa@analog.com>
-Link: https://patch.msgid.link/20240731-ad7124-fix-v1-1-46a76aa4b9be@analog.com
-Cc: <Stable@vger.kernel.org>
-Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/iio/adc/ad7124.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/iio/adc/ad7124.c
-+++ b/drivers/iio/adc/ad7124.c
-@@ -385,6 +385,7 @@ static int ad7124_soft_reset(struct ad71
-       if (ret < 0)
-               return ret;
- 
-+      fsleep(200);
-       timeout = 100;
-       do {
-               ret = ad_sd_read_reg(&st->sd, AD7124_STATUS, 1, &readval);

diff --git a/queue-5.4/series b/queue-5.4/series
index eb0ceba2867f7a66d11a064af62b426384532c2a..01e43e24f8759f01f45ae82c7a01788c8d4c0ba3 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -97,7 +97,6 @@ staging-iio-frequency-ad9834-validate-frequency-parameter-value.patch
 iio-buffer-dmaengine-fix-releasing-dma-channel-on-error.patch
 iio-fix-scale-application-in-iio_convert_raw_to_processed_unlocked.patch
 iio-adc-ad7606-remove-frstdata-check-for-serial-mode.patch
-iio-adc-ad7124-fix-chip-id-mismatch.patch
 usb-dwc3-core-update-lc-timer-as-per-usb-spec-v3.2.patch
 binder-fix-uaf-caused-by-offsets-overwrite.patch
 nvmem-fix-return-type-of-devm_nvmem_device_get-in-kerneldoc.patch