linux-next: manual merge of the gpio-brgl tree with the iio tree

linux-next: manual merge of the gpio-brgl tree with the iio tree

[Mark Brown]

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

Hi all,

Today's linux-next merge of the gpio-brgl tree got a conflict in:

  MAINTAINERS

between commits:

  02f4bd272bf7b ("iio: adc: add Axiado SARADC driver")
  a84f9870c16ba ("dt-bindings: iio: adc: add Axiado AX3000/AX3005 SARADC")

from the iio tree and commits:

  a7787b818204d ("dt-bindings: gpio: add Axiado AX3005 SGPIO controller")
  dd36a4b7f391e ("gpio: axiado: add AX3005 SGPIO controller support")

from the gpio-brgl 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.

diff --cc MAINTAINERS
index b6400ebe7d2dd,9aea4c3fd3aee..0000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4487,15 -4439,15 +4487,24 @@@ S:	Orpha
  F:	Documentation/devicetree/bindings/sound/axentia,*
  F:	sound/soc/atmel/tse850-pcm5142.c
  
 +AXIADO SARADC DRIVER
 +M:	Petar Stepanovic <pstepanovic@axiado.com>
 +M:	Akhila Kavi <akavi@axiado.com>
 +M:	Prasad Bolisetty <pbolisetty@axiado.com>
 +L:	linux-iio@vger.kernel.org
 +S:	Maintained
 +F:	Documentation/devicetree/bindings/iio/adc/axiado,ax3000-saradc.yaml
 +F:	drivers/iio/adc/axiado_saradc.c
 +
+ AXIADO SGPIO DRIVER
+ M:	Petar Stepanovic <pstepanovic@axiado.com>
+ M:	SriNavmani A <srinavmani@axiado.com>
+ M:	Prasad Bolisetty <pbolisetty@axiado.com>
+ L:	linux-gpio@vger.kernel.org
+ S:	Supported
+ F:	Documentation/devicetree/bindings/gpio/axiado,ax3005-sgpio.yaml
+ F:	drivers/gpio/gpio-axiado-sgpio.c
+ 
  AXIS ARTPEC ARM64 SoC SUPPORT
  M:	Jesper Nilsson <jesper.nilsson@axis.com>
  M:	Lars Persson <lars.persson@axis.com>

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

linux-next: manual merge of the gpio-brgl tree with the iio tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the gpio-brgl tree got a conflict in:

  drivers/iio/adc/ad7606_spi.c

between commit:

  d2477887f667 ("iio: adc: ad7606: move software functions into common file")

from the iio tree and commit:

  8203bc81f025 ("iio: adc: ad7606: use gpiod_multi_set_value_cansleep")

from the gpio-brgl tree.

I fixed it up (code was moved so I used the former version of this file
and applied the following merge resolution patch) 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.

From a1072aac97bdaf3042fe2def4d7e6e7fa928cfbd Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 17 Feb 2025 14:52:30 +1100
Subject: [PATCH] fix up for "iio: adc: ad7606: use gpiod_multi_set_value_cansleep"

interacting with commit

  d2477887f667 ("iio: adc: ad7606: move software functions into common file")

from the iio tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/iio/adc/ad7606.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c
index cb3de1bd15b4..7d83bb320249 100644
--- a/drivers/iio/adc/ad7606.c
+++ b/drivers/iio/adc/ad7606.c
@@ -1259,10 +1259,9 @@ static int ad7606b_sw_mode_setup(struct iio_dev *indio_dev)
 	 * in the device tree, then they need to be set to high,
 	 * otherwise, they must be hardwired to VDD
 	 */
-	if (st->gpio_os) {
-		gpiod_set_array_value(st->gpio_os->ndescs, st->gpio_os->desc,
-				      st->gpio_os->info, os);
-	}
+	if (st->gpio_os)
+		gpiod_multi_set_value_cansleep(st->gpio_os, os);
+
 	/* OS of 128 and 256 are available only in software mode */
 	st->oversampling_avail = ad7606b_oversampling_avail;
 	st->num_os_ratios = ARRAY_SIZE(ad7606b_oversampling_avail);
-- 
2.45.2

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: manual merge of the gpio-brgl tree with the iio tree

[Bartosz Golaszewski]

On Mon, 17 Feb 2025 at 04:56, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
>   drivers/iio/adc/ad7606_spi.c
>
> between commit:
>
>   d2477887f667 ("iio: adc: ad7606: move software functions into common file")
>
> from the iio tree and commit:
>
>   8203bc81f025 ("iio: adc: ad7606: use gpiod_multi_set_value_cansleep")
>
> from the gpio-brgl tree.
>
> I fixed it up (code was moved so I used the former version of this file
> and applied the following merge resolution patch) 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.
>
> From a1072aac97bdaf3042fe2def4d7e6e7fa928cfbd Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 17 Feb 2025 14:52:30 +1100
> Subject: [PATCH] fix up for "iio: adc: ad7606: use gpiod_multi_set_value_cansleep"
>
> interacting with commit
>
>   d2477887f667 ("iio: adc: ad7606: move software functions into common file")
>
> from the iio tree.
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/iio/adc/ad7606.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c
> index cb3de1bd15b4..7d83bb320249 100644
> --- a/drivers/iio/adc/ad7606.c
> +++ b/drivers/iio/adc/ad7606.c
> @@ -1259,10 +1259,9 @@ static int ad7606b_sw_mode_setup(struct iio_dev *indio_dev)
>          * in the device tree, then they need to be set to high,
>          * otherwise, they must be hardwired to VDD
>          */
> -       if (st->gpio_os) {
> -               gpiod_set_array_value(st->gpio_os->ndescs, st->gpio_os->desc,
> -                                     st->gpio_os->info, os);
> -       }
> +       if (st->gpio_os)
> +               gpiod_multi_set_value_cansleep(st->gpio_os, os);
> +
>         /* OS of 128 and 256 are available only in software mode */
>         st->oversampling_avail = ad7606b_oversampling_avail;
>         st->num_os_ratios = ARRAY_SIZE(ad7606b_oversampling_avail);
> --
> 2.45.2
>
> --
> Cheers,
> Stephen Rothwell

Jonathan,

I'm repeating my offer here - I can drop the iio patches from my queue
and let you pick them up to avoid conflicts in next and during the
merge window. How does it sound? It's still pretty early into the
release cycle so I'm fine with rebasing my branch.

Bart