Diff
Modified: trunk/arch/blackfin/mach-bf537/boards/stamp.c (8276 => 8277)
--- trunk/arch/blackfin/mach-bf537/boards/stamp.c 2010-02-04 14:41:39 UTC (rev 8276)
+++ trunk/arch/blackfin/mach-bf537/boards/stamp.c 2010-02-08 10:35:17 UTC (rev 8277)
@@ -1680,17 +1680,23 @@
#if defined(CONFIG_AD7150) || defined(CONFIG_AD7150_MODULE)
{
- I2C_BOARD_INFO("ad7150", 0x90),
+ I2C_BOARD_INFO("ad7150", 0x48),
.irq = IRQ_PG5, /* fixme: use real interrupt number */
},
#endif
#if defined(CONFIG_AD7152) || defined(CONFIG_AD7152_MODULE)
{
- I2C_BOARD_INFO("ad7152", 0x90),
+ I2C_BOARD_INFO("ad7152", 0x48),
},
#endif
+#if defined(CONFIG_AD774X) || defined(CONFIG_AD774X_MODULE)
+ {
+ I2C_BOARD_INFO("ad774x", 0x48),
+ },
+#endif
+
#if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE)
{
I2C_BOARD_INFO("pcf8574_lcd", 0x22),
Modified: trunk/drivers/staging/iio/adc/Kconfig (8276 => 8277)
--- trunk/drivers/staging/iio/adc/Kconfig 2010-02-04 14:41:39 UTC (rev 8276)
+++ trunk/drivers/staging/iio/adc/Kconfig 2010-02-08 10:35:17 UTC (rev 8277)
@@ -25,3 +25,10 @@
help
Say yes here to build support for Analog Devices capacitive sensors.
(ad7152, ad7153) Provides direct access via sysfs.
+
+config AD774X
+ tristate "Analog Devices ad7745/6/7 capacitive sensor driver"
+ depends on I2C
+ help
+ Say yes here to build support for Analog Devices capacitive sensors.
+ (ad7745, ad7746, ad7747) Provides direct access via sysfs.
Modified: trunk/drivers/staging/iio/adc/Makefile (8276 => 8277)
--- trunk/drivers/staging/iio/adc/Makefile 2010-02-04 14:41:39 UTC (rev 8276)
+++ trunk/drivers/staging/iio/adc/Makefile 2010-02-08 10:35:17 UTC (rev 8277)
@@ -8,3 +8,4 @@
obj-$(CONFIG_MAX1363) += max1363.o
obj-$(CONFIG_AD7150) += ad7150.o
obj-$(CONFIG_AD7152) += ad7152.o
+obj-$(CONFIG_AD774X) += ad774x.o
Modified: trunk/drivers/staging/iio/adc/ad7152.c (8276 => 8277)
--- trunk/drivers/staging/iio/adc/ad7152.c 2010-02-04 14:41:39 UTC (rev 8276)
+++ trunk/drivers/staging/iio/adc/ad7152.c 2010-02-08 10:35:17 UTC (rev 8277)
@@ -71,7 +71,7 @@
struct ad7152_conversion_mode ad7152_conv_mode_table[AD7152_MAX_CONV_MODE] = {
{ "idle", 0 },
{ "continuous-conversion", 1 },
- { "single conversion", 2 },
+ { "single-conversion", 2 },
{ "power-down", 3 },
{ "offset-calibration", 5 },
{ "gain-calibration", 6 },
