[v2] i3c, iio: fix i3c driver dependencies

[PATCH] [v2] i3c, iio: fix i3c driver dependencies

Posted by Arnd Bergmann 4 days, 11 hours ago

From: Arnd Bergmann <arnd@arndb.de>

All combined i2c/i3c drivers appear to suffer from the same link
time problem when CONFIG_I3C is set to 'm':

arm-linux-gnueabi-ld: drivers/iio/magnetometer/mmc5633.o: in function `mmc5633_i3c_driver_init':
mmc5633.c:(.init.text+0x30): undefined reference to `i3c_driver_register_with_owner'

This was previously fixed several times by marking individual
drivers as 'depends on I2C; depends on I3C || !I3C', but this gets
tedious and is somewhat confusing.

Add a Kconfig symbol 'I3C_OR_I2C' to help replace those dependencies,
and use this in all the existing drivers that had already fixed it
as well as the new mmc5633 driver.

Fixes: 6e5f6bf2e3f0 ("iio: magnetometer: Add mmc5633 sensor")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
v2: restore accidentally deleted lines
---
 drivers/hwmon/Kconfig            |  6 ++----
 drivers/i3c/Kconfig              | 12 ++++++++++++
 drivers/iio/magnetometer/Kconfig |  2 +-
 drivers/misc/amd-sbi/Kconfig     |  3 +--
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 41c381764c2b..ecfba861f66d 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -1493,8 +1493,7 @@ config SENSORS_LM73
 
 config SENSORS_LM75
 	tristate "National Semiconductor LM75 and compatibles"
-	depends on I2C
-	depends on I3C || !I3C
+	depends on I3C_OR_I2C
 	select REGMAP_I2C
 	select REGMAP_I3C if I3C
 	help
@@ -2392,8 +2391,7 @@ config SENSORS_TMP103
 
 config SENSORS_TMP108
 	tristate "Texas Instruments TMP108"
-	depends on I2C
-	depends on I3C || !I3C
+	depends on I3C_OR_I2C
 	select REGMAP_I2C
 	select REGMAP_I3C if I3C
 	help
diff --git a/drivers/i3c/Kconfig b/drivers/i3c/Kconfig
index 30a441506f61..626c54b386d5 100644
--- a/drivers/i3c/Kconfig
+++ b/drivers/i3c/Kconfig
@@ -22,3 +22,15 @@ menuconfig I3C
 if I3C
 source "drivers/i3c/master/Kconfig"
 endif # I3C
+
+config I3C_OR_I2C
+	tristate
+	default m if I3C=m
+	default I2C
+	help
+	  Device drivers using module_i3c_i2c_driver() can use either
+	  i2c or i3c hosts, but cannot be built-in for the kernel when
+	  CONFIG_I3C=m.
+
+	  Add 'depends on I2C_OR_I3C' in Kconfig for those drivers to
+	  get the correct dependencies.
diff --git a/drivers/iio/magnetometer/Kconfig b/drivers/iio/magnetometer/Kconfig
index 2b81b22c9550..448fef4e5716 100644
--- a/drivers/iio/magnetometer/Kconfig
+++ b/drivers/iio/magnetometer/Kconfig
@@ -143,7 +143,7 @@ config MMC5633
 	tristate "MEMSIC MMC5633 3-axis magnetic sensor"
 	select REGMAP_I2C if I2C
 	select REGMAP_I3C if I3C
-	depends on I2C || I3C
+	depends on I3C_OR_I2C
 	help
 	  Say yes here to build support for the MEMSIC MMC5633 3-axis
 	  magnetic sensor.
diff --git a/drivers/misc/amd-sbi/Kconfig b/drivers/misc/amd-sbi/Kconfig
index be022c71a90c..30e7fad7356c 100644
--- a/drivers/misc/amd-sbi/Kconfig
+++ b/drivers/misc/amd-sbi/Kconfig
@@ -1,10 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config AMD_SBRMI_I2C
 	tristate "AMD side band RMI support"
-	depends on I2C
+	depends on I3C_OR_I2C
 	depends on ARM || ARM64 || COMPILE_TEST
 	select REGMAP_I2C
-	depends on I3C || !I3C
 	select REGMAP_I3C if I3C
 	help
 	  Side band RMI over I2C/I3C support for AMD out of band management.
-- 
2.39.5

Re: [PATCH] [v2] i3c, iio: fix i3c driver dependencies

Posted by Alexandre Belloni 2 days, 11 hours ago

On 02/02/2026 17:04:46+0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> All combined i2c/i3c drivers appear to suffer from the same link
> time problem when CONFIG_I3C is set to 'm':
> 
> arm-linux-gnueabi-ld: drivers/iio/magnetometer/mmc5633.o: in function `mmc5633_i3c_driver_init':
> mmc5633.c:(.init.text+0x30): undefined reference to `i3c_driver_register_with_owner'
> 
> This was previously fixed several times by marking individual
> drivers as 'depends on I2C; depends on I3C || !I3C', but this gets
> tedious and is somewhat confusing.
> 
> Add a Kconfig symbol 'I3C_OR_I2C' to help replace those dependencies,
> and use this in all the existing drivers that had already fixed it
> as well as the new mmc5633 driver.
> 
> Fixes: 6e5f6bf2e3f0 ("iio: magnetometer: Add mmc5633 sensor")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> v2: restore accidentally deleted lines
> ---
>  drivers/hwmon/Kconfig            |  6 ++----
>  drivers/i3c/Kconfig              | 12 ++++++++++++
>  drivers/iio/magnetometer/Kconfig |  2 +-
>  drivers/misc/amd-sbi/Kconfig     |  3 +--
>  4 files changed, 16 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
> index 41c381764c2b..ecfba861f66d 100644
> --- a/drivers/hwmon/Kconfig
> +++ b/drivers/hwmon/Kconfig
> @@ -1493,8 +1493,7 @@ config SENSORS_LM73
>  
>  config SENSORS_LM75
>  	tristate "National Semiconductor LM75 and compatibles"
> -	depends on I2C
> -	depends on I3C || !I3C
> +	depends on I3C_OR_I2C
>  	select REGMAP_I2C
>  	select REGMAP_I3C if I3C
>  	help
> @@ -2392,8 +2391,7 @@ config SENSORS_TMP103
>  
>  config SENSORS_TMP108
>  	tristate "Texas Instruments TMP108"
> -	depends on I2C
> -	depends on I3C || !I3C
> +	depends on I3C_OR_I2C
>  	select REGMAP_I2C
>  	select REGMAP_I3C if I3C
>  	help
> diff --git a/drivers/i3c/Kconfig b/drivers/i3c/Kconfig
> index 30a441506f61..626c54b386d5 100644
> --- a/drivers/i3c/Kconfig
> +++ b/drivers/i3c/Kconfig
> @@ -22,3 +22,15 @@ menuconfig I3C
>  if I3C
>  source "drivers/i3c/master/Kconfig"
>  endif # I3C
> +
> +config I3C_OR_I2C

I'm fine with this but I wanted to mention that we have RTC_I2C_AND_SPI
the "and" being because it is from the point of view of the device (the
device supports both bus) while we have I3C_OR_I2C, "or" being about the
bus (the device can be on any bus).

So I guess at some point we are going to need a combination of
I3C_OR_I2C and SPI and this may be weird to have both OR and AND.



-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [PATCH] [v2] i3c, iio: fix i3c driver dependencies

Posted by Guenter Roeck 4 days, 9 hours ago

On 2/2/26 08:04, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> All combined i2c/i3c drivers appear to suffer from the same link
> time problem when CONFIG_I3C is set to 'm':
> 
> arm-linux-gnueabi-ld: drivers/iio/magnetometer/mmc5633.o: in function `mmc5633_i3c_driver_init':
> mmc5633.c:(.init.text+0x30): undefined reference to `i3c_driver_register_with_owner'
> 
> This was previously fixed several times by marking individual
> drivers as 'depends on I2C; depends on I3C || !I3C', but this gets
> tedious and is somewhat confusing.
> 
> Add a Kconfig symbol 'I3C_OR_I2C' to help replace those dependencies,
> and use this in all the existing drivers that had already fixed it
> as well as the new mmc5633 driver.
> 
> Fixes: 6e5f6bf2e3f0 ("iio: magnetometer: Add mmc5633 sensor")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> v2: restore accidentally deleted lines
> ---
>   drivers/hwmon/Kconfig            |  6 ++----

For hwmon:

