Re: [PATCH] [v3, apply after -rc1] i3c: simplify combined i3c/i2c dependencies

Guenter Roeck
2026-02-04T18:15:58Z

On 2/4/26 08:41, 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 every time 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")
> Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

For hwmon:

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

> ---
> v2: restore accidentally deleted lines
> v3: rebase on top of Jonathan's IIO patch in linux-next
> ---
> drivers/hwmon/Kconfig | 6 ++----
> drivers/i3c/Kconfig | 12 ++++++++++++
> drivers/iio/magnetometer/Kconfig | 3 +--
> drivers/misc/amd-sbi/Kconfig | 3 +--
> 4 files changed, 16 insertions(+), 8 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 9345fb6d5317..fb313e591e85 100644
> --- a/drivers/iio/magnetometer/Kconfig
> +++ b/drivers/iio/magnetometer/Kconfig
> @@ -143,8 +143,7 @@ config MMC5633
> tristate "MEMSIC MMC5633 3-axis magnetic sensor"
> select REGMAP_I2C
> select REGMAP_I3C if I3C
> - depends on I2C
> - depends on I3C || !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.