diff options
Diffstat (limited to 'drivers/iio/dac')
-rw-r--r-- | drivers/iio/dac/ad5064.c | 4 | ||||
-rw-r--r-- | drivers/iio/dac/ad5360.c | 10 | ||||
-rw-r--r-- | drivers/iio/dac/ad5380.c | 8 | ||||
-rw-r--r-- | drivers/iio/dac/ad5421.c | 10 | ||||
-rw-r--r-- | drivers/iio/dac/ad5446.c | 4 | ||||
-rw-r--r-- | drivers/iio/dac/ad5449.c | 4 | ||||
-rw-r--r-- | drivers/iio/dac/ad5504.c | 4 | ||||
-rw-r--r-- | drivers/iio/dac/ad5624r_spi.c | 4 | ||||
-rw-r--r-- | drivers/iio/dac/ad5686.c | 6 | ||||
-rw-r--r-- | drivers/iio/dac/ad5755.c | 10 | ||||
-rw-r--r-- | drivers/iio/dac/ad5764.c | 10 | ||||
-rw-r--r-- | drivers/iio/dac/ad5791.c | 6 | ||||
-rw-r--r-- | drivers/iio/dac/max517.c | 4 | ||||
-rw-r--r-- | drivers/iio/dac/mcp4725.c | 4 |
14 files changed, 44 insertions, 44 deletions
diff --git a/drivers/iio/dac/ad5064.c b/drivers/iio/dac/ad5064.c index 74f2d52795f6..aa26d50ab638 100644 --- a/drivers/iio/dac/ad5064.c +++ b/drivers/iio/dac/ad5064.c | |||
@@ -296,8 +296,8 @@ static const struct iio_chan_spec_ext_info ad5064_ext_info[] = { | |||
296 | .indexed = 1, \ | 296 | .indexed = 1, \ |
297 | .output = 1, \ | 297 | .output = 1, \ |
298 | .channel = (chan), \ | 298 | .channel = (chan), \ |
299 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ | 299 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ |
300 | IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \ | 300 | BIT(IIO_CHAN_INFO_SCALE), \ |
301 | .address = addr, \ | 301 | .address = addr, \ |
302 | .scan_type = IIO_ST('u', (bits), 16, 20 - (bits)), \ | 302 | .scan_type = IIO_ST('u', (bits), 16, 20 - (bits)), \ |
303 | .ext_info = ad5064_ext_info, \ | 303 | .ext_info = ad5064_ext_info, \ |
diff --git a/drivers/iio/dac/ad5360.c b/drivers/iio/dac/ad5360.c index 92771217f665..80923af424f2 100644 --- a/drivers/iio/dac/ad5360.c +++ b/drivers/iio/dac/ad5360.c | |||
@@ -102,11 +102,11 @@ enum ad5360_type { | |||
102 | .type = IIO_VOLTAGE, \ | 102 | .type = IIO_VOLTAGE, \ |
103 | .indexed = 1, \ | 103 | .indexed = 1, \ |
104 | .output = 1, \ | 104 | .output = 1, \ |
105 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ | 105 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ |
106 | IIO_CHAN_INFO_SCALE_SEPARATE_BIT | \ | 106 | BIT(IIO_CHAN_INFO_SCALE) | \ |
107 | IIO_CHAN_INFO_OFFSET_SEPARATE_BIT | \ | 107 | BIT(IIO_CHAN_INFO_OFFSET) | \ |
108 | IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT | \ | 108 | BIT(IIO_CHAN_INFO_CALIBSCALE) | \ |
109 | IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, \ | 109 | BIT(IIO_CHAN_INFO_CALIBBIAS), \ |
110 | .scan_type = IIO_ST('u', (bits), 16, 16 - (bits)) \ | 110 | .scan_type = IIO_ST('u', (bits), 16, 16 - (bits)) \ |
111 | } | 111 | } |
112 | 112 | ||
diff --git a/drivers/iio/dac/ad5380.c b/drivers/iio/dac/ad5380.c index 483fc379a2da..bf2db02215c2 100644 --- a/drivers/iio/dac/ad5380.c +++ b/drivers/iio/dac/ad5380.c | |||
@@ -257,10 +257,10 @@ static struct iio_chan_spec_ext_info ad5380_ext_info[] = { | |||
257 | .type = IIO_VOLTAGE, \ | 257 | .type = IIO_VOLTAGE, \ |
258 | .indexed = 1, \ | 258 | .indexed = 1, \ |
259 | .output = 1, \ | 259 | .output = 1, \ |
260 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ | 260 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ |
261 | IIO_CHAN_INFO_SCALE_SHARED_BIT | \ | 261 | BIT(IIO_CHAN_INFO_CALIBSCALE) | \ |
262 | IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT | \ | 262 | BIT(IIO_CHAN_INFO_CALIBBIAS), \ |
263 | IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, \ | 263 | .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ |
264 | .scan_type = IIO_ST('u', (_bits), 16, 14 - (_bits)), \ | 264 | .scan_type = IIO_ST('u', (_bits), 16, 14 - (_bits)), \ |
265 | .ext_info = ad5380_ext_info, \ | 265 | .ext_info = ad5380_ext_info, \ |
266 | } | 266 | } |
diff --git a/drivers/iio/dac/ad5421.c b/drivers/iio/dac/ad5421.c index 6b86a638dad0..98f24407c3ce 100644 --- a/drivers/iio/dac/ad5421.c +++ b/drivers/iio/dac/ad5421.c | |||
@@ -86,11 +86,11 @@ static const struct iio_chan_spec ad5421_channels[] = { | |||
86 | .indexed = 1, | 86 | .indexed = 1, |
87 | .output = 1, | 87 | .output = 1, |
88 | .channel = 0, | 88 | .channel = 0, |
89 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | | 89 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | |
90 | IIO_CHAN_INFO_SCALE_SHARED_BIT | | 90 | BIT(IIO_CHAN_INFO_CALIBSCALE) | |
91 | IIO_CHAN_INFO_OFFSET_SHARED_BIT | | 91 | BIT(IIO_CHAN_INFO_CALIBBIAS), |
92 | IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT | | 92 | .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | |
93 | IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, | 93 | BIT(IIO_CHAN_INFO_OFFSET), |
94 | .scan_type = IIO_ST('u', 16, 16, 0), | 94 | .scan_type = IIO_ST('u', 16, 16, 0), |
95 | .event_mask = IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) | | 95 | .event_mask = IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) | |
96 | IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING), | 96 | IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING), |
diff --git a/drivers/iio/dac/ad5446.c b/drivers/iio/dac/ad5446.c index f5583aedfb59..cae8f6056ac3 100644 --- a/drivers/iio/dac/ad5446.c +++ b/drivers/iio/dac/ad5446.c | |||
@@ -143,8 +143,8 @@ static const struct iio_chan_spec_ext_info ad5446_ext_info_powerdown[] = { | |||
143 | .indexed = 1, \ | 143 | .indexed = 1, \ |
144 | .output = 1, \ | 144 | .output = 1, \ |
145 | .channel = 0, \ | 145 | .channel = 0, \ |
146 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ | 146 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ |
147 | IIO_CHAN_INFO_SCALE_SHARED_BIT, \ | 147 | .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ |
148 | .scan_type = IIO_ST('u', (bits), (storage), (shift)), \ | 148 | .scan_type = IIO_ST('u', (bits), (storage), (shift)), \ |
149 | .ext_info = (ext), \ | 149 | .ext_info = (ext), \ |
150 | } | 150 | } |
diff --git a/drivers/iio/dac/ad5449.c b/drivers/iio/dac/ad5449.c index c4731b7b577b..ba1c914b0399 100644 --- a/drivers/iio/dac/ad5449.c +++ b/drivers/iio/dac/ad5449.c | |||
@@ -206,8 +206,8 @@ static const struct iio_info ad5449_info = { | |||
206 | .indexed = 1, \ | 206 | .indexed = 1, \ |
207 | .output = 1, \ | 207 | .output = 1, \ |
208 | .channel = (chan), \ | 208 | .channel = (chan), \ |
209 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ | 209 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ |
210 | IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \ | 210 | BIT(IIO_CHAN_INFO_SCALE), \ |
211 | .address = (chan), \ | 211 | .address = (chan), \ |
212 | .scan_type = IIO_ST('u', (bits), 16, 12 - (bits)), \ | 212 | .scan_type = IIO_ST('u', (bits), 16, 12 - (bits)), \ |
213 | } | 213 | } |
diff --git a/drivers/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c index e5e59749f109..139206e84cb7 100644 --- a/drivers/iio/dac/ad5504.c +++ b/drivers/iio/dac/ad5504.c | |||
@@ -259,8 +259,8 @@ static const struct iio_chan_spec_ext_info ad5504_ext_info[] = { | |||
259 | .indexed = 1, \ | 259 | .indexed = 1, \ |
260 | .output = 1, \ | 260 | .output = 1, \ |
261 | .channel = (_chan), \ | 261 | .channel = (_chan), \ |
262 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ | 262 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ |
263 | IIO_CHAN_INFO_SCALE_SHARED_BIT, \ | 263 | .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ |
264 | .address = AD5504_ADDR_DAC(_chan), \ | 264 | .address = AD5504_ADDR_DAC(_chan), \ |
265 | .scan_type = IIO_ST('u', 12, 16, 0), \ | 265 | .scan_type = IIO_ST('u', 12, 16, 0), \ |
266 | .ext_info = ad5504_ext_info, \ | 266 | .ext_info = ad5504_ext_info, \ |
diff --git a/drivers/iio/dac/ad5624r_spi.c b/drivers/iio/dac/ad5624r_spi.c index f6e116627b71..bb298aaff321 100644 --- a/drivers/iio/dac/ad5624r_spi.c +++ b/drivers/iio/dac/ad5624r_spi.c | |||
@@ -174,8 +174,8 @@ static const struct iio_chan_spec_ext_info ad5624r_ext_info[] = { | |||
174 | .indexed = 1, \ | 174 | .indexed = 1, \ |
175 | .output = 1, \ | 175 | .output = 1, \ |
176 | .channel = (_chan), \ | 176 | .channel = (_chan), \ |
177 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ | 177 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ |
178 | IIO_CHAN_INFO_SCALE_SHARED_BIT, \ | 178 | .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ |
179 | .address = (_chan), \ | 179 | .address = (_chan), \ |
180 | .scan_type = IIO_ST('u', (_bits), 16, 16 - (_bits)), \ | 180 | .scan_type = IIO_ST('u', (_bits), 16, 16 - (_bits)), \ |
181 | .ext_info = ad5624r_ext_info, \ | 181 | .ext_info = ad5624r_ext_info, \ |
diff --git a/drivers/iio/dac/ad5686.c b/drivers/iio/dac/ad5686.c index 5e554af21703..06439b1af9b6 100644 --- a/drivers/iio/dac/ad5686.c +++ b/drivers/iio/dac/ad5686.c | |||
@@ -276,9 +276,9 @@ static const struct iio_chan_spec_ext_info ad5686_ext_info[] = { | |||
276 | .indexed = 1, \ | 276 | .indexed = 1, \ |
277 | .output = 1, \ | 277 | .output = 1, \ |
278 | .channel = chan, \ | 278 | .channel = chan, \ |
279 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ | 279 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ |
280 | IIO_CHAN_INFO_SCALE_SHARED_BIT, \ | 280 | .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),\ |
281 | .address = AD5686_ADDR_DAC(chan), \ | 281 | .address = AD5686_ADDR_DAC(chan), \ |
282 | .scan_type = IIO_ST('u', bits, 16, shift), \ | 282 | .scan_type = IIO_ST('u', bits, 16, shift), \ |
283 | .ext_info = ad5686_ext_info, \ | 283 | .ext_info = ad5686_ext_info, \ |
284 | } | 284 | } |
diff --git a/drivers/iio/dac/ad5755.c b/drivers/iio/dac/ad5755.c index 71faabc6b14e..12bb315e55f8 100644 --- a/drivers/iio/dac/ad5755.c +++ b/drivers/iio/dac/ad5755.c | |||
@@ -393,11 +393,11 @@ static const struct iio_chan_spec_ext_info ad5755_ext_info[] = { | |||
393 | #define AD5755_CHANNEL(_bits) { \ | 393 | #define AD5755_CHANNEL(_bits) { \ |
394 | .indexed = 1, \ | 394 | .indexed = 1, \ |
395 | .output = 1, \ | 395 | .output = 1, \ |
396 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ | 396 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ |
397 | IIO_CHAN_INFO_SCALE_SEPARATE_BIT | \ | 397 | BIT(IIO_CHAN_INFO_SCALE) | \ |
398 | IIO_CHAN_INFO_OFFSET_SEPARATE_BIT | \ | 398 | BIT(IIO_CHAN_INFO_OFFSET) | \ |
399 | IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT | \ | 399 | BIT(IIO_CHAN_INFO_CALIBSCALE) | \ |
400 | IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, \ | 400 | BIT(IIO_CHAN_INFO_CALIBBIAS), \ |
401 | .scan_type = IIO_ST('u', (_bits), 16, 16 - (_bits)), \ | 401 | .scan_type = IIO_ST('u', (_bits), 16, 16 - (_bits)), \ |
402 | .ext_info = ad5755_ext_info, \ | 402 | .ext_info = ad5755_ext_info, \ |
403 | } | 403 | } |
diff --git a/drivers/iio/dac/ad5764.c b/drivers/iio/dac/ad5764.c index 5b7acd3a2c77..7a53f7d70dac 100644 --- a/drivers/iio/dac/ad5764.c +++ b/drivers/iio/dac/ad5764.c | |||
@@ -78,11 +78,11 @@ enum ad5764_type { | |||
78 | .output = 1, \ | 78 | .output = 1, \ |
79 | .channel = (_chan), \ | 79 | .channel = (_chan), \ |
80 | .address = (_chan), \ | 80 | .address = (_chan), \ |
81 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ | 81 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ |
82 | IIO_CHAN_INFO_OFFSET_SHARED_BIT | \ | 82 | BIT(IIO_CHAN_INFO_SCALE) | \ |
83 | IIO_CHAN_INFO_SCALE_SEPARATE_BIT | \ | 83 | BIT(IIO_CHAN_INFO_CALIBSCALE) | \ |
84 | IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT | \ | 84 | BIT(IIO_CHAN_INFO_CALIBBIAS), \ |
85 | IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, \ | 85 | .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET), \ |
86 | .scan_type = IIO_ST('u', (_bits), 16, 16 - (_bits)) \ | 86 | .scan_type = IIO_ST('u', (_bits), 16, 16 - (_bits)) \ |
87 | } | 87 | } |
88 | 88 | ||
diff --git a/drivers/iio/dac/ad5791.c b/drivers/iio/dac/ad5791.c index 8dfd3da8a07b..97c1e5d780df 100644 --- a/drivers/iio/dac/ad5791.c +++ b/drivers/iio/dac/ad5791.c | |||
@@ -302,9 +302,9 @@ static const struct iio_chan_spec_ext_info ad5791_ext_info[] = { | |||
302 | .indexed = 1, \ | 302 | .indexed = 1, \ |
303 | .address = AD5791_ADDR_DAC0, \ | 303 | .address = AD5791_ADDR_DAC0, \ |
304 | .channel = 0, \ | 304 | .channel = 0, \ |
305 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ | 305 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ |
306 | IIO_CHAN_INFO_SCALE_SHARED_BIT | \ | 306 | .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | \ |
307 | IIO_CHAN_INFO_OFFSET_SHARED_BIT, \ | 307 | BIT(IIO_CHAN_INFO_OFFSET), \ |
308 | .scan_type = IIO_ST('u', bits, 24, shift), \ | 308 | .scan_type = IIO_ST('u', bits, 24, shift), \ |
309 | .ext_info = ad5791_ext_info, \ | 309 | .ext_info = ad5791_ext_info, \ |
310 | } | 310 | } |
diff --git a/drivers/iio/dac/max517.c b/drivers/iio/dac/max517.c index 352abe2004a4..ebfaa4156246 100644 --- a/drivers/iio/dac/max517.c +++ b/drivers/iio/dac/max517.c | |||
@@ -146,8 +146,8 @@ static const struct iio_info max517_info = { | |||
146 | .indexed = 1, \ | 146 | .indexed = 1, \ |
147 | .output = 1, \ | 147 | .output = 1, \ |
148 | .channel = (chan), \ | 148 | .channel = (chan), \ |
149 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ | 149 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ |
150 | IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \ | 150 | BIT(IIO_CHAN_INFO_SCALE), \ |
151 | .scan_type = IIO_ST('u', 8, 8, 0), \ | 151 | .scan_type = IIO_ST('u', 8, 8, 0), \ |
152 | } | 152 | } |
153 | 153 | ||
diff --git a/drivers/iio/dac/mcp4725.c b/drivers/iio/dac/mcp4725.c index 8f88cc4059a2..a612ec766d96 100644 --- a/drivers/iio/dac/mcp4725.c +++ b/drivers/iio/dac/mcp4725.c | |||
@@ -69,8 +69,8 @@ static const struct iio_chan_spec mcp4725_channel = { | |||
69 | .indexed = 1, | 69 | .indexed = 1, |
70 | .output = 1, | 70 | .output = 1, |
71 | .channel = 0, | 71 | .channel = 0, |
72 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | | 72 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), |
73 | IIO_CHAN_INFO_SCALE_SHARED_BIT, | 73 | .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), |
74 | .scan_type = IIO_ST('u', 12, 16, 0), | 74 | .scan_type = IIO_ST('u', 12, 16, 0), |
75 | }; | 75 | }; |
76 | 76 | ||