Re: [PULL] IIO: New device support, features and cleanup for 7.0

[Greg KH <gregkh@linuxfoundation.org>]

On Sun, Feb 01, 2026 at 04:59:51PM +0000, Jonathan Cameron wrote:
> The following changes since commit 8f0b4cce4481fb22653697cced8d0d04027cb1e8:
> 
>   Linux 6.19-rc1 (2025-12-14 16:05:07 +1200)
> 
> are available in the Git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git tags/iio-for-7.0a
> 
> for you to fetch changes up to 0713b26190addfa3a774b386c8658952ef9f7faf:
> 
>   iio: magn: mmc5633: Fix Kconfig for combination of I3C as module and driver builtin (2026-02-01 16:53:35 +0000)
> 
> ----------------------------------------------------------------
> IIO: New device support, features and cleanup for the 6.20/7.0 cycle.
> 
> Slightly messier than normal unfortunately due to some conflicts
> and build config bugs related to I3C drivers.
> 
> One last minute Kconfig fix right at the top after a linux-next report.
> I've simplified the Kconfig and made it match other instances in the kernel
> so that should be safe enough despite short soak time in front of build bots.
> 
> Merge of an immutable branch from I3C to get some stubs that were missing
> and caused build issues with dual I2C / I3C drivers. This also brought in a
> drop of some deprecated interfaces so there is also one patch to update a
> new driver to not use those.
> 
> We are having another go at using cleanup.h magic with the IIO mode claim
> functions after backing out last try at this. This time we have wrappers
> around the new ACQUIRE() and ACQUIRE_ERR() macros.
> Having been burnt once, we will be taking it a bit more slowly this time
> wrt to wide adoption of these! Thanks in particular to Kurt for taking
> on this core IIO work.

I got a merge conflict in drivers/iio/adc/ad9467.c and resolved it this
way:

diff --cc drivers/iio/adc/ad9467.c
index 2d8f8da3671d,9cfe66425d4e..000000000000
--- a/drivers/iio/adc/ad9467.c
+++ b/drivers/iio/adc/ad9467.c
@@@ -94,8 -103,8 +103,8 @@@
   */
  
  #define CHIPID_AD9434			0x6A
- #define AD9434_DEF_OUTPUT_MODE		0x00
+ #define AD9434_DEF_OUTPUT_MODE		0x01
 -#define AD9434_REG_VREF_MASK		0xC0
 +#define AD9434_REG_VREF_MASK		GENMASK(4, 0)
  
  /*
   * Analog Devices AD9467 16-Bit, 200/250 MSPS ADC

Hopefully I did it right?

If not, can you send a fix-up patch for me?

thanks,

greg k-h