Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 268587
b: refs/heads/master
c: dcacccc
h: refs/heads/master
i:
  268585: 93a49a3
  268583: 596e425
v: v3
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Oct 3, 2011
1 parent 3be2bf7 commit 728b914
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 630081fdc94fb71394fc21d6c60772cbb52d04ea
refs/heads/master: dcacccc54f96aa0863640c90d554f913e438911a
40 changes: 20 additions & 20 deletions trunk/drivers/staging/iio/adc/ad799x_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,16 +506,16 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
[ad7995] = {
.channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
0, 0, IIO_ST('u', 10, 16, 0), 0),
0, 0, IIO_ST('u', 10, 16, 2), 0),
.channel[1] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
1, 1, IIO_ST('u', 10, 16, 0), 0),
1, 1, IIO_ST('u', 10, 16, 2), 0),
.channel[2] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 2, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
2, 2, IIO_ST('u', 10, 16, 0), 0),
2, 2, IIO_ST('u', 10, 16, 2), 0),
.channel[3] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 3, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
3, 3, IIO_ST('u', 10, 16, 0), 0),
3, 3, IIO_ST('u', 10, 16, 2), 0),
.channel[4] = IIO_CHAN_SOFT_TIMESTAMP(4),
.num_channels = 5,
.int_vref_mv = 1024,
Expand All @@ -524,16 +524,16 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
[ad7999] = {
.channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
0, 0, IIO_ST('u', 10, 16, 0), 0),
0, 0, IIO_ST('u', 8, 16, 4), 0),
.channel[1] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
1, 1, IIO_ST('u', 10, 16, 0), 0),
1, 1, IIO_ST('u', 8, 16, 4), 0),
.channel[2] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 2, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
2, 2, IIO_ST('u', 10, 16, 0), 0),
2, 2, IIO_ST('u', 8, 16, 4), 0),
.channel[3] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 3, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
3, 3, IIO_ST('u', 10, 16, 0), 0),
3, 3, IIO_ST('u', 8, 16, 4), 0),
.channel[4] = IIO_CHAN_SOFT_TIMESTAMP(4),
.num_channels = 5,
.int_vref_mv = 1024,
Expand All @@ -555,16 +555,16 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
[ad7993] = {
.channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
0, 0, IIO_ST('u', 10, 16, 0), 0),
0, 0, IIO_ST('u', 10, 16, 2), 0),
.channel[1] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
1, 1, IIO_ST('u', 10, 16, 0), 0),
1, 1, IIO_ST('u', 10, 16, 2), 0),
.channel[2] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 2, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
2, 2, IIO_ST('u', 10, 16, 0), 0),
2, 2, IIO_ST('u', 10, 16, 2), 0),
.channel[3] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 3, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
3, 3, IIO_ST('u', 10, 16, 0), 0),
3, 3, IIO_ST('u', 10, 16, 2), 0),
.channel[4] = IIO_CHAN_SOFT_TIMESTAMP(4),
.num_channels = 5,
.int_vref_mv = 1024,
Expand Down Expand Up @@ -593,28 +593,28 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {
[ad7997] = {
.channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
0, 0, IIO_ST('u', 10, 16, 0), 0),
0, 0, IIO_ST('u', 10, 16, 2), 0),
.channel[1] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
1, 1, IIO_ST('u', 10, 16, 0), 0),
1, 1, IIO_ST('u', 10, 16, 2), 0),
.channel[2] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 2, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
2, 2, IIO_ST('u', 10, 16, 0), 0),
2, 2, IIO_ST('u', 10, 16, 2), 0),
.channel[3] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 3, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
3, 3, IIO_ST('u', 10, 16, 0), 0),
3, 3, IIO_ST('u', 10, 16, 2), 0),
.channel[4] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 4, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
4, 4, IIO_ST('u', 10, 16, 0), 0),
4, 4, IIO_ST('u', 10, 16, 2), 0),
.channel[5] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 5, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
5, 5, IIO_ST('u', 10, 16, 0), 0),
5, 5, IIO_ST('u', 10, 16, 2), 0),
.channel[6] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 6, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
6, 6, IIO_ST('u', 10, 16, 0), 0),
6, 6, IIO_ST('u', 10, 16, 2), 0),
.channel[7] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 7, 0,
(1 << IIO_CHAN_INFO_SCALE_SHARED),
7, 7, IIO_ST('u', 10, 16, 0), 0),
7, 7, IIO_ST('u', 10, 16, 2), 0),
.channel[8] = IIO_CHAN_SOFT_TIMESTAMP(8),
.num_channels = 9,
.int_vref_mv = 1024,
Expand Down

0 comments on commit 728b914

Please sign in to comment.