[Linux-kernel-commits] [9682] trunk/drivers/staging/iio/dac: merge from upstream: staging: IIO: DAC: Add support for the AD5543/AD5553

Tue, 01 Mar 2011 13:18:34 -0800

Title: [9682] trunk/drivers/staging/iio/dac: merge from upstream: staging: IIO: DAC: Add support for the AD5543/AD5553
Revision
9682
Author
vapier
Date
2011-03-01 16:18:24 -0500 (Tue, 01 Mar 2011)

Log Message

merge from upstream: staging: IIO: DAC: Add support for the AD5543/AD5553

From: Michael Hennerich <[email protected]>

Add support for the AD5543/AD5553 SPI 16-/14-Bit DACs
Fix typo in kconfig description

Changes since V1:
reorder Kconfig help text

Signed-off-by: Michael Hennerich <[email protected]>
Acked-by: Jonathan Cameron <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Modified Paths

Diff

Modified: trunk/drivers/staging/iio/dac/Kconfig (9681 => 9682)


--- trunk/drivers/staging/iio/dac/Kconfig	2011-03-01 21:18:20 UTC (rev 9681)
+++ trunk/drivers/staging/iio/dac/Kconfig	2011-03-01 21:18:24 UTC (rev 9682)
@@ -11,11 +11,11 @@
 	  AD5664R convertors (DAC). This driver uses the common SPI interface.
 
 config AD5446
-	tristate "Analog Devices AD5444/6, AD5620/40/60 and AD5541A/12A DAC SPI driver"
+	tristate "Analog Devices AD5444/6, AD5620/40/60 and AD5542A/12A DAC SPI driver"
 	depends on SPI
 	help
 	  Say yes here to build support for Analog Devices AD5444, AD5446,
-	  AD5620, AD5640, AD5660 and AD5541A, AD5512A DACs.
+	  AD5512A, AD5542A, AD5543, AD5553, AD5620, AD5640, AD5660 DACs.
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called ad5446.

Modified: trunk/drivers/staging/iio/dac/ad5446.c (9681 => 9682)


--- trunk/drivers/staging/iio/dac/ad5446.c	2011-03-01 21:18:20 UTC (rev 9681)
+++ trunk/drivers/staging/iio/dac/ad5446.c	2011-03-01 21:18:24 UTC (rev 9682)
@@ -132,12 +132,24 @@
 		.left_shift = 0,
 		.store_sample = ad5542_store_sample,
 	},
+	[ID_AD5543] = {
+		.bits = 16,
+		.storagebits = 16,
+		.left_shift = 0,
+		.store_sample = ad5542_store_sample,
+	},
 	[ID_AD5512A] = {
 		.bits = 12,
 		.storagebits = 16,
 		.left_shift = 4,
 		.store_sample = ad5542_store_sample,
 	},
+	[ID_AD5553] = {
+		.bits = 14,
+		.storagebits = 16,
+		.left_shift = 0,
+		.store_sample = ad5542_store_sample,
+	},
 	[ID_AD5620_2500] = {
 		.bits = 12,
 		.storagebits = 16,

Modified: trunk/drivers/staging/iio/dac/ad5446.h (9681 => 9682)


--- trunk/drivers/staging/iio/dac/ad5446.h	2011-03-01 21:18:20 UTC (rev 9681)
+++ trunk/drivers/staging/iio/dac/ad5446.h	2011-03-01 21:18:24 UTC (rev 9682)
@@ -84,7 +84,9 @@
 	ID_AD5444,
 	ID_AD5446,
 	ID_AD5542A,
+	ID_AD5543,
 	ID_AD5512A,
+	ID_AD5553,
 	ID_AD5620_2500,
 	ID_AD5620_1250,
 	ID_AD5640_2500,

_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to