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.

diff --cc drivers/iio/adc/Kconfig
Simple merge

diff --cc drivers/iio/adc/ingenic-adc.c
index fa7ae7f,c5b0176..92b2508
--- 1/drivers/iio/adc/ingenic-adc.c
--- 2/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);