From 7ccd7dac7ec24f8310104f96437bc539c52cb6cb Mon Sep 17 00:00:00 2001 From: Mieczyslaw Nalewaj Date: Tue, 18 Jun 2024 01:43:47 +0200 Subject: [PATCH] generic: replace spi Silicon Labs patch with upstream version Replace Silicon Labs patch with upstream version as they got merged in kernel 6.3. Signed-off-by: Mieczyslaw Nalewaj [ rework commit title and description, use better patch ] Link: https://github.com/openwrt/openwrt/pull/15300 Signed-off-by: Christian Marangi --- ...ev-Add-Silicon-Labs-EM3581-device-compatible.patch} | 10 +++++----- ...ev-Add-Silicon-Labs-SI3210-device-compatible.patch} | 10 +++++----- ...ev-Add-Silicon-Labs-EM3581-device-compatible.patch} | 10 +++++----- ...ev-Add-Silicon-Labs-SI3210-device-compatible.patch} | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) rename target/linux/generic/{pending-5.15/110-v6.3-0001-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch => backport-5.15/412-v6.3-01-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch} (72%) rename target/linux/generic/{pending-5.15/110-v6.3-0002-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch => backport-5.15/412-v6.3-02-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch} (72%) rename target/linux/generic/{pending-6.1/110-v6.3-0001-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch => backport-6.1/412-v6.3-01-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch} (74%) rename target/linux/generic/{pending-6.1/110-v6.3-0002-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch => backport-6.1/412-v6.3-02-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch} (74%) diff --git a/target/linux/generic/pending-5.15/110-v6.3-0001-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch b/target/linux/generic/backport-5.15/412-v6.3-01-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch similarity index 72% rename from target/linux/generic/pending-5.15/110-v6.3-0001-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch rename to target/linux/generic/backport-5.15/412-v6.3-01-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch index 5216d6a706..153191529c 100644 --- a/target/linux/generic/pending-5.15/110-v6.3-0001-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch +++ b/target/linux/generic/backport-5.15/412-v6.3-01-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch @@ -1,13 +1,13 @@ -From f7982c726e02001afc19052fe48f642dfcbc00b2 Mon Sep 17 00:00:00 2001 +From c67d90e058550403a3e6f9b05bfcdcfa12b1815c Mon Sep 17 00:00:00 2001 From: Vincent Tremblay -Date: Mon, 26 Dec 2022 21:10:37 -0500 -Subject: [PATCH 1/2] spidev: Add Silicon Labs EM3581 device compatible +Date: Mon, 26 Dec 2022 21:35:48 -0500 +Subject: [PATCH] spidev: Add Silicon Labs EM3581 device compatible Add compatible string for Silicon Labs EM3581 device. -Note: This patch is adapted from a patch submitted to the for-next branch (v6.3). - Signed-off-by: Vincent Tremblay +Link: https://lore.kernel.org/r/20221227023550.569547-2-vincent@vtremblay.dev +Signed-off-by: Mark Brown --- drivers/spi/spidev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/linux/generic/pending-5.15/110-v6.3-0002-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch b/target/linux/generic/backport-5.15/412-v6.3-02-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch similarity index 72% rename from target/linux/generic/pending-5.15/110-v6.3-0002-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch rename to target/linux/generic/backport-5.15/412-v6.3-02-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch index ffbed0c622..ef36c82a6c 100644 --- a/target/linux/generic/pending-5.15/110-v6.3-0002-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch +++ b/target/linux/generic/backport-5.15/412-v6.3-02-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch @@ -1,13 +1,13 @@ -From 536581825219e97fa2ae0c4de35605d2f6311416 Mon Sep 17 00:00:00 2001 +From 6c9d1fd52956c3148e847a214bae9102b1811de5 Mon Sep 17 00:00:00 2001 From: Vincent Tremblay -Date: Tue, 27 Dec 2022 09:00:58 -0500 -Subject: [PATCH 2/2] spidev: Add Silicon Labs SI3210 device compatible +Date: Tue, 27 Dec 2022 09:10:08 -0500 +Subject: [PATCH] spidev: Add Silicon Labs SI3210 device compatible Add compatible string for Silicon Labs SI3210 device. -Note: This patch is adapted from a patch submitted to the for-next branch (v6.3). - Signed-off-by: Vincent Tremblay +Link: https://lore.kernel.org/r/20221227141011.111410-2-vincent@vtremblay.dev +Signed-off-by: Mark Brown --- drivers/spi/spidev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/linux/generic/pending-6.1/110-v6.3-0001-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch b/target/linux/generic/backport-6.1/412-v6.3-01-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch similarity index 74% rename from target/linux/generic/pending-6.1/110-v6.3-0001-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch rename to target/linux/generic/backport-6.1/412-v6.3-01-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch index ebeeae2f8f..cc05fa6b75 100644 --- a/target/linux/generic/pending-6.1/110-v6.3-0001-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch +++ b/target/linux/generic/backport-6.1/412-v6.3-01-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch @@ -1,13 +1,13 @@ -From f7982c726e02001afc19052fe48f642dfcbc00b2 Mon Sep 17 00:00:00 2001 +From c67d90e058550403a3e6f9b05bfcdcfa12b1815c Mon Sep 17 00:00:00 2001 From: Vincent Tremblay -Date: Mon, 26 Dec 2022 21:10:37 -0500 -Subject: [PATCH 1/2] spidev: Add Silicon Labs EM3581 device compatible +Date: Mon, 26 Dec 2022 21:35:48 -0500 +Subject: [PATCH] spidev: Add Silicon Labs EM3581 device compatible Add compatible string for Silicon Labs EM3581 device. -Note: This patch is adapted from a patch submitted to the for-next branch (v6.3). - Signed-off-by: Vincent Tremblay +Link: https://lore.kernel.org/r/20221227023550.569547-2-vincent@vtremblay.dev +Signed-off-by: Mark Brown --- drivers/spi/spidev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/linux/generic/pending-6.1/110-v6.3-0002-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch b/target/linux/generic/backport-6.1/412-v6.3-02-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch similarity index 74% rename from target/linux/generic/pending-6.1/110-v6.3-0002-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch rename to target/linux/generic/backport-6.1/412-v6.3-02-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch index db5b5800f4..59d025e087 100644 --- a/target/linux/generic/pending-6.1/110-v6.3-0002-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch +++ b/target/linux/generic/backport-6.1/412-v6.3-02-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch @@ -1,13 +1,13 @@ -From 536581825219e97fa2ae0c4de35605d2f6311416 Mon Sep 17 00:00:00 2001 +From 6c9d1fd52956c3148e847a214bae9102b1811de5 Mon Sep 17 00:00:00 2001 From: Vincent Tremblay -Date: Tue, 27 Dec 2022 09:00:58 -0500 -Subject: [PATCH 2/2] spidev: Add Silicon Labs SI3210 device compatible +Date: Tue, 27 Dec 2022 09:10:08 -0500 +Subject: [PATCH] spidev: Add Silicon Labs SI3210 device compatible Add compatible string for Silicon Labs SI3210 device. -Note: This patch is adapted from a patch submitted to the for-next branch (v6.3). - Signed-off-by: Vincent Tremblay +Link: https://lore.kernel.org/r/20221227141011.111410-2-vincent@vtremblay.dev +Signed-off-by: Mark Brown --- drivers/spi/spidev.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.30.2