Skip to content

Commit fecd3cb

Browse files
cristibirsancristibirsan
committed
Merge branch 'at91-4.14-trunk/base_adc' into linux-4.14-at91
2 parents 5cb44d9 + 6afed10 commit fecd3cb

75 files changed

Lines changed: 481 additions & 115 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ Required properties:
1717
This property uses the IRQ edge types values: IRQ_TYPE_EDGE_RISING ,
1818
IRQ_TYPE_EDGE_FALLING or IRQ_TYPE_EDGE_BOTH
1919

20+
Optional properties:
21+
- dmas: Phandle to dma channel for the ADC.
22+
- dma-names: Must be "rx" when dmas property is being used.
23+
See ../../dma/dma.txt for details.
24+
2025
Example:
2126

2227
adc: adc@fc030000 {
@@ -31,4 +36,6 @@ adc: adc@fc030000 {
3136
vddana-supply = <&vdd_3v3_lp_reg>;
3237
vref-supply = <&vdd_3v3_lp_reg>;
3338
atmel,trigger-edge-type = <IRQ_TYPE_EDGE_BOTH>;
39+
dmas = <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) | AT91_XDMAC_DT_PERID(25))>;
40+
dma-names = "rx";
3441
}

‎drivers/iio/adc/Kconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@ config AT91_SAMA5D2_ADC
158158
tristate "Atmel AT91 SAMA5D2 ADC"
159159
depends on ARCH_AT91 || COMPILE_TEST
160160
depends on HAS_IOMEM
161+
depends on HAS_DMA
162+
select IIO_BUFFER
161163
select IIO_TRIGGERED_BUFFER
162164
help
163165
Say yes here to build support for Atmel SAMA5D2 ADC which is

‎drivers/iio/adc/ad7266.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ static AD7266_DECLARE_DIFF_CHANNELS_FIXED(u, 'u');
280280
static const struct iio_info ad7266_info = {
281281
.read_raw = &ad7266_read_raw,
282282
.update_scan_mode = &ad7266_update_scan_mode,
283-
.driver_module = THIS_MODULE,
284283
};
285284

286285
static const unsigned long ad7266_available_scan_masks[] = {

‎drivers/iio/adc/ad7291.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,6 @@ static const struct iio_info ad7291_info = {
461461
.write_event_config = &ad7291_write_event_config,
462462
.read_event_value = &ad7291_read_event_value,
463463
.write_event_value = &ad7291_write_event_value,
464-
.driver_module = THIS_MODULE,
465464
};
466465

467466
static int ad7291_probe(struct i2c_client *client,

‎drivers/iio/adc/ad7298.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ static int ad7298_read_raw(struct iio_dev *indio_dev,
280280
static const struct iio_info ad7298_info = {
281281
.read_raw = &ad7298_read_raw,
282282
.update_scan_mode = ad7298_update_scan_mode,
283-
.driver_module = THIS_MODULE,
284283
};
285284

286285
static int ad7298_probe(struct spi_device *spi)

‎drivers/iio/adc/ad7476.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ static const struct ad7476_chip_info ad7476_chip_info_tbl[] = {
195195
};
196196

197197
static const struct iio_info ad7476_info = {
198-
.driver_module = THIS_MODULE,
199198
.read_raw = &ad7476_read_raw,
200199
};
201200

‎drivers/iio/adc/ad7766.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ static const struct iio_buffer_setup_ops ad7766_buffer_setup_ops = {
185185
};
186186

187187
static const struct iio_info ad7766_info = {
188-
.driver_module = THIS_MODULE,
189188
.read_raw = &ad7766_read_raw,
190189
};
191190

@@ -208,7 +207,6 @@ static int ad7766_set_trigger_state(struct iio_trigger *trig, bool enable)
208207
}
209208

210209
static const struct iio_trigger_ops ad7766_trigger_ops = {
211-
.owner = THIS_MODULE,
212210
.set_trigger_state = ad7766_set_trigger_state,
213211
.validate_device = iio_trigger_validate_own_device,
214212
};

‎drivers/iio/adc/ad7791.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,13 +308,11 @@ static const struct iio_info ad7791_info = {
308308
.read_raw = &ad7791_read_raw,
309309
.attrs = &ad7791_attribute_group,
310310
.validate_trigger = ad_sd_validate_trigger,
311-
.driver_module = THIS_MODULE,
312311
};
313312

314313
static const struct iio_info ad7791_no_filter_info = {
315314
.read_raw = &ad7791_read_raw,
316315
.validate_trigger = ad_sd_validate_trigger,
317-
.driver_module = THIS_MODULE,
318316
};
319317

320318
static int ad7791_setup(struct ad7791_state *st,

‎drivers/iio/adc/ad7793.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,6 @@ static const struct iio_info ad7793_info = {
563563
.write_raw_get_fmt = &ad7793_write_raw_get_fmt,
564564
.attrs = &ad7793_attribute_group,
565565
.validate_trigger = ad_sd_validate_trigger,
566-
.driver_module = THIS_MODULE,
567566
};
568567

569568
static const struct iio_info ad7797_info = {
@@ -572,7 +571,6 @@ static const struct iio_info ad7797_info = {
572571
.write_raw_get_fmt = &ad7793_write_raw_get_fmt,
573572
.attrs = &ad7793_attribute_group,
574573
.validate_trigger = ad_sd_validate_trigger,
575-
.driver_module = THIS_MODULE,
576574
};
577575

578576
#define DECLARE_AD7793_CHANNELS(_name, _b, _sb, _s) \

‎drivers/iio/adc/ad7887.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ static const struct ad7887_chip_info ad7887_chip_info_tbl[] = {
229229

230230
static const struct iio_info ad7887_info = {
231231
.read_raw = &ad7887_read_raw,
232-
.driver_module = THIS_MODULE,
233232
};
234233

235234
static int ad7887_probe(struct spi_device *spi)

0 commit comments

Comments
 (0)