Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/bcma/driver_gpio.c between commit 2997609eb4c9 ("bcma: gpio: add
own IRQ domain") from Linus' tree and commit 6b6ee88774ae ("bcma: gpio:
register all 32 GPIOs") from the wireless tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
[Aside, Ralf: that commit in Linus' tree is committed by you but has no
Signed-off-by from you. There were a couple of others there as well.]
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/bcma/driver_gpio.c
index 25f9887a35d0,39dadf5342c6..000000000000
--- a/drivers/bcma/driver_gpio.c
+++ b/drivers/bcma/driver_gpio.c
@@@ -215,10 -95,8 +215,10 @@@ int bcma_gpio_init(struct bcma_drv_cc *
chip->set = bcma_gpio_set_value;
chip->direction_input = bcma_gpio_direction_input;
chip->direction_output = bcma_gpio_direction_output;
+#if IS_BUILTIN(CONFIG_BCMA_HOST_SOC)
chip->to_irq = bcma_gpio_to_irq;
+#endif
- chip->ngpio = 16;
+ chip->ngpio = 32;
/* There is just one SoC in one device and its GPIO addresses should be
* deterministic to address them more easily. The other buses could get
* a random base number. */
Attachment:
pgpjQS_uuAsQN.pgp
Description: PGP signature
