Diff
Modified: trunk/drivers/staging/iio/addac/Kconfig (8676 => 8677)
--- trunk/drivers/staging/iio/addac/Kconfig 2010-04-29 06:08:54 UTC (rev 8676)
+++ trunk/drivers/staging/iio/addac/Kconfig 2010-04-29 06:20:48 UTC (rev 8677)
@@ -4,23 +4,23 @@
comment "Analog digital bi-direction convertors"
config ADT7316
- tristate "Analog Devices ADT7316/7/8 ADT7516/7/8 temperature sensor, ADC and DAC driver"
+ tristate "Analog Devices ADT7316/7/8 ADT7516/7/9 temperature sensor, ADC and DAC driver"
depends on SPI
help
Say yes here to build support for Analog Devices ADT7316/7/8
- and ADT7516/7/8 temperature sensors, ADC and DAC.
+ and ADT7516/7/9 temperature sensors, ADC and DAC.
config ADT7316_SPI
- tristate "Analog Devices ADT7316/7/8 ADT7516/7/8 SPI bus driver"
+ tristate "Analog Devices ADT7316/7/8 ADT7516/7/9 SPI bus driver"
depends on SPI && ADT7316
default y
help
Say yes here to build SPI bus support for Analog Devices ADT7316/7/8
- and ADT7516/7/8.
+ and ADT7516/7/9.
config ADT7316_I2C
- tristate "Analog Devices ADT7316/7/8 ADT7516/7/8 I2C bus driver"
+ tristate "Analog Devices ADT7316/7/8 ADT7516/7/9 I2C bus driver"
depends on I2C && ADT7316
help
Say yes here to build I2C bus support for Analog Devices ADT7316/7/8
- and ADT7516/7/8.
+ and ADT7516/7/9.
Modified: trunk/drivers/staging/iio/addac/Makefile (8676 => 8677)
--- trunk/drivers/staging/iio/addac/Makefile 2010-04-29 06:08:54 UTC (rev 8676)
+++ trunk/drivers/staging/iio/addac/Makefile 2010-04-29 06:20:48 UTC (rev 8677)
@@ -1,5 +1,5 @@
-# Makefile for industrial I/O ADC drivers
+# Makefile for industrial I/O ADDAC drivers
#
obj-$(CONFIG_ADT7316) += adt7316.o
Modified: trunk/drivers/staging/iio/addac/adt7316-i2c.c (8676 => 8677)
--- trunk/drivers/staging/iio/addac/adt7316-i2c.c 2010-04-29 06:08:54 UTC (rev 8676)
+++ trunk/drivers/staging/iio/addac/adt7316-i2c.c 2010-04-29 06:20:48 UTC (rev 8677)
@@ -1,5 +1,5 @@
/*
- * I2C bus driver for ADT7316/7/8 ADT7516/7/8 digital temperature
+ * I2C bus driver for ADT7316/7/8 ADT7516/7/9 digital temperature
* sensor, ADC and DAC
*
* Copyright 2010 Analog Devices Inc.
@@ -117,7 +117,7 @@
{ "adt7318", 0 },
{ "adt7516", 0 },
{ "adt7517", 0 },
- { "adt7518", 0 },
+ { "adt7519", 0 },
{ }
};
@@ -161,7 +161,7 @@
}
MODULE_AUTHOR("Sonic Zhang <[email protected]>");
-MODULE_DESCRIPTION("I2C bus driver for Analog Devices ADT7316/7/8 and"
+MODULE_DESCRIPTION("I2C bus driver for Analog Devices ADT7316/7/9 and"
"ADT7516/7/8 digital temperature sensor, ADC and DAC");
MODULE_LICENSE("GPL v2");
Modified: trunk/drivers/staging/iio/addac/adt7316-spi.c (8676 => 8677)
--- trunk/drivers/staging/iio/addac/adt7316-spi.c 2010-04-29 06:08:54 UTC (rev 8676)
+++ trunk/drivers/staging/iio/addac/adt7316-spi.c 2010-04-29 06:20:48 UTC (rev 8677)
@@ -1,5 +1,5 @@
/*
- * API bus driver for ADT7316/7/8 ADT7516/7/8 digital temperature
+ * API bus driver for ADT7316/7/8 ADT7516/7/9 digital temperature
* sensor, ADC and DAC
*
* Copyright 2010 Analog Devices Inc.
@@ -126,7 +126,7 @@
{ "adt7318", 0 },
{ "adt7516", 0 },
{ "adt7517", 0 },
- { "adt7518", 0 },
+ { "adt7519", 0 },
{ }
};
@@ -172,7 +172,7 @@
MODULE_AUTHOR("Sonic Zhang <[email protected]>");
MODULE_DESCRIPTION("SPI bus driver for Analog Devices ADT7316/7/8 and"
- "ADT7516/7/8 digital temperature sensor, ADC and DAC");
+ "ADT7516/7/9 digital temperature sensor, ADC and DAC");
MODULE_LICENSE("GPL v2");
module_init(adt7316_spi_init);
Modified: trunk/drivers/staging/iio/addac/adt7316.c (8676 => 8677)
--- trunk/drivers/staging/iio/addac/adt7316.c 2010-04-29 06:08:54 UTC (rev 8676)
+++ trunk/drivers/staging/iio/addac/adt7316.c 2010-04-29 06:20:48 UTC (rev 8677)
@@ -1,5 +1,5 @@
/*
- * ADT7316 digital temperature sensor driver supporting ADT7316/7/8 ADT7516/7/8
+ * ADT7316 digital temperature sensor driver supporting ADT7316/7/8 ADT7516/7/9
*
*
* Copyright 2010 Analog Devices Inc.
@@ -162,7 +162,7 @@
#define ID_ADT7318 0x3
#define ID_ADT7516 0x11
#define ID_ADT7517 0x12
-#define ID_ADT7518 0x13
+#define ID_ADT7519 0x14
#define ID_FAMILY_MASK 0xF0
#define ID_ADT73XX 0x0
@@ -661,9 +661,9 @@
struct adt7316_chip_info *chip = dev_info->dev_data;
if (chip->config3 & ADT7316_DA_HIGH_RESOLUTION) {
- if (chip->id == ID_ADT7316)
+ if (chip->id == ID_ADT7316 || chip->id == ID_ADT7516)
return sprintf(buf, "1 (12 bits)\n");
- else if (chip->id == ID_ADT7317)
+ else if (chip->id == ID_ADT7317 || chip->id == ID_ADT7517)
return sprintf(buf, "1 (10 bits)\n");
}
@@ -684,9 +684,9 @@
if (!memcmp(buf, "1", 1)) {
config3 = chip->config3 | ADT7316_DA_HIGH_RESOLUTION;
- if (chip->id == ID_ADT7316)
+ if (chip->id == ID_ADT7316 || chip->id == ID_ADT7516)
chip->dac_bits = 12;
- else if (chip->id == ID_ADT7317)
+ else if (chip->id == ID_ADT7317 || chip->id == ID_ADT7517)
chip->dac_bits = 10;
} else
config3 = chip->config3 & (~ADT7316_DA_HIGH_RESOLUTION);
@@ -2401,6 +2401,6 @@
EXPORT_SYMBOL(adt7316_remove);
MODULE_AUTHOR("Sonic Zhang <[email protected]>");
-MODULE_DESCRIPTION("Analog Devices ADT7316/7/8 and ADT7516/7/8 digital"
+MODULE_DESCRIPTION("Analog Devices ADT7316/7/8 and ADT7516/7/9 digital"
" temperature sensor, ADC and DAC driver");
MODULE_LICENSE("GPL v2");
Modified: trunk/drivers/staging/iio/addac/adt7316.h (8676 => 8677)
--- trunk/drivers/staging/iio/addac/adt7316.h 2010-04-29 06:08:54 UTC (rev 8676)
+++ trunk/drivers/staging/iio/addac/adt7316.h 2010-04-29 06:20:48 UTC (rev 8677)
@@ -1,5 +1,5 @@
/*
- * ADT7316 digital temperature sensor driver supporting ADT7316/7/8 ADT7516/7/8
+ * ADT7316 digital temperature sensor driver supporting ADT7316/7/8 ADT7516/7/9
*
* Copyright 2010 Analog Devices Inc.
*
