linux-next: build failure after merge of the broadcom tree

linux-next: build failure after merge of the broadcom tree

[Stephen Rothwell]

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

Hi all,

After merging the broadcom tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/soc/bcm/bcm2835-power.c: In function 'bcm2835_power_probe':
drivers/soc/bcm/bcm2835-power.c:643:31: error: 'struct bcm2835_pm' has no member named 'rpivid_asb'
  643 |         power->rpivid_asb = pm->rpivid_asb;
      |                               ^~

Caused by commit

  d5eba4a03b1d ("soc: bcm: bcm2835-power: Add support for BCM2711's RPiVid ASB")

I have used the broadcom tree from next-20220627 for today.

-- 
Cheers,
Stephen Rothwell

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

linux-next: build failure after merge of the broadcom tree

[Stephen Rothwell]

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

Hi all,

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

drivers/pinctrl/pinctrl-rp1.c: In function 'rp1_gpio_irq_handler':
drivers/pinctrl/pinctrl-rp1.c:385:36: error: implicit declaration of function 'irq_linear_revmap' [-Wimplicit-function-declaration]
  385 |                 generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irq.domain,
      |                                    ^~~~~~~~~~~~~~~~~

Caused by commit

  f4b3c1c25d39 ("pinctrl: rp1: Implement RaspberryPi RP1 gpio support")

interatcing with commit

  14ebb11ba895 ("irqdomain: Drop irq_linear_revmap()")

from Linus' tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 3 Jun 2025 12:07:49 +1000
Subject: [PATCH] fix up for "pinctrl: rp1: Implement RaspberryPi RP1 gpio
 support"

interacting with commit

  14ebb11ba895 ("irqdomain: Drop irq_linear_revmap()")

from Linus' tree.

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

diff --git a/drivers/pinctrl/pinctrl-rp1.c b/drivers/pinctrl/pinctrl-rp1.c
index 7ff2db0320ba..8c70ea0fc160 100644
--- a/drivers/pinctrl/pinctrl-rp1.c
+++ b/drivers/pinctrl/pinctrl-rp1.c
@@ -382,7 +382,7 @@ static void rp1_gpio_irq_handler(struct irq_desc *desc)
 		struct rp1_pin_info *pin = rp1_get_pin(chip, bit_pos);
 
 		regmap_field_write(pin->gpio[RP1_GPIO_CTRL_IRQRESET_SET], 1);
-		generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irq.domain,
+		generic_handle_irq(irq_find_mapping(pc->gpio_chip.irq.domain,
 						     bank->gpio_offset + bit_pos));
 	}
 
-- 
2.47.2

-- 
Cheers,
Stephen Rothwell

P.S. did you get the message about "no new stuff in -next until the end
of the merge window"?

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

Re: linux-next: build failure after merge of the broadcom tree

[Florian Fainelli]

On 6/2/2025 7:20 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the broadcom tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/pinctrl/pinctrl-rp1.c: In function 'rp1_gpio_irq_handler':
> drivers/pinctrl/pinctrl-rp1.c:385:36: error: implicit declaration of function 'irq_linear_revmap' [-Wimplicit-function-declaration]
>    385 |                 generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irq.domain,
>        |                                    ^~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>    f4b3c1c25d39 ("pinctrl: rp1: Implement RaspberryPi RP1 gpio support")
> 
> interatcing with commit
> 
>    14ebb11ba895 ("irqdomain: Drop irq_linear_revmap()")
> 
> from Linus' tree.
> 
> I have applied the following merge fix patch.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 3 Jun 2025 12:07:49 +1000
> Subject: [PATCH] fix up for "pinctrl: rp1: Implement RaspberryPi RP1 gpio
>   support"
> 
> interacting with commit
> 
>    14ebb11ba895 ("irqdomain: Drop irq_linear_revmap()")
> 
> from Linus' tree.
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks, I have applied your resolution and pushed out an updated branch.
-- 
Florian