* [Buildroot] [PATCH v2] package/wilc-driver: fix build failure with Linux 6.3+
@ 2023-10-01 19:01 Giulio Benetti
2023-10-01 19:06 ` Giulio Benetti
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Giulio Benetti @ 2023-10-01 19:01 UTC (permalink / raw)
To: buildroot; +Cc: Giulio Benetti, Kris Bahnsen
Add local patches pending upstream to fix build failure on Linux 6.3+
Fixes:
http://autobuild.buildroot.net/results/3b954399aa3ffab9609da1fc381f38f28bd8eb9f
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
.../wilc-driver/0006-Support-Linux-6.3.patch | 43 +++++++++++++++++++
.../wilc-driver/0007-Support-Linux-6.4.patch | 36 ++++++++++++++++
2 files changed, 79 insertions(+)
create mode 100644 package/wilc-driver/0006-Support-Linux-6.3.patch
create mode 100644 package/wilc-driver/0007-Support-Linux-6.4.patch
diff --git a/package/wilc-driver/0006-Support-Linux-6.3.patch b/package/wilc-driver/0006-Support-Linux-6.3.patch
new file mode 100644
index 0000000000..f5a92027da
--- /dev/null
+++ b/package/wilc-driver/0006-Support-Linux-6.3.patch
@@ -0,0 +1,43 @@
+From 14b5eccf4145e7a5afc8bc65a15f26ac691f98d8 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <giulio.benetti@benettiengineering.com>
+Date: Wed, 27 Sep 2023 10:54:18 +0200
+Subject: [PATCH] Support Linux 6.3
+
+With Linux 6.3 commit:
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=40fc56ee608cdb20022c225ac6f1e4b7ba63f8f1
+function of_get_named_gpio_flags() has been dropped but it was only a
+wrapper to call of_get_named_gpio() if the flags passed was NULL and this
+is the case. So let's use of_get_named_gpio() in place of
+of_get_named_gpio_flags() since of_get_named_gpio() never changed
+after its adding in Linux version 3.1.
+
+Upstream: https://github.com/embeddedTS/wilc3000-external-module/pull/4
+
+Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
+---
+ power.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/power.c b/power.c
+index 6c59e0b..6ab8d63 100644
+--- a/power.c
++++ b/power.c
+@@ -25,13 +25,11 @@ int wilc_of_parse_power_pins(struct wilc *wilc)
+ const struct wilc_power_gpios *gpios = &default_gpios[0];
+ int ret;
+
+- power->gpios.reset = of_get_named_gpio_flags(of, "reset-gpios", 0,
+- NULL);
++ power->gpios.reset = of_get_named_gpio(of, "reset-gpios", 0);
+ if (!gpio_is_valid(power->gpios.reset))
+ power->gpios.reset = gpios->reset;
+
+- power->gpios.chip_en = of_get_named_gpio_flags(of, "chip_en-gpios", 0,
+- NULL);
++ power->gpios.chip_en = of_get_named_gpio(of, "chip_en-gpios", 0);
+ if (!gpio_is_valid(power->gpios.chip_en))
+ power->gpios.chip_en = gpios->chip_en;
+
+--
+2.34.1
+
diff --git a/package/wilc-driver/0007-Support-Linux-6.4.patch b/package/wilc-driver/0007-Support-Linux-6.4.patch
new file mode 100644
index 0000000000..8339cc3cb6
--- /dev/null
+++ b/package/wilc-driver/0007-Support-Linux-6.4.patch
@@ -0,0 +1,36 @@
+From 94fc4594659494b8c5cbdf1a719aea4d66d3398d Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <giulio.benetti@benettiengineering.com>
+Date: Wed, 27 Sep 2023 11:20:50 +0200
+Subject: [PATCH] Support Linux 6.4
+
+With Linux 6.4 commit:
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1aaba11da9aa7d7d6b52a74d45b31cac118295a1
+class_create() doesn't require first argument THIS_MODULE anymore so let's
+drop first argument if Linux version >= 6.4
+
+Upstream: https://github.com/embeddedTS/wilc3000-external-module/pull/5
+
+Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
+---
+ bt.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/bt.c b/bt.c
+index 48a5302..a752457 100644
+--- a/bt.c
++++ b/bt.c
+@@ -135,7 +135,11 @@ static void wilc_bt_create_device(void)
+ ret = alloc_chrdev_region(&chc_dev_no, 0, 1, "atmel");
+ if (ret < 0)
+ return;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
++ chc_dev_class = class_create("atmel");
++#else
+ chc_dev_class = class_create(THIS_MODULE, "atmel");
++#endif
+ if (IS_ERR(chc_dev_class)) {
+ unregister_chrdev_region(chc_dev_no, 1);
+ return;
+--
+2.34.1
+
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH v2] package/wilc-driver: fix build failure with Linux 6.3+
2023-10-01 19:01 [Buildroot] [PATCH v2] package/wilc-driver: fix build failure with Linux 6.3+ Giulio Benetti
@ 2023-10-01 19:06 ` Giulio Benetti
2023-10-02 8:41 ` Peter Korsgaard
2023-10-13 15:16 ` Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Giulio Benetti @ 2023-10-01 19:06 UTC (permalink / raw)
To: buildroot; +Cc: Kris Bahnsen
On 01/10/23 21:01, Giulio Benetti wrote:
> Add local patches pending upstream to fix build failure on Linux 6.3+
>
> Fixes:
> http://autobuild.buildroot.net/results/3b954399aa3ffab9609da1fc381f38f28bd8eb9f
>
> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
V1->V2:
* update Linux 6.3 gpio patch as suggested by Peter
> ---
> .../wilc-driver/0006-Support-Linux-6.3.patch | 43 +++++++++++++++++++
> .../wilc-driver/0007-Support-Linux-6.4.patch | 36 ++++++++++++++++
> 2 files changed, 79 insertions(+)
> create mode 100644 package/wilc-driver/0006-Support-Linux-6.3.patch
> create mode 100644 package/wilc-driver/0007-Support-Linux-6.4.patch
>
> diff --git a/package/wilc-driver/0006-Support-Linux-6.3.patch b/package/wilc-driver/0006-Support-Linux-6.3.patch
> new file mode 100644
> index 0000000000..f5a92027da
> --- /dev/null
> +++ b/package/wilc-driver/0006-Support-Linux-6.3.patch
> @@ -0,0 +1,43 @@
> +From 14b5eccf4145e7a5afc8bc65a15f26ac691f98d8 Mon Sep 17 00:00:00 2001
> +From: Giulio Benetti <giulio.benetti@benettiengineering.com>
> +Date: Wed, 27 Sep 2023 10:54:18 +0200
> +Subject: [PATCH] Support Linux 6.3
> +
> +With Linux 6.3 commit:
> +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=40fc56ee608cdb20022c225ac6f1e4b7ba63f8f1
> +function of_get_named_gpio_flags() has been dropped but it was only a
> +wrapper to call of_get_named_gpio() if the flags passed was NULL and this
> +is the case. So let's use of_get_named_gpio() in place of
> +of_get_named_gpio_flags() since of_get_named_gpio() never changed
> +after its adding in Linux version 3.1.
> +
> +Upstream: https://github.com/embeddedTS/wilc3000-external-module/pull/4
> +
> +Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
> +---
> + power.c | 6 ++----
> + 1 file changed, 2 insertions(+), 4 deletions(-)
> +
> +diff --git a/power.c b/power.c
> +index 6c59e0b..6ab8d63 100644
> +--- a/power.c
> ++++ b/power.c
> +@@ -25,13 +25,11 @@ int wilc_of_parse_power_pins(struct wilc *wilc)
> + const struct wilc_power_gpios *gpios = &default_gpios[0];
> + int ret;
> +
> +- power->gpios.reset = of_get_named_gpio_flags(of, "reset-gpios", 0,
> +- NULL);
> ++ power->gpios.reset = of_get_named_gpio(of, "reset-gpios", 0);
> + if (!gpio_is_valid(power->gpios.reset))
> + power->gpios.reset = gpios->reset;
> +
> +- power->gpios.chip_en = of_get_named_gpio_flags(of, "chip_en-gpios", 0,
> +- NULL);
> ++ power->gpios.chip_en = of_get_named_gpio(of, "chip_en-gpios", 0);
> + if (!gpio_is_valid(power->gpios.chip_en))
> + power->gpios.chip_en = gpios->chip_en;
> +
> +--
> +2.34.1
> +
> diff --git a/package/wilc-driver/0007-Support-Linux-6.4.patch b/package/wilc-driver/0007-Support-Linux-6.4.patch
> new file mode 100644
> index 0000000000..8339cc3cb6
> --- /dev/null
> +++ b/package/wilc-driver/0007-Support-Linux-6.4.patch
> @@ -0,0 +1,36 @@
> +From 94fc4594659494b8c5cbdf1a719aea4d66d3398d Mon Sep 17 00:00:00 2001
> +From: Giulio Benetti <giulio.benetti@benettiengineering.com>
> +Date: Wed, 27 Sep 2023 11:20:50 +0200
> +Subject: [PATCH] Support Linux 6.4
> +
> +With Linux 6.4 commit:
> +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1aaba11da9aa7d7d6b52a74d45b31cac118295a1
> +class_create() doesn't require first argument THIS_MODULE anymore so let's
> +drop first argument if Linux version >= 6.4
> +
> +Upstream: https://github.com/embeddedTS/wilc3000-external-module/pull/5
> +
> +Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
> +---
> + bt.c | 4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +diff --git a/bt.c b/bt.c
> +index 48a5302..a752457 100644
> +--- a/bt.c
> ++++ b/bt.c
> +@@ -135,7 +135,11 @@ static void wilc_bt_create_device(void)
> + ret = alloc_chrdev_region(&chc_dev_no, 0, 1, "atmel");
> + if (ret < 0)
> + return;
> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
> ++ chc_dev_class = class_create("atmel");
> ++#else
> + chc_dev_class = class_create(THIS_MODULE, "atmel");
> ++#endif
> + if (IS_ERR(chc_dev_class)) {
> + unregister_chrdev_region(chc_dev_no, 1);
> + return;
> +--
> +2.34.1
> +
--
Giulio Benetti
CEO&CTO@Benetti Engineering sas
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH v2] package/wilc-driver: fix build failure with Linux 6.3+
2023-10-01 19:01 [Buildroot] [PATCH v2] package/wilc-driver: fix build failure with Linux 6.3+ Giulio Benetti
2023-10-01 19:06 ` Giulio Benetti
@ 2023-10-02 8:41 ` Peter Korsgaard
2023-10-13 15:16 ` Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2023-10-02 8:41 UTC (permalink / raw)
To: Giulio Benetti; +Cc: Kris Bahnsen, buildroot
>>>>> "Giulio" == Giulio Benetti <giulio.benetti@benettiengineering.com> writes:
> Add local patches pending upstream to fix build failure on Linux 6.3+
> Fixes:
> http://autobuild.buildroot.net/results/3b954399aa3ffab9609da1fc381f38f28bd8eb9f
> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH v2] package/wilc-driver: fix build failure with Linux 6.3+
2023-10-01 19:01 [Buildroot] [PATCH v2] package/wilc-driver: fix build failure with Linux 6.3+ Giulio Benetti
2023-10-01 19:06 ` Giulio Benetti
2023-10-02 8:41 ` Peter Korsgaard
@ 2023-10-13 15:16 ` Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2023-10-13 15:16 UTC (permalink / raw)
To: Giulio Benetti; +Cc: Kris Bahnsen, buildroot
>>>>> "Giulio" == Giulio Benetti <giulio.benetti@benettiengineering.com> writes:
> Add local patches pending upstream to fix build failure on Linux 6.3+
> Fixes:
> http://autobuild.buildroot.net/results/3b954399aa3ffab9609da1fc381f38f28bd8eb9f
> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Committed to 2023.08.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-10-13 15:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-01 19:01 [Buildroot] [PATCH v2] package/wilc-driver: fix build failure with Linux 6.3+ Giulio Benetti
2023-10-01 19:06 ` Giulio Benetti
2023-10-02 8:41 ` Peter Korsgaard
2023-10-13 15:16 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox