From 223edf442a9da2f9a28f118ee8131f7a2aaa373d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 22 Jan 2024 12:33:33 -0800 Subject: [PATCH] drop some serial patches from older kernels. they break the build --- ...r-unsupported-spi-modes-during-probe.patch | 49 ------------------- ...set-safe-default-spi-clock-frequency.patch | 44 ----------------- queue-4.19/series | 2 - ...r-unsupported-spi-modes-during-probe.patch | 49 ------------------- ...set-safe-default-spi-clock-frequency.patch | 44 ----------------- queue-5.10/series | 2 - ...r-unsupported-spi-modes-during-probe.patch | 49 ------------------- ...set-safe-default-spi-clock-frequency.patch | 44 ----------------- queue-5.4/series | 2 - 9 files changed, 285 deletions(-) delete mode 100644 queue-4.19/serial-sc16is7xx-add-check-for-unsupported-spi-modes-during-probe.patch delete mode 100644 queue-4.19/serial-sc16is7xx-set-safe-default-spi-clock-frequency.patch delete mode 100644 queue-5.10/serial-sc16is7xx-add-check-for-unsupported-spi-modes-during-probe.patch delete mode 100644 queue-5.10/serial-sc16is7xx-set-safe-default-spi-clock-frequency.patch delete mode 100644 queue-5.4/serial-sc16is7xx-add-check-for-unsupported-spi-modes-during-probe.patch delete mode 100644 queue-5.4/serial-sc16is7xx-set-safe-default-spi-clock-frequency.patch diff --git a/queue-4.19/serial-sc16is7xx-add-check-for-unsupported-spi-modes-during-probe.patch b/queue-4.19/serial-sc16is7xx-add-check-for-unsupported-spi-modes-during-probe.patch deleted file mode 100644 index 1508a8a0acf..00000000000 --- a/queue-4.19/serial-sc16is7xx-add-check-for-unsupported-spi-modes-during-probe.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 6d710b769c1f5f0d55c9ad9bb49b7dce009ec103 Mon Sep 17 00:00:00 2001 -From: Hugo Villeneuve -Date: Thu, 21 Dec 2023 18:18:09 -0500 -Subject: serial: sc16is7xx: add check for unsupported SPI modes during probe - -From: Hugo Villeneuve - -commit 6d710b769c1f5f0d55c9ad9bb49b7dce009ec103 upstream. - -The original comment is confusing because it implies that variants other -than the SC16IS762 supports other SPI modes beside SPI_MODE_0. - -Extract from datasheet: - The SC16IS762 differs from the SC16IS752 in that it supports SPI clock - speeds up to 15 Mbit/s instead of the 4 Mbit/s supported by the - SC16IS752... In all other aspects, the SC16IS762 is functionally and - electrically the same as the SC16IS752. - -The same is also true of the SC16IS760 variant versus the SC16IS740 and -SC16IS750 variants. - -For all variants, only SPI mode 0 is supported. - -Change comment and abort probing if the specified SPI mode is not -SPI_MODE_0. - -Fixes: 2c837a8a8f9f ("sc16is7xx: spi interface is added") -Cc: -Signed-off-by: Hugo Villeneuve -Link: https://lore.kernel.org/r/20231221231823.2327894-3-hugo@hugovil.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/serial/sc16is7xx.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/drivers/tty/serial/sc16is7xx.c -+++ b/drivers/tty/serial/sc16is7xx.c -@@ -1406,7 +1406,10 @@ static int sc16is7xx_spi_probe(struct sp - - /* Setup SPI bus */ - spi->bits_per_word = 8; -- /* only supports mode 0 on SC16IS762 */ -+ /* For all variants, only mode 0 is supported */ -+ if ((spi->mode & SPI_MODE_X_MASK) != SPI_MODE_0) -+ return dev_err_probe(&spi->dev, -EINVAL, "Unsupported SPI mode\n"); -+ - spi->mode = spi->mode ? : SPI_MODE_0; - spi->max_speed_hz = spi->max_speed_hz ? : 15000000; - ret = spi_setup(spi); diff --git a/queue-4.19/serial-sc16is7xx-set-safe-default-spi-clock-frequency.patch b/queue-4.19/serial-sc16is7xx-set-safe-default-spi-clock-frequency.patch deleted file mode 100644 index d798f251d23..00000000000 --- a/queue-4.19/serial-sc16is7xx-set-safe-default-spi-clock-frequency.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3ef79cd1412236d884ab0c46b4d1921380807b48 Mon Sep 17 00:00:00 2001 -From: Hugo Villeneuve -Date: Thu, 21 Dec 2023 18:18:10 -0500 -Subject: serial: sc16is7xx: set safe default SPI clock frequency - -From: Hugo Villeneuve - -commit 3ef79cd1412236d884ab0c46b4d1921380807b48 upstream. - -15 MHz is supported only by 76x variants. - -If the SPI clock frequency is not specified, use a safe default clock value -of 4 MHz that is supported by all variants. - -Also use HZ_PER_MHZ macro to improve readability. - -Fixes: 2c837a8a8f9f ("sc16is7xx: spi interface is added") -Cc: -Signed-off-by: Hugo Villeneuve -Link: https://lore.kernel.org/r/20231221231823.2327894-4-hugo@hugovil.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/serial/sc16is7xx.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/tty/serial/sc16is7xx.c -+++ b/drivers/tty/serial/sc16is7xx.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - - #define SC16IS7XX_NAME "sc16is7xx" -@@ -1411,7 +1412,7 @@ static int sc16is7xx_spi_probe(struct sp - return dev_err_probe(&spi->dev, -EINVAL, "Unsupported SPI mode\n"); - - spi->mode = spi->mode ? : SPI_MODE_0; -- spi->max_speed_hz = spi->max_speed_hz ? : 15000000; -+ spi->max_speed_hz = spi->max_speed_hz ? : 4 * HZ_PER_MHZ; - ret = spi_setup(spi); - if (ret) - return ret; diff --git a/queue-4.19/series b/queue-4.19/series index d4235e77b7c..1b22a873efe 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -130,5 +130,3 @@ wifi-rtlwifi-remove-bogus-and-dangerous-aspm-disable-enable-code.patch wifi-rtlwifi-convert-lnkctl-change-to-pcie-cap-rmw-accessors.patch wifi-mwifiex-configure-bssid-consistently-when-starting-ap.patch hid-wacom-correct-behavior-when-processing-some-confidence-false-touches.patch -serial-sc16is7xx-add-check-for-unsupported-spi-modes-during-probe.patch -serial-sc16is7xx-set-safe-default-spi-clock-frequency.patch diff --git a/queue-5.10/serial-sc16is7xx-add-check-for-unsupported-spi-modes-during-probe.patch b/queue-5.10/serial-sc16is7xx-add-check-for-unsupported-spi-modes-during-probe.patch deleted file mode 100644 index 9cbddf0400c..00000000000 --- a/queue-5.10/serial-sc16is7xx-add-check-for-unsupported-spi-modes-during-probe.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 6d710b769c1f5f0d55c9ad9bb49b7dce009ec103 Mon Sep 17 00:00:00 2001 -From: Hugo Villeneuve -Date: Thu, 21 Dec 2023 18:18:09 -0500 -Subject: serial: sc16is7xx: add check for unsupported SPI modes during probe - -From: Hugo Villeneuve - -commit 6d710b769c1f5f0d55c9ad9bb49b7dce009ec103 upstream. - -The original comment is confusing because it implies that variants other -than the SC16IS762 supports other SPI modes beside SPI_MODE_0. - -Extract from datasheet: - The SC16IS762 differs from the SC16IS752 in that it supports SPI clock - speeds up to 15 Mbit/s instead of the 4 Mbit/s supported by the - SC16IS752... In all other aspects, the SC16IS762 is functionally and - electrically the same as the SC16IS752. - -The same is also true of the SC16IS760 variant versus the SC16IS740 and -SC16IS750 variants. - -For all variants, only SPI mode 0 is supported. - -Change comment and abort probing if the specified SPI mode is not -SPI_MODE_0. - -Fixes: 2c837a8a8f9f ("sc16is7xx: spi interface is added") -Cc: -Signed-off-by: Hugo Villeneuve -Link: https://lore.kernel.org/r/20231221231823.2327894-3-hugo@hugovil.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/serial/sc16is7xx.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/drivers/tty/serial/sc16is7xx.c -+++ b/drivers/tty/serial/sc16is7xx.c -@@ -1449,7 +1449,10 @@ static int sc16is7xx_spi_probe(struct sp - - /* Setup SPI bus */ - spi->bits_per_word = 8; -- /* only supports mode 0 on SC16IS762 */ -+ /* For all variants, only mode 0 is supported */ -+ if ((spi->mode & SPI_MODE_X_MASK) != SPI_MODE_0) -+ return dev_err_probe(&spi->dev, -EINVAL, "Unsupported SPI mode\n"); -+ - spi->mode = spi->mode ? : SPI_MODE_0; - spi->max_speed_hz = spi->max_speed_hz ? : 15000000; - ret = spi_setup(spi); diff --git a/queue-5.10/serial-sc16is7xx-set-safe-default-spi-clock-frequency.patch b/queue-5.10/serial-sc16is7xx-set-safe-default-spi-clock-frequency.patch deleted file mode 100644 index a6af23a894f..00000000000 --- a/queue-5.10/serial-sc16is7xx-set-safe-default-spi-clock-frequency.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3ef79cd1412236d884ab0c46b4d1921380807b48 Mon Sep 17 00:00:00 2001 -From: Hugo Villeneuve -Date: Thu, 21 Dec 2023 18:18:10 -0500 -Subject: serial: sc16is7xx: set safe default SPI clock frequency - -From: Hugo Villeneuve - -commit 3ef79cd1412236d884ab0c46b4d1921380807b48 upstream. - -15 MHz is supported only by 76x variants. - -If the SPI clock frequency is not specified, use a safe default clock value -of 4 MHz that is supported by all variants. - -Also use HZ_PER_MHZ macro to improve readability. - -Fixes: 2c837a8a8f9f ("sc16is7xx: spi interface is added") -Cc: -Signed-off-by: Hugo Villeneuve -Link: https://lore.kernel.org/r/20231221231823.2327894-4-hugo@hugovil.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/serial/sc16is7xx.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/tty/serial/sc16is7xx.c -+++ b/drivers/tty/serial/sc16is7xx.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - - #define SC16IS7XX_NAME "sc16is7xx" -@@ -1454,7 +1455,7 @@ static int sc16is7xx_spi_probe(struct sp - return dev_err_probe(&spi->dev, -EINVAL, "Unsupported SPI mode\n"); - - spi->mode = spi->mode ? : SPI_MODE_0; -- spi->max_speed_hz = spi->max_speed_hz ? : 15000000; -+ spi->max_speed_hz = spi->max_speed_hz ? : 4 * HZ_PER_MHZ; - ret = spi_setup(spi); - if (ret) - return ret; diff --git a/queue-5.10/series b/queue-5.10/series index 6d839cb5793..61c68a4ab05 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -235,5 +235,3 @@ iio-adc-ad7091r-pass-iio_dev-to-event-handler.patch iio-adc-ad7091r-allow-users-to-configure-device-events.patch iio-adc-ad7091r-enable-internal-vref-if-external-vref-is-not-supplied.patch hid-wacom-correct-behavior-when-processing-some-confidence-false-touches.patch -serial-sc16is7xx-add-check-for-unsupported-spi-modes-during-probe.patch -serial-sc16is7xx-set-safe-default-spi-clock-frequency.patch diff --git a/queue-5.4/serial-sc16is7xx-add-check-for-unsupported-spi-modes-during-probe.patch b/queue-5.4/serial-sc16is7xx-add-check-for-unsupported-spi-modes-during-probe.patch deleted file mode 100644 index 0bd40f059e5..00000000000 --- a/queue-5.4/serial-sc16is7xx-add-check-for-unsupported-spi-modes-during-probe.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 6d710b769c1f5f0d55c9ad9bb49b7dce009ec103 Mon Sep 17 00:00:00 2001 -From: Hugo Villeneuve -Date: Thu, 21 Dec 2023 18:18:09 -0500 -Subject: serial: sc16is7xx: add check for unsupported SPI modes during probe - -From: Hugo Villeneuve - -commit 6d710b769c1f5f0d55c9ad9bb49b7dce009ec103 upstream. - -The original comment is confusing because it implies that variants other -than the SC16IS762 supports other SPI modes beside SPI_MODE_0. - -Extract from datasheet: - The SC16IS762 differs from the SC16IS752 in that it supports SPI clock - speeds up to 15 Mbit/s instead of the 4 Mbit/s supported by the - SC16IS752... In all other aspects, the SC16IS762 is functionally and - electrically the same as the SC16IS752. - -The same is also true of the SC16IS760 variant versus the SC16IS740 and -SC16IS750 variants. - -For all variants, only SPI mode 0 is supported. - -Change comment and abort probing if the specified SPI mode is not -SPI_MODE_0. - -Fixes: 2c837a8a8f9f ("sc16is7xx: spi interface is added") -Cc: -Signed-off-by: Hugo Villeneuve -Link: https://lore.kernel.org/r/20231221231823.2327894-3-hugo@hugovil.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/serial/sc16is7xx.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/drivers/tty/serial/sc16is7xx.c -+++ b/drivers/tty/serial/sc16is7xx.c -@@ -1412,7 +1412,10 @@ static int sc16is7xx_spi_probe(struct sp - - /* Setup SPI bus */ - spi->bits_per_word = 8; -- /* only supports mode 0 on SC16IS762 */ -+ /* For all variants, only mode 0 is supported */ -+ if ((spi->mode & SPI_MODE_X_MASK) != SPI_MODE_0) -+ return dev_err_probe(&spi->dev, -EINVAL, "Unsupported SPI mode\n"); -+ - spi->mode = spi->mode ? : SPI_MODE_0; - spi->max_speed_hz = spi->max_speed_hz ? : 15000000; - ret = spi_setup(spi); diff --git a/queue-5.4/serial-sc16is7xx-set-safe-default-spi-clock-frequency.patch b/queue-5.4/serial-sc16is7xx-set-safe-default-spi-clock-frequency.patch deleted file mode 100644 index ccfd63dd85f..00000000000 --- a/queue-5.4/serial-sc16is7xx-set-safe-default-spi-clock-frequency.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3ef79cd1412236d884ab0c46b4d1921380807b48 Mon Sep 17 00:00:00 2001 -From: Hugo Villeneuve -Date: Thu, 21 Dec 2023 18:18:10 -0500 -Subject: serial: sc16is7xx: set safe default SPI clock frequency - -From: Hugo Villeneuve - -commit 3ef79cd1412236d884ab0c46b4d1921380807b48 upstream. - -15 MHz is supported only by 76x variants. - -If the SPI clock frequency is not specified, use a safe default clock value -of 4 MHz that is supported by all variants. - -Also use HZ_PER_MHZ macro to improve readability. - -Fixes: 2c837a8a8f9f ("sc16is7xx: spi interface is added") -Cc: -Signed-off-by: Hugo Villeneuve -Link: https://lore.kernel.org/r/20231221231823.2327894-4-hugo@hugovil.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/serial/sc16is7xx.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/tty/serial/sc16is7xx.c -+++ b/drivers/tty/serial/sc16is7xx.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - - #define SC16IS7XX_NAME "sc16is7xx" -@@ -1417,7 +1418,7 @@ static int sc16is7xx_spi_probe(struct sp - return dev_err_probe(&spi->dev, -EINVAL, "Unsupported SPI mode\n"); - - spi->mode = spi->mode ? : SPI_MODE_0; -- spi->max_speed_hz = spi->max_speed_hz ? : 15000000; -+ spi->max_speed_hz = spi->max_speed_hz ? : 4 * HZ_PER_MHZ; - ret = spi_setup(spi); - if (ret) - return ret; diff --git a/queue-5.4/series b/queue-5.4/series index af8d36f6453..57c80dcbdae 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -160,5 +160,3 @@ wifi-rtlwifi-convert-lnkctl-change-to-pcie-cap-rmw-accessors.patch wifi-mwifiex-configure-bssid-consistently-when-starting-ap.patch x86-kvm-do-not-try-to-disable-kvmclock-if-it-was-not-enabled.patch hid-wacom-correct-behavior-when-processing-some-confidence-false-touches.patch -serial-sc16is7xx-add-check-for-unsupported-spi-modes-during-probe.patch -serial-sc16is7xx-set-safe-default-spi-clock-frequency.patch -- 2.47.3