linux-next: manual merge of the pinctrl-renesas tree with the pinctrl tree

linux-next: manual merge of the pinctrl-renesas tree with the pinctrl tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2660 bytes --]

Hi all,

Today's linux-next merge of the pinctrl-renesas tree got conflicts in:

  drivers/pinctrl/renesas/pinctrl-rza2.c
  drivers/pinctrl/renesas/pinctrl-rzg2l.c
  drivers/pinctrl/renesas/pinctrl-rzv2m.c

between commit:

  060f03e95454 ("pinctrl: Explicitly include correct DT includes")

from the pinctrl tree and commits:

  848f700dabda ("pinctrl: renesas: rzg2l: Fix NULL pointer dereference in rzg2l_dt_subnode_to_map()")
  ca63f2ef6a16 ("pinctrl: renesas: rzv2m: Fix NULL pointer dereference in rzv2m_dt_subnode_to_map()")
  1eb1e00e5d99 ("pinctrl: renesas: rza2: Add lock around pinctrl_generic{{add,remove}_group,{add,remove}_function}")

from the pinctrl-renesas tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/pinctrl/renesas/pinctrl-rza2.c
index 0b454a31c4bd,5591ddf16fdf..000000000000
--- a/drivers/pinctrl/renesas/pinctrl-rza2.c
+++ b/drivers/pinctrl/renesas/pinctrl-rza2.c
@@@ -14,9 -14,9 +14,10 @@@
  #include <linux/gpio/driver.h>
  #include <linux/io.h>
  #include <linux/module.h>
+ #include <linux/mutex.h>
 -#include <linux/of_device.h>
 +#include <linux/of.h>
  #include <linux/pinctrl/pinmux.h>
 +#include <linux/platform_device.h>
  
  #include "../core.h"
  #include "../pinmux.h"
diff --cc drivers/pinctrl/renesas/pinctrl-rzg2l.c
index 4f34f8f24bde,cdf183250c1e..000000000000
--- a/drivers/pinctrl/renesas/pinctrl-rzg2l.c
+++ b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
@@@ -11,9 -11,9 +11,10 @@@
  #include <linux/interrupt.h>
  #include <linux/io.h>
  #include <linux/module.h>
+ #include <linux/mutex.h>
 -#include <linux/of_device.h>
 +#include <linux/of.h>
  #include <linux/of_irq.h>
 +#include <linux/platform_device.h>
  #include <linux/seq_file.h>
  #include <linux/spinlock.h>
  
diff --cc drivers/pinctrl/renesas/pinctrl-rzv2m.c
index c73784b8b4ba,aa9dbbddff21..000000000000
--- a/drivers/pinctrl/renesas/pinctrl-rzv2m.c
+++ b/drivers/pinctrl/renesas/pinctrl-rzv2m.c
@@@ -14,8 -14,8 +14,9 @@@
  #include <linux/gpio/driver.h>
  #include <linux/io.h>
  #include <linux/module.h>
+ #include <linux/mutex.h>
 -#include <linux/of_device.h>
 +#include <linux/of.h>
 +#include <linux/platform_device.h>
  #include <linux/spinlock.h>
  
  #include <linux/pinctrl/consumer.h>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the pinctrl-renesas tree with the pinctrl tree

[Geert Uytterhoeven]

Hi Stephen,

On Fri, Aug 18, 2023 at 8:08 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the pinctrl-renesas tree got conflicts in:
>
>   drivers/pinctrl/renesas/pinctrl-rza2.c
>   drivers/pinctrl/renesas/pinctrl-rzg2l.c
>   drivers/pinctrl/renesas/pinctrl-rzv2m.c
>
> between commit:
>
>   060f03e95454 ("pinctrl: Explicitly include correct DT includes")
>
> from the pinctrl tree and commits:
>
>   848f700dabda ("pinctrl: renesas: rzg2l: Fix NULL pointer dereference in rzg2l_dt_subnode_to_map()")
>   ca63f2ef6a16 ("pinctrl: renesas: rzv2m: Fix NULL pointer dereference in rzv2m_dt_subnode_to_map()")
>   1eb1e00e5d99 ("pinctrl: renesas: rza2: Add lock around pinctrl_generic{{add,remove}_group,{add,remove}_function}")
>
> from the pinctrl-renesas tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