Acked-by: Guenter Roeck <linux@roeck-us.net>

>   drivers/i3c/Kconfig              | 12 ++++++++++++
>   drivers/iio/magnetometer/Kconfig |  2 +-
>   drivers/misc/amd-sbi/Kconfig     |  3 +--
>   4 files changed, 16 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
> index 41c381764c2b..ecfba861f66d 100644
> --- a/drivers/hwmon/Kconfig
> +++ b/drivers/hwmon/Kconfig
> @@ -1493,8 +1493,7 @@ config SENSORS_LM73
>   
>   config SENSORS_LM75
>   	tristate "National Semiconductor LM75 and compatibles"
> -	depends on I2C
> -	depends on I3C || !I3C
> +	depends on I3C_OR_I2C
>   	select REGMAP_I2C
>   	select REGMAP_I3C if I3C
>   	help
> @@ -2392,8 +2391,7 @@ config SENSORS_TMP103
>   
>   config SENSORS_TMP108
>   	tristate "Texas Instruments TMP108"
> -	depends on I2C
> -	depends on I3C || !I3C
> +	depends on I3C_OR_I2C
>   	select REGMAP_I2C
>   	select REGMAP_I3C if I3C
>   	help
> diff --git a/drivers/i3c/Kconfig b/drivers/i3c/Kconfig
> index 30a441506f61..626c54b386d5 100644
> --- a/drivers/i3c/Kconfig
> +++ b/drivers/i3c/Kconfig
> @@ -22,3 +22,15 @@ menuconfig I3C
>   if I3C
>   source "drivers/i3c/master/Kconfig"
>   endif # I3C
> +
> +config I3C_OR_I2C
> +	tristate
> +	default m if I3C=m
> +	default I2C
> +	help
> +	  Device drivers using module_i3c_i2c_driver() can use either
> +	  i2c or i3c hosts, but cannot be built-in for the kernel when
> +	  CONFIG_I3C=m.
> +
> +	  Add 'depends on I2C_OR_I3C' in Kconfig for those drivers to
> +	  get the correct dependencies.
> diff --git a/drivers/iio/magnetometer/Kconfig b/drivers/iio/magnetometer/Kconfig
> index 2b81b22c9550..448fef4e5716 100644
> --- a/drivers/iio/magnetometer/Kconfig
> +++ b/drivers/iio/magnetometer/Kconfig
> @@ -143,7 +143,7 @@ config MMC5633
>   	tristate "MEMSIC MMC5633 3-axis magnetic sensor"
>   	select REGMAP_I2C if I2C
>   	select REGMAP_I3C if I3C
> -	depends on I2C || I3C
> +	depends on I3C_OR_I2C
>   	help
>   	  Say yes here to build support for the MEMSIC MMC5633 3-axis
>   	  magnetic sensor.
> diff --git a/drivers/misc/amd-sbi/Kconfig b/drivers/misc/amd-sbi/Kconfig
> index be022c71a90c..30e7fad7356c 100644
> --- a/drivers/misc/amd-sbi/Kconfig
> +++ b/drivers/misc/amd-sbi/Kconfig
> @@ -1,10 +1,9 @@
>   # SPDX-License-Identifier: GPL-2.0-only
>   config AMD_SBRMI_I2C
>   	tristate "AMD side band RMI support"
> -	depends on I2C
> +	depends on I3C_OR_I2C
>   	depends on ARM || ARM64 || COMPILE_TEST
>   	select REGMAP_I2C
> -	depends on I3C || !I3C
>   	select REGMAP_I3C if I3C
>   	help
>   	  Side band RMI over I2C/I3C support for AMD out of band management.

Re: [PATCH] [v2] i3c, iio: fix i3c driver dependencies

Posted by Jonathan Cameron 4 days, 6 hours ago

On Mon, 2 Feb 2026 09:50:58 -0800
Guenter Roeck <linux@roeck-us.net> wrote:

