Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228164
b: refs/heads/master
c: 4f76548
h: refs/heads/master
v: v3
  • Loading branch information
Michael Hennerich authored and Greg Kroah-Hartman committed Nov 29, 2010
1 parent 1794f03 commit 4894428
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 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: d846263da4c6032b7a9440d335794ef8d3e76dfb
refs/heads/master: 4f76548299196e0fd880469a39552ccde797474b
10 changes: 0 additions & 10 deletions trunk/drivers/staging/iio/dac/ad5446.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,75 +118,65 @@ static const struct ad5446_chip_info ad5446_chip_info_tbl[] = {
.bits = 12,
.storagebits = 16,
.left_shift = 2,
.sign = 'u', /* IIO_SCAN_EL_TYPE_UNSIGNED */
.store_sample = ad5446_store_sample,
},
[ID_AD5446] = {
.bits = 14,
.storagebits = 16,
.left_shift = 0,
.sign = 'u', /* IIO_SCAN_EL_TYPE_UNSIGNED */
.store_sample = ad5446_store_sample,
},
[ID_AD5542A] = {
.bits = 16,
.storagebits = 16,
.left_shift = 0,
.sign = 'u', /* IIO_SCAN_EL_TYPE_UNSIGNED */
.store_sample = ad5542_store_sample,
},
[ID_AD5512A] = {
.bits = 12,
.storagebits = 16,
.left_shift = 4,
.sign = 'u', /* IIO_SCAN_EL_TYPE_UNSIGNED */
.store_sample = ad5542_store_sample,
},
[ID_AD5620_2500] = {
.bits = 12,
.storagebits = 16,
.left_shift = 2,
.sign = 'u', /* IIO_SCAN_EL_TYPE_UNSIGNED */
.int_vref_mv = 2500,
.store_sample = ad5620_store_sample,
},
[ID_AD5620_1250] = {
.bits = 12,
.storagebits = 16,
.left_shift = 2,
.sign = 'u', /* IIO_SCAN_EL_TYPE_UNSIGNED */
.int_vref_mv = 1250,
.store_sample = ad5620_store_sample,
},
[ID_AD5640_2500] = {
.bits = 14,
.storagebits = 16,
.left_shift = 0,
.sign = 'u', /* IIO_SCAN_EL_TYPE_UNSIGNED */
.int_vref_mv = 2500,
.store_sample = ad5620_store_sample,
},
[ID_AD5640_1250] = {
.bits = 14,
.storagebits = 16,
.left_shift = 0,
.sign = 'u', /* IIO_SCAN_EL_TYPE_UNSIGNED */
.int_vref_mv = 1250,
.store_sample = ad5620_store_sample,
},
[ID_AD5660_2500] = {
.bits = 16,
.storagebits = 24,
.left_shift = 0,
.sign = 'u', /* IIO_SCAN_EL_TYPE_UNSIGNED */
.int_vref_mv = 2500,
.store_sample = ad5660_store_sample,
},
[ID_AD5660_1250] = {
.bits = 16,
.storagebits = 24,
.left_shift = 0,
.sign = 'u', /* IIO_SCAN_EL_TYPE_UNSIGNED */
.int_vref_mv = 1250,
.store_sample = ad5660_store_sample,
},
Expand Down
6 changes: 2 additions & 4 deletions trunk/drivers/staging/iio/dac/ad5446.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,18 @@ struct ad5446_state {
};

/**
* struct ad5446_chip_info - chip specifc information
* struct ad5446_chip_info - chip specific information
* @bits: accuracy of the DAC in bits
* @storagebits: number of bits written to the DAC
* @left_shift: number of bits the datum must be shifted
* @sign: data representation [s]igned or [u]nsigned
* @int_vref_mv: AD5620/40/60: the internal reference voltage
* @store_sample: chip specifc helper function to store the datum
* @store_sample: chip specific helper function to store the datum
*/

struct ad5446_chip_info {
u8 bits;
u8 storagebits;
u8 left_shift;
char sign;
u16 int_vref_mv;
void (*store_sample) (struct ad5446_state *st, unsigned val);
};
Expand Down

0 comments on commit 4894428

Please sign in to comment.