From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Date: Wed, 22 Jul 2020 13:36:31 +0000 (+0100)
Subject: Merge branch 'ib-5.8-jz47xx-ts' into HEAD
X-Git-Tag: v5.9-rc1~119^2~61^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0d7c5845e7faef263184c68f8a31634dfa22c6f;p=thirdparty%2Fkernel%2Fstable.git

Merge branch 'ib-5.8-jz47xx-ts' into HEAD
Immutable branch may be needed in input for a joystick set that is
dependent on it.
---

d0d7c5845e7faef263184c68f8a31634dfa22c6f
diff --cc drivers/iio/adc/ingenic-adc.c
index fa7ae7f6677e7,c5b01766513d1..92b25083e23f1
--- a/drivers/iio/adc/ingenic-adc.c
+++ b/drivers/iio/adc/ingenic-adc.c
@@@ -482,13 -794,12 +795,11 @@@ static int ingenic_adc_probe(struct pla
  		return ret;
  	}
  
 -	iio_dev->dev.parent = dev;
  	iio_dev->name = "jz-adc";
- 	iio_dev->modes = INDIO_DIRECT_MODE;
- 	iio_dev->channels = ingenic_channels;
- 	iio_dev->num_channels = ARRAY_SIZE(ingenic_channels);
- 	/* Remove AUX2 from the list of supported channels. */
- 	if (!adc->soc_data->has_aux2)
- 		iio_dev->num_channels -= 1;
+ 	iio_dev->modes = INDIO_DIRECT_MODE | INDIO_BUFFER_SOFTWARE;
+ 	iio_dev->setup_ops = &ingenic_buffer_setup_ops;
+ 	iio_dev->channels = soc_data->channels;
+ 	iio_dev->num_channels = soc_data->num_channels;
  	iio_dev->info = &ingenic_adc_info;
  
  	ret = devm_iio_device_register(dev, iio_dev);