The resolution LGTM. Thanks!

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: linux-next: manual merge of the pinctrl-renesas tree with the pinctrl tree

[Linus Walleij]

On Fri, Aug 18, 2023 at 1:26 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:

> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging.  You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
>
> The resolution LGTM. Thanks!

The conflict is local to the pinctrl tree now, Torvalds will fix this
conflict when I send my pull request for v6.6 to him.

Yours,
Linus Walleij

linux-next: manual merge of the pinctrl-renesas tree with the pinctrl tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1684 bytes --]

Hi all,

After merging the pinctrl-renesas tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/pinctrl/renesas/pinctrl-rzt2h.c:161:14: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
  161 |         func = pinmux_generic_get_function(pctldev, func_selector);
      |              ^

Caused by commit

  90f2896d7dbb ("pinctrl: renesas: Add support for RZ/T2H")

interacting with commit

  afe1af86ff05 ("pinctrl: constify pinmux_generic_get_function()")

from the pinctrl tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Aug 2025 12:42:30 +1000
Subject: [PATCH] fix up for "pinctrl: renesas: Add support for RZ/T2H"

interacting with commit

  afe1af86ff05 ("pinctrl: constify pinmux_generic_get_function()")

from the pinctrl tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/pinctrl/renesas/pinctrl-rzt2h.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/renesas/pinctrl-rzt2h.c b/drivers/pinctrl/renesas/pinctrl-rzt2h.c
index a070fc447d96..3872638f5ebb 100644
--- a/drivers/pinctrl/renesas/pinctrl-rzt2h.c
+++ b/drivers/pinctrl/renesas/pinctrl-rzt2h.c
@@ -151,7 +151,7 @@ static int rzt2h_pinctrl_set_mux(struct pinctrl_dev *pctldev,
 				 unsigned int group_selector)
 {
 	struct rzt2h_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);
-	struct function_desc *func;
+	const struct function_desc *func;
 	struct group_desc *group;
 	const unsigned int *pins;
 	unsigned int i;
-- 
2.50.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the pinctrl-renesas tree with the pinctrl tree

[Geert Uytterhoeven]

Hi Stephen,

On Wed, 20 Aug 2025 at 05:02, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> After merging the pinctrl-renesas tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/pinctrl/renesas/pinctrl-rzt2h.c:161:14: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
>   161 |         func = pinmux_generic_get_function(pctldev, func_selector);
>       |              ^
>
> Caused by commit
>
>   90f2896d7dbb ("pinctrl: renesas: Add support for RZ/T2H")
>
> interacting with commit
>
>   afe1af86ff05 ("pinctrl: constify pinmux_generic_get_function()")
>
> from the pinctrl tree.

Thanks for your report!

> I have applied the following merge fix patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 20 Aug 2025 12:42:30 +1000
> Subject: [PATCH] fix up for "pinctrl: renesas: Add support for RZ/T2H"
>
> interacting with commit
>
>   afe1af86ff05 ("pinctrl: constify pinmux_generic_get_function()")
>
> from the pinctrl tree.
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

> --- a/drivers/pinctrl/renesas/pinctrl-rzt2h.c
> +++ b/drivers/pinctrl/renesas/pinctrl-rzt2h.c
> @@ -151,7 +151,7 @@ static int rzt2h_pinctrl_set_mux(struct pinctrl_dev *pctldev,
>                                  unsigned int group_selector)
>  {
>         struct rzt2h_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);
> -       struct function_desc *func;
> +       const struct function_desc *func;
>         struct group_desc *group;
>         const unsigned int *pins;
>         unsigned int i;

I will fold this fix into commit 90f2896d7dbb ("pinctrl: renesas:
Add support for RZ/T2H"), as it does not depend on commit afe1af86ff05
("pinctrl: constify pinmux_generic_get_function()").

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds