iio: dac: Fix build error when CONFIG_SPI_MASTER=y && CONFIG_I2C=m
RFC PATCH 1/1 iio: dac: Fix build error when CONFIG_SPI_MASTER=y && CONFIG_I2C=m
This patch fixes below build error when CONFIG_SPI_MASTER=y && CONFIG_I2C=m:
drivers/built-in.o: In function `ad5064_i2c_write':drivers/iio/dac/ad5064.c:608: undefined reference to i2c_master_send' drivers/built-in.o: In function ad5064_i2c_register_driver':drivers/iio/dac/ad5064.c:646: undefined reference to i2c_register_driver' drivers/built-in.o: In function ad5064_i2c_unregister_driver':drivers/iio/dac/ad5064.c:651: undefined reference to `i2c_del_driver'
make: *** [vmlinux] Error 1
Add config IIO_DAC_I2C_AND_SPI helper to handle such case:
When CONFIG_I2C=m, meaning we can't build the drivers in with I2C support. Thus don't allow the drivers to be compiled as built-in.
--- drivers/iio/dac/Kconfig | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/iio/dac/Kconfig +14 -3
@@ -1,11 +1,22 @@ # # DAC drivers # + +# Helper to resolve issues with configs that have SPI enabled but I2C +# modular, meaning we can't build the drivers in with I2C support. +# We use an ordered list of conditional defaults to pick the appropriate +# setting - SPI can't be modular so that case doesn't need to be covered. +config IIO_DAC_I2C_AND_SPI + tristate + default m if I2C=m + default y if I2C=y + default y if SPI_MASTER=y + menu "Digital to analog converters" config AD5064 tristate "Analog Devices AD5064 and similar multi-channel DAC driver" - depends on (SPI_MASTER || I2C) + depends on IIO_DAC_I2C_AND_SPI help Say yes here to build support for Analog Devices AD5024, AD5025, AD5044, AD5045, AD5064, AD5064-1, AD5065, AD5628, AD5629R, AD5648, AD5666, AD5668,
@@ -27,7 +38,7 @@ config AD5360 config AD5380 tristate "Analog Devices AD5380/81/82/83/84/90/91/92 DAC driver" - depends on (SPI_MASTER || I2C) + depends on IIO_DAC_I2C_AND_SPI select REGMAP_I2C if I2C select REGMAP_SPI if SPI_MASTER help
@@ -57,7 +68,7 @@ config AD5624R_SPI config AD5446 tristate "Analog Devices AD5446 and similar single channel DACs driver" - depends on (SPI_MASTER || I2C) + depends on IIO_DAC_I2C_AND_SPI help Say yes here to build support for Analog Devices AD5300, AD5301, AD5310, AD5311, AD5320, AD5321, AD5444, AD5446, AD5450, AD5451, AD5452, AD5453,
Signature · 1 line
1.8.1.2
Quoted 10 lines · Axel Lin
This patch fixes below build error when
CONFIG_SPI_MASTER=y&&CONFIG_I2C=m:
drivers/built-in.o: In function `ad5064_i2c_write':drivers/iio/dac/ad5064.c:608: undefined reference toi2c_master_send' drivers/built-in.o: In functionad5064_i2c_register_driver':drivers/iio/dac/ad5064.c:646: undefined reference toi2c_register_driver' drivers/built-in.o: In functionad5064_i2c_unregister_driver':drivers/iio/dac/ad5064.c:651: undefined reference to `i2c_del_driver'
make: *** [vmlinux] Error 1
Quoted 4 lines
Add config
IIO_DAC_I2C_AND_SPIhelper to handle such case:
WhenCONFIG_I2C=m, meaning we can't build the drivers in with I2C support. Thus don't allow the drivers to be compiled as built-in.
My plan was to do something like "depends on (SPI_MASTER && I2C!=m) || I2C", but if this works as well I'm fine with it. The real fix though is to break the driver apart into a SPI part, an I2S part and a common part. But that's something for 3.11 while this is something for 3.10/stable.
Quoted 51 lines
Signed-off-by Axel Lin <[email protected]>--- drivers/iio/dac/Kconfig | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)drivers/iio/dac/Kconfig +14
-3@@ -1,11 +1,22 @@ # # DAC drivers # + +# Helper to resolve issues with configs that have SPI enabled but I2C +# modular, meaning we can't build the drivers in with I2C support. +# We use an ordered list of conditional defaults to pick the appropriate +# setting - SPI can't be modular so that case doesn't need to be covered. +config IIO_DAC_I2C_AND_SPI + tristate + default m if I2C=m + default y if I2C=y + default y if SPI_MASTER=y + menu "Digital to analog converters" config AD5064 tristate "Analog Devices AD5064 and similar multi-channel DAC driver" - depends on (SPI_MASTER || I2C) + depends on IIO_DAC_I2C_AND_SPI help Say yes here to build support for Analog Devices AD5024, AD5025, AD5044, AD5045, AD5064, AD5064-1, AD5065, AD5628, AD5629R, AD5648, AD5666, AD5668,@@ -27,7 +38,7 @@ config AD5360 config AD5380 tristate "Analog Devices AD5380/81/82/83/84/90/91/92 DAC driver" - depends on (SPI_MASTER || I2C) + depends on IIO_DAC_I2C_AND_SPI select REGMAP_I2C if I2C select REGMAP_SPI if SPI_MASTER help@@ -57,7 +68,7 @@ config AD5624R_SPI config AD5446 tristate "Analog Devices AD5446 and similar single channel DACs driver" - depends on (SPI_MASTER || I2C) + depends on IIO_DAC_I2C_AND_SPI help Say yes here to build support for Analog Devices AD5300, AD5301, AD5310, AD5311, AD5320, AD5321, AD5444, AD5446, AD5450, AD5451, AD5452, AD5453,
於 三,2013-05-08 於 16:36 +0800,Axel Lin 提到:
Quoted 10 lines
This patch fixes below build error when
CONFIG_SPI_MASTER=y&&CONFIG_I2C=m:
drivers/built-in.o: In function `ad5064_i2c_write':drivers/iio/dac/ad5064.c:608: undefined reference toi2c_master_send' drivers/built-in.o: In functionad5064_i2c_register_driver':drivers/iio/dac/ad5064.c:646: undefined reference toi2c_register_driver' drivers/built-in.o: In functionad5064_i2c_unregister_driver':drivers/iio/dac/ad5064.c:651: undefined reference to `i2c_del_driver'
make: *** [vmlinux] Error 1
Quoted 5 lines
Add config
IIO_DAC_I2C_AND_SPIhelper to handle such case:
WhenCONFIG_I2C=m, meaning we can't build the drivers in with I2C support. Thus don't allow the drivers to be compiled as built-in.Signed-off-by Axel Lin <[email protected]>
I should add
And also Cc Fengguang now.
I look into this issue because it is reported by Fengguang's kbuild test robot.
Quoted 50 lines
--- drivers/iio/dac/Kconfig | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)drivers/iio/dac/Kconfig +14
-3@@ -1,11 +1,22 @@ # # DAC drivers # + +# Helper to resolve issues with configs that have SPI enabled but I2C +# modular, meaning we can't build the drivers in with I2C support. +# We use an ordered list of conditional defaults to pick the appropriate +# setting - SPI can't be modular so that case doesn't need to be covered. +config IIO_DAC_I2C_AND_SPI + tristate + default m if I2C=m + default y if I2C=y + default y if SPI_MASTER=y + menu "Digital to analog converters" config AD5064 tristate "Analog Devices AD5064 and similar multi-channel DAC driver" - depends on (SPI_MASTER || I2C) + depends on IIO_DAC_I2C_AND_SPI help Say yes here to build support for Analog Devices AD5024, AD5025, AD5044, AD5045, AD5064, AD5064-1, AD5065, AD5628, AD5629R, AD5648, AD5666, AD5668,@@ -27,7 +38,7 @@ config AD5360 config AD5380 tristate "Analog Devices AD5380/81/82/83/84/90/91/92 DAC driver" - depends on (SPI_MASTER || I2C) + depends on IIO_DAC_I2C_AND_SPI select REGMAP_I2C if I2C select REGMAP_SPI if SPI_MASTER help@@ -57,7 +68,7 @@ config AD5624R_SPI config AD5446 tristate "Analog Devices AD5446 and similar single channel DACs driver" - depends on (SPI_MASTER || I2C) + depends on IIO_DAC_I2C_AND_SPI help Say yes here to build support for Analog Devices AD5300, AD5301, AD5310, AD5311, AD5320, AD5321, AD5444, AD5446, AD5450, AD5451, AD5452, AD5453,
2013/5/8 Lars-Peter Clausen <[email protected]>:
Quoted 11 lines · Axel Lin
Quoted 10 lines
This patch fixes below build error when
CONFIG_SPI_MASTER=y&&CONFIG_I2C=m:
drivers/built-in.o: In function `ad5064_i2c_write':drivers/iio/dac/ad5064.c:608: undefined reference toi2c_master_send' drivers/built-in.o: In functionad5064_i2c_register_driver':drivers/iio/dac/ad5064.c:646: undefined reference toi2c_register_driver' drivers/built-in.o: In functionad5064_i2c_unregister_driver':drivers/iio/dac/ad5064.c:651: undefined reference to `i2c_del_driver'
make: *** [vmlinux] Error 1
Quoted 6 lines
Quoted 4 lines
Add config
IIO_DAC_I2C_AND_SPIhelper to handle such case:
WhenCONFIG_I2C=m, meaning we can't build the drivers in with I2C support. Thus don't allow the drivers to be compiled as built-in.My plan was to do something like "depends on (
SPI_MASTER&& I2C!=m) || I2C",
This change seems simpler than this path.
Thus I'm going to send v2 for it.
Thanks,
Axel