> On 2/2/26 08:04, Arnd Bergmann wrote:
> > From: Arnd Bergmann <arnd@arndb.de>
> > 
> > All combined i2c/i3c drivers appear to suffer from the same link
> > time problem when CONFIG_I3C is set to 'm':
> > 
> > arm-linux-gnueabi-ld: drivers/iio/magnetometer/mmc5633.o: in function `mmc5633_i3c_driver_init':
> > mmc5633.c:(.init.text+0x30): undefined reference to `i3c_driver_register_with_owner'
> > 
> > This was previously fixed several times by marking individual
> > drivers as 'depends on I2C; depends on I3C || !I3C', but this gets
> > tedious and is somewhat confusing.
> > 
> > Add a Kconfig symbol 'I3C_OR_I2C' to help replace those dependencies,
> > and use this in all the existing drivers that had already fixed it
> > as well as the new mmc5633 driver.
> > 
> > Fixes: 6e5f6bf2e3f0 ("iio: magnetometer: Add mmc5633 sensor")
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > ---
> > v2: restore accidentally deleted lines
> > ---
> >   drivers/hwmon/Kconfig            |  6 ++----  
> 
> For hwmon:
> 
> Acked-by: Guenter Roeck <linux@roeck-us.net>
> 
Hi Arnd / All,

I applied a less good fix and the pull request has gone to Greg for
the IIO bug. I copied the hwmon config you have below.

So I'm absolutely in favour of this improvement but it's
probably a case of rebase after rc1 and it goes in next cycle.
Or maybe Greg could pick a rebased version up on top of char-misc-next?

So with it rebased,
Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>


Jonathan

> >   drivers/i3c/Kconfig              | 12 ++++++++++++
> >   drivers/iio/magnetometer/Kconfig |  2 +-
> >   drivers/misc/amd-sbi/Kconfig     |  3 +--
> >   4 files changed, 16 insertions(+), 7 deletions(-)
> > 
> > diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
> > index 41c381764c2b..ecfba861f66d 100644
> > --- a/drivers/hwmon/Kconfig
> > +++ b/drivers/hwmon/Kconfig
> > @@ -1493,8 +1493,7 @@ config SENSORS_LM73
> >   
> >   config SENSORS_LM75
> >   	tristate "National Semiconductor LM75 and compatibles"
> > -	depends on I2C
> > -	depends on I3C || !I3C
> > +	depends on I3C_OR_I2C
> >   	select REGMAP_I2C
> >   	select REGMAP_I3C if I3C
> >   	help
> > @@ -2392,8 +2391,7 @@ config SENSORS_TMP103
> >   
> >   config SENSORS_TMP108
> >   	tristate "Texas Instruments TMP108"
> > -	depends on I2C
> > -	depends on I3C || !I3C
> > +	depends on I3C_OR_I2C
> >   	select REGMAP_I2C
> >   	select REGMAP_I3C if I3C
> >   	help
> > diff --git a/drivers/i3c/Kconfig b/drivers/i3c/Kconfig
> > index 30a441506f61..626c54b386d5 100644
> > --- a/drivers/i3c/Kconfig
> > +++ b/drivers/i3c/Kconfig
> > @@ -22,3 +22,15 @@ menuconfig I3C
> >   if I3C
> >   source "drivers/i3c/master/Kconfig"
> >   endif # I3C
> > +
> > +config I3C_OR_I2C
> > +	tristate
> > +	default m if I3C=m
> > +	default I2C
> > +	help
> > +	  Device drivers using module_i3c_i2c_driver() can use either
> > +	  i2c or i3c hosts, but cannot be built-in for the kernel when
> > +	  CONFIG_I3C=m.
> > +
> > +	  Add 'depends on I2C_OR_I3C' in Kconfig for those drivers to
> > +	  get the correct dependencies.
> > diff --git a/drivers/iio/magnetometer/Kconfig b/drivers/iio/magnetometer/Kconfig
> > index 2b81b22c9550..448fef4e5716 100644
> > --- a/drivers/iio/magnetometer/Kconfig
> > +++ b/drivers/iio/magnetometer/Kconfig
> > @@ -143,7 +143,7 @@ config MMC5633
> >   	tristate "MEMSIC MMC5633 3-axis magnetic sensor"
> >   	select REGMAP_I2C if I2C
> >   	select REGMAP_I3C if I3C
> > -	depends on I2C || I3C
> > +	depends on I3C_OR_I2C
> >   	help
> >   	  Say yes here to build support for the MEMSIC MMC5633 3-axis
> >   	  magnetic sensor.
> > diff --git a/drivers/misc/amd-sbi/Kconfig b/drivers/misc/amd-sbi/Kconfig
> > index be022c71a90c..30e7fad7356c 100644
> > --- a/drivers/misc/amd-sbi/Kconfig
> > +++ b/drivers/misc/amd-sbi/Kconfig
> > @@ -1,10 +1,9 @@
> >   # SPDX-License-Identifier: GPL-2.0-only
> >   config AMD_SBRMI_I2C
> >   	tristate "AMD side band RMI support"
> > -	depends on I2C
> > +	depends on I3C_OR_I2C
> >   	depends on ARM || ARM64 || COMPILE_TEST
> >   	select REGMAP_I2C
> > -	depends on I3C || !I3C
> >   	select REGMAP_I3C if I3C
> >   	help
> >   	  Side band RMI over I2C/I3C support for AMD out of band management.  
>

