Skip to contentSkip to conversation

iio: dac: Fix build error when CONFIG_SPI_MASTER=y && CONFIG_I2C=m

PATCH Superseded Axel Lin 2 participants 2 messages May 8, 2013 – May 9, 2013 IIO

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH v2 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 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iio/dac/Kconfig +3 -3
index f4a6f08..b61160b 100644
@@ -5,7 +5,7 @@ menu "Digital to analog converters"
 
 config AD5064
 	tristate "Analog Devices AD5064 and similar multi-channel DAC driver"
-	depends on (SPI_MASTER || I2C)
+	depends on (SPI_MASTER && I2C!=m) || I2C
 	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 +27,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 (SPI_MASTER && I2C!=m) || I2C
 	select REGMAP_I2C if I2C
 	select REGMAP_SPI if SPI_MASTER
 	help
@@ -57,7 +57,7 @@ config AD5624R_SPI
 
 config AD5446
 	tristate "Analog Devices AD5446 and similar single channel DACs driver"
-	depends on (SPI_MASTER || I2C)
+	depends on (SPI_MASTER && I2C!=m) || I2C
 	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
#1 lore raw
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 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

Quoted 3 lines

Add config IIO_DAC_I2C_AND_SPI 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.

Looks good except for this comment which I think is now out of date.

Quoted 39 lines
---
  drivers/iio/dac/Kconfig | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iio/dac/Kconfig +3 -3
index f4a6f08..b61160b 100644
@@ -5,7 +5,7 @@ menu "Digital to analog converters"
 
  config AD5064
  	tristate "Analog Devices AD5064 and similar multi-channel DAC driver"
-	depends on (SPI_MASTER || I2C)
+	depends on (SPI_MASTER && I2C!=m) || I2C
  	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 +27,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 (SPI_MASTER && I2C!=m) || I2C
  	select REGMAP_I2C if I2C
  	select REGMAP_SPI if SPI_MASTER
  	help
@@ -57,7 +57,7 @@ config AD5624R_SPI
 
  config AD5446
  	tristate "Analog Devices AD5446 and similar single channel DACs driver"
-	depends on (SPI_MASTER || I2C)
+	depends on (SPI_MASTER && I2C!=m) || I2C
  	help
  	  Say yes here to build support for Analog Devices AD5300, AD5301, AD5310,
  	  AD5311, AD5320, AD5321, AD5444, AD5446, AD5450, AD5451, AD5452, AD5453,