Skip to content

Commit 1401608

Browse files
committed
iio: dac: ad5413: fix FIELD_PREP() include and YAML binding
Signed-off-by: Bruce Tsao <[email protected]>
1 parent e666c72 commit 1401608

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

Documentation/devicetree/bindings/iio/dac/adi,ad5413.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ properties:
3333

3434
adi,range-microamp:
3535
description: Current output range <min, max> in microamps
36-
- items:
37-
- const: 0
38-
- const: 24000
36+
items:
37+
- const: 0
38+
- const: 24000
3939

4040
adi,slew-time-us:
4141
description: Output digital slew control time in microseconds
@@ -52,7 +52,7 @@ allOf:
5252
- oneOf:
5353
- required: ['adi,range-microamp']
5454
- required: ['adi,range-microvolt']
55-
55+
5656
unevaluatedProperties: false
5757

5858
examples:

drivers/iio/dac/ad5413.c

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*
77
* TODO: Currently CRC is not supported in this driver
88
*/
9+
#include <linux/bitfield.h>
910
#include <linux/bsearch.h>
1011
#include <linux/delay.h>
1112
#include <linux/gpio/consumer.h>
@@ -570,45 +571,45 @@ static int ad5413_parse_dt(struct ad5413_state *st)
570571

571572
/* 1) voltage or current range */
572573
ret = device_property_read_u32_array(&st->spi->dev,
573-
"adi,range-microvolt",
574-
tmparray, 2);
574+
"adi,range-microvolt",
575+
tmparray, 2);
575576
if (ret == 0) {
576577
/* Validate voltage range: only ±10.5 V supported */
577578
if (tmparray[0] != -10500000 || tmparray[1] != 10500000)
578579
return dev_err_probe(&st->spi->dev, -EINVAL,
579-
"Invalid voltage range %u-%u µV; only ±10.5 V supported\n",
580-
tmparray[0], tmparray[1]);
580+
"Invalid voltage range %u-%u µV; only ±10.5 V supported\n",
581+
tmparray[0], tmparray[1]);
581582

582583
ranges = ad5413_voltage_range;
583-
size = ARRAY_SIZE(ad5413_voltage_range);
584+
size = ARRAY_SIZE(ad5413_voltage_range);
584585
} else {
585586
/* current path */
586587
ret = device_property_read_u32_array(&st->spi->dev,
587-
"adi,range-microamp",
588-
tmparray, 2);
588+
"adi,range-microamp",
589+
tmparray, 2);
589590
if (ret)
590591
return dev_err_probe(&st->spi->dev, ret,
591-
"Missing \"adi,range-microvolt\" or \"adi,range-microamp\"\n");
592+
"Missing \"adi,range-microvolt\" or \"adi,range-microamp\"\n");
592593
/* Validate current range: only 0–24000 µA supported */
593594
if (tmparray[0] != 0 || tmparray[1] != 24000)
594595
return dev_err_probe(&st->spi->dev, -EINVAL,
595-
"Invalid current range %u-%u µA; only 0–24000 supported\n",
596-
tmparray[0], tmparray[1]);
596+
"Invalid current range %u-%u µA; only 0–24000 supported\n",
597+
tmparray[0], tmparray[1]);
597598
ranges = ad5413_current_range;
598-
size = ARRAY_SIZE(ad5413_current_range);
599+
size = ARRAY_SIZE(ad5413_current_range);
599600
}
600601

601602
/* 2) find_out_range() and st->out_range */
602603
ret = ad5413_find_out_range(st, ranges, size,
603-
tmparray[0], tmparray[1]);
604+
tmparray[0], tmparray[1]);
604605
if (ret < 0)
605606
return dev_err_probe(&st->spi->dev, ret,
606607
"Invalid range values (%u, %u)\n",
607608
tmparray[0], tmparray[1]);
608609

609610
/* 3) read slew-time (optional) */
610611
ret = device_property_read_u32(&st->spi->dev,
611-
"adi,slew-time-us", &slew_time_us);
612+
"adi,slew-time-us", &slew_time_us);
612613
if (ret == -ENODATA || ret == -EINVAL) {
613614
slew_time_us = 0;
614615
} else if (ret < 0) {

0 commit comments

Comments
 (0)