patch "iio: adc: stm32-adc: skip adc-channels setup if none is present" added to char-misc-linus
Subsystems (3)
This is a note to let you know that I've just added the patch titled
iio: adc: stm32-adc: skip adc-channels setup if none is present
to my char-misc git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
in the char-misc-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
From 3e27ef0ced49f8ae7883c25fadf76a2086e99025 Mon Sep 17 00:00:00 2001
From: Sean Nyekjaer <[email protected]>
Date: Wed, 3 May 2023 18:20:29 +0200
Subject: iio: adc: stm32-adc: skip adc-channels setup if none is present
If only adc differential channels are defined driver will fail with
stm32-adc: probe of 48003000.adc:adc@0 failed with error -22
Fix this by skipping the initialization if no channels are defined.
This applies only to the legacy way of initializing adc channels.
--- drivers/iio/adc/stm32-adc.c | 42 ++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 19 deletions(-)
drivers/iio/adc/stm32-adc.c +23 -19
@@ -2036,6 +2036,7 @@ static int stm32_adc_legacy_chan_init(struct iio_dev *indio_dev,struct stm32_adc_diff_channel diff[STM32_ADC_CH_MAX ];struct device *dev = &indio_dev->dev;u32 num_diff = adc->num_diff; +int num_se = nchans - num_diff;int size = num_diff *sizeof (*diff) /sizeof (u32);int scan_index =0 , ret, i, c;u32 smp =0 , smps[STM32_ADC_CH_MAX ], chans[STM32_ADC_CH_MAX ];
@@ -2062,29 +2063,32 @@ static int stm32_adc_legacy_chan_init(struct iio_dev *indio_dev, scan_index++; } } - - ret =device_property_read_u32_array (dev,"st,adc-channels" , chans, - nchans); -if (ret) -return ret; - -for (c =0 ; c < nchans; c++) { -if (chans[c] >= adc_info->max_channels) { -dev_err (&indio_dev->dev,"Invalid channel %d\n" , - chans[c]); -return -EINVAL ; +if (num_se >0 ) { + ret =device_property_read_u32_array (dev,"st,adc-channels" , chans, num_se); +if (ret) { +dev_err (&indio_dev->dev,"Failed to get st,adc-channels %d\n" , ret); +return ret; } -/* Channel can't be configured both as single-ended & diff */ -for (i =0 ; i < num_diff; i++) { -if (chans[c] == diff[i].vinp) { -dev_err (&indio_dev->dev,"channel %d misconfigured\n" , chans[c]); +for (c =0 ; c < num_se; c++) { +if (chans[c] >= adc_info->max_channels) { +dev_err (&indio_dev->dev,"Invalid channel %d\n" , + chans[c]);return -EINVAL ; } + +/* Channel can't be configured both as single-ended & diff */ +for (i =0 ; i < num_diff; i++) { +if (chans[c] == diff[i].vinp) { +dev_err (&indio_dev->dev,"channel %d misconfigured\n" , + chans[c]); +return -EINVAL ; + } + } +stm32_adc_chan_init_one (indio_dev, &channels[scan_index], + chans[c],0 , scan_index, false); + scan_index++; } -stm32_adc_chan_init_one (indio_dev, &channels[scan_index], - chans[c],0 , scan_index, false); - scan_index++; }if (adc->nsmps >0 ) {
@@ -2305,7 +2309,7 @@ static int stm32_adc_chan_fw_init(struct iio_dev *indio_dev, bool timestamping)if (legacy) ret =stm32_adc_legacy_chan_init (indio_dev, adc, channels, - num_channels); + timestamping ? num_channels -1 : num_channels);else ret =stm32_adc_generic_chan_init (indio_dev, adc, channels);if (ret <0 )
Signature · 1 line
2.40.1