Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236124
b: refs/heads/master
c: 0772268
h: refs/heads/master
v: v3
  • Loading branch information
Michael Hennerich authored and Greg Kroah-Hartman committed Feb 23, 2011
1 parent 25d61aa commit 45942e6
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b9618c0cacd7cf56cc3d073c1e9e9a8a3a12864e
refs/heads/master: 0772268aa98fce8a5931f8a39049658465319f3e
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/dac/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ config AD5624R_SPI
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.
Expand Down
12 changes: 12 additions & 0 deletions trunk/drivers/staging/iio/dac/ad5446.c
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,24 @@ static const struct ad5446_chip_info ad5446_chip_info_tbl[] = {
.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,
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/staging/iio/dac/ad5446.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ enum ad5446_supported_device_ids {
ID_AD5444,
ID_AD5446,
ID_AD5542A,
ID_AD5543,
ID_AD5512A,
ID_AD5553,
ID_AD5620_2500,
ID_AD5620_1250,
ID_AD5640_2500,
Expand Down

0 comments on commit 45942e6

Please sign in to comment.