| Message ID | 20230227233318.120415-1-bgray@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/2] i2c: Disable I2C_APPLE when I2C_PASEMI is a builtin | expand |
On Tue, Feb 28, 2023, at 00:33, Benjamin Gray wrote: > The ppc64le_allmodconfig sets I2C_PASEMI=y and leaves COMPILE_TEST to > default to y and I2C_APPLE to default to m, running into a known > incompatible configuration that breaks the build [1]. Specifically, > a common dependency (i2c-pasemi-core.o in this case) cannot be used by > both builtin and module consumers. > > Disable I2C_APPLE when I2C_PASEMI is a builtin to prevent this. > > [1]: https://lore.kernel.org/all/202112061809.XT99aPrf-lkp@intel.com > > Suggested-by: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Benjamin Gray <bgray@linux.ibm.com> Looks good to me, Acked-by: Arnd Bergmann <arnd@arndb.de>
On Tue, Feb 28, 2023, at 00:33, Benjamin Gray wrote: > The ppc64le_allmodconfig sets I2C_PASEMI=y and leaves COMPILE_TEST to > default to y and I2C_APPLE to default to m, running into a known > incompatible configuration that breaks the build [1]. Specifically, > a common dependency (i2c-pasemi-core.o in this case) cannot be used by > both builtin and module consumers. > > Disable I2C_APPLE when I2C_PASEMI is a builtin to prevent this. > > [1]: https://lore.kernel.org/all/202112061809.XT99aPrf-lkp@intel.com > > Suggested-by: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Benjamin Gray <bgray@linux.ibm.com> > --- Acked-by: Sven Peter <sven@svenpeter.dev> Best, Sven
On Tue, Feb 28, 2023 at 10:33:17AM +1100, Benjamin Gray wrote: > The ppc64le_allmodconfig sets I2C_PASEMI=y and leaves COMPILE_TEST to > default to y and I2C_APPLE to default to m, running into a known > incompatible configuration that breaks the build [1]. Specifically, > a common dependency (i2c-pasemi-core.o in this case) cannot be used by > both builtin and module consumers. > > Disable I2C_APPLE when I2C_PASEMI is a builtin to prevent this. > > [1]: https://lore.kernel.org/all/202112061809.XT99aPrf-lkp@intel.com > > Suggested-by: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Benjamin Gray <bgray@linux.ibm.com> Applied to for-current, thanks!
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index d4975444a32d..c42109e972fe 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -896,6 +896,7 @@ config I2C_PASEMI config I2C_APPLE tristate "Apple SMBus platform driver" + depends on !I2C_PASEMI depends on ARCH_APPLE || COMPILE_TEST default ARCH_APPLE help
The ppc64le_allmodconfig sets I2C_PASEMI=y and leaves COMPILE_TEST to default to y and I2C_APPLE to default to m, running into a known incompatible configuration that breaks the build [1]. Specifically, a common dependency (i2c-pasemi-core.o in this case) cannot be used by both builtin and module consumers. Disable I2C_APPLE when I2C_PASEMI is a builtin to prevent this. [1]: https://lore.kernel.org/all/202112061809.XT99aPrf-lkp@intel.com Suggested-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Benjamin Gray <bgray@linux.ibm.com> --- v1: https://lore.kernel.org/linux-i2c/20230227035414.1461763-1-bgray@linux.ibm.com/ --- drivers/i2c/busses/Kconfig | 1 + 1 file changed, 1 insertion(+) base-commit: ec0a1b360aec1ba0bdfad3dd69e300b028529c0d