Re: [PATCH] [v2] i3c, iio: fix i3c driver dependencies

Posted by Alexandre Belloni 2 days, 11 hours ago

On 02/02/2026 20:50:11+0000, Jonathan Cameron wrote:
> On Mon, 2 Feb 2026 09:50:58 -0800
> Guenter Roeck <linux@roeck-us.net> wrote:
> 
> > On 2/2/26 08:04, Arnd Bergmann wrote:
> > > From: Arnd Bergmann <arnd@arndb.de>
> > > 
> > > All combined i2c/i3c drivers appear to suffer from the same link
> > > time problem when CONFIG_I3C is set to 'm':
> > > 
> > > arm-linux-gnueabi-ld: drivers/iio/magnetometer/mmc5633.o: in function `mmc5633_i3c_driver_init':
> > > mmc5633.c:(.init.text+0x30): undefined reference to `i3c_driver_register_with_owner'
> > > 
> > > This was previously fixed several times by marking individual
> > > drivers as 'depends on I2C; depends on I3C || !I3C', but this gets
> > > tedious and is somewhat confusing.
> > > 
> > > Add a Kconfig symbol 'I3C_OR_I2C' to help replace those dependencies,
> > > and use this in all the existing drivers that had already fixed it
> > > as well as the new mmc5633 driver.
> > > 
> > > Fixes: 6e5f6bf2e3f0 ("iio: magnetometer: Add mmc5633 sensor")
> > > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > > ---
> > > v2: restore accidentally deleted lines
> > > ---
> > >   drivers/hwmon/Kconfig            |  6 ++----  
> > 
> > For hwmon:
> > 
> > Acked-by: Guenter Roeck <linux@roeck-us.net>
> > 
> Hi Arnd / All,
> 
> I applied a less good fix and the pull request has gone to Greg for
> the IIO bug. I copied the hwmon config you have below.
> 
> So I'm absolutely in favour of this improvement but it's
> probably a case of rebase after rc1 and it goes in next cycle.
> Or maybe Greg could pick a rebased version up on top of char-misc-next?
> 
> So with it rebased,
> Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>

I guess I can pick this up after rc1.


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [PATCH] [v2] i3c, iio: fix i3c driver dependencies

Posted by Arnd Bergmann 2 days, 10 hours ago

On Wed, Feb 4, 2026, at 17:26, Alexandre Belloni wrote:
> On 02/02/2026 20:50:11+0000, Jonathan Cameron wrote:
>> On Mon, 2 Feb 2026 09:50:58 -0800
>> > 
>> Hi Arnd / All,
>> 
>> I applied a less good fix and the pull request has gone to Greg for
>> the IIO bug. I copied the hwmon config you have below.
>> So I'm absolutely in favour of this improvement but it's
>> probably a case of rebase after rc1 and it goes in next cycle.
>> Or maybe Greg could pick a rebased version up on top of char-misc-next?
>> 
>> So with it rebased,
>> Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>

Sounds good, thanks!


> I guess I can pick this up after rc1.

Ok. I've sent a rebased patch with a slightly adapted changelog
text and Jonathan's R-b.

     Arnd

Re: [PATCH] [v2] i3c, iio: fix i3c driver dependencies

Posted by Frank Li 4 days, 10 hours ago

On Mon, Feb 02, 2026 at 05:04:46PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> All combined i2c/i3c drivers appear to suffer from the same link
> time problem when CONFIG_I3C is set to 'm':
>
> arm-linux-gnueabi-ld: drivers/iio/magnetometer/mmc5633.o: in function `mmc5633_i3c_driver_init':
> mmc5633.c:(.init.text+0x30): undefined reference to `i3c_driver_register_with_owner'
>
> This was previously fixed several times by marking individual
> drivers as 'depends on I2C; depends on I3C || !I3C', but this gets
> tedious and is somewhat confusing.
>
> Add a Kconfig symbol 'I3C_OR_I2C' to help replace those dependencies,
> and use this in all the existing drivers that had already fixed it
> as well as the new mmc5633 driver.
>
> Fixes: 6e5f6bf2e3f0 ("iio: magnetometer: Add mmc5633 sensor")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> v2: restore accidentally deleted lines
> ---
>  drivers/hwmon/Kconfig            |  6 ++----
>  drivers/i3c/Kconfig              | 12 ++++++++++++

Reviewed-by: Frank Li <Frank.Li@nxp.com>
>  drivers/iio/magnetometer/Kconfig |  2 +-
>  drivers/misc/amd-sbi/Kconfig     |  3 +--
>  4 files changed, 16 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
> index 41c381764c2b..ecfba861f66d 100644
> --- a/drivers/hwmon/Kconfig
> +++ b/drivers/hwmon/Kconfig
> @@ -1493,8 +1493,7 @@ config SENSORS_LM73
>
>  config SENSORS_LM75
>  	tristate "National Semiconductor LM75 and compatibles"
> -	depends on I2C
> -	depends on I3C || !I3C
> +	depends on I3C_OR_I2C
>  	select REGMAP_I2C
>  	select REGMAP_I3C if I3C
>  	help
> @@ -2392,8 +2391,7 @@ config SENSORS_TMP103
>
>  config SENSORS_TMP108
>  	tristate "Texas Instruments TMP108"
> -	depends on I2C
> -	depends on I3C || !I3C
> +	depends on I3C_OR_I2C
>  	select REGMAP_I2C
>  	select REGMAP_I3C if I3C
>  	help
> diff --git a/drivers/i3c/Kconfig b/drivers/i3c/Kconfig
> index 30a441506f61..626c54b386d5 100644
> --- a/drivers/i3c/Kconfig
> +++ b/drivers/i3c/Kconfig
> @@ -22,3 +22,15 @@ menuconfig I3C
>  if I3C
>  source "drivers/i3c/master/Kconfig"
>  endif # I3C
> +
> +config I3C_OR_I2C
> +	tristate
> +	default m if I3C=m
> +	default I2C
> +	help
> +	  Device drivers using module_i3c_i2c_driver() can use either
> +	  i2c or i3c hosts, but cannot be built-in for the kernel when
> +	  CONFIG_I3C=m.
> +
> +	  Add 'depends on I2C_OR_I3C' in Kconfig for those drivers to
> +	  get the correct dependencies.
> diff --git a/drivers/iio/magnetometer/Kconfig b/drivers/iio/magnetometer/Kconfig
> index 2b81b22c9550..448fef4e5716 100644
> --- a/drivers/iio/magnetometer/Kconfig
> +++ b/drivers/iio/magnetometer/Kconfig
> @@ -143,7 +143,7 @@ config MMC5633
>  	tristate "MEMSIC MMC5633 3-axis magnetic sensor"
>  	select REGMAP_I2C if I2C
>  	select REGMAP_I3C if I3C
> -	depends on I2C || I3C
> +	depends on I3C_OR_I2C
>  	help
>  	  Say yes here to build support for the MEMSIC MMC5633 3-axis
>  	  magnetic sensor.
> diff --git a/drivers/misc/amd-sbi/Kconfig b/drivers/misc/amd-sbi/Kconfig
> index be022c71a90c..30e7fad7356c 100644
> --- a/drivers/misc/amd-sbi/Kconfig
> +++ b/drivers/misc/amd-sbi/Kconfig
> @@ -1,10 +1,9 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>  config AMD_SBRMI_I2C
>  	tristate "AMD side band RMI support"
> -	depends on I2C
> +	depends on I3C_OR_I2C
>  	depends on ARM || ARM64 || COMPILE_TEST
>  	select REGMAP_I2C
> -	depends on I3C || !I3C
>  	select REGMAP_I3C if I3C
>  	help
>  	  Side band RMI over I2C/I3C support for AMD out of band management.
> --
> 2.39.5
>