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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 20 Aug 2025 13:02:27 +1000

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 <[email-masked]>
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 <[email-masked]>
---
 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