On 12/7/22 16:54, Patrice CHOTARD wrote:
>
>
> On 11/23/22 16:20, Olivier Moysan wrote:
>> Split stm32_adc_chan_of_init channel initialization function into
>> several routines to increase readability and prepare channel
>> generic binding handling.
>>
>> Signed-off-by: Olivier Moysan <olivier.moy...@foss.st.com>
>> ---
>>
>> drivers/adc/stm32-adc.c | 44 +++++++++++++++++++++++++++++++----------
>> 1 file changed, 34 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/adc/stm32-adc.c b/drivers/adc/stm32-adc.c
>> index ad8d1a32cdba..1250385fbb92 100644
>> --- a/drivers/adc/stm32-adc.c
>> +++ b/drivers/adc/stm32-adc.c
>> @@ -162,12 +162,8 @@ static int stm32_adc_channel_data(struct udevice *dev,
>> int channel,
>> return 0;
>> }
>>
>> -static int stm32_adc_chan_of_init(struct udevice *dev)
>> +static int stm32_adc_get_legacy_chan_count(struct udevice *dev)
>> {
>> - struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);
>> - struct stm32_adc *adc = dev_get_priv(dev);
>> - u32 chans[STM32_ADC_CH_MAX];
>> - unsigned int i, num_channels;
>> int ret;
>>
>> /* Retrieve single ended channels listed in device tree */
>> @@ -176,12 +172,16 @@ static int stm32_adc_chan_of_init(struct udevice *dev)
>> dev_err(dev, "can't get st,adc-channels: %d\n", ret);
>> return ret;
>> }
>> - num_channels = ret / sizeof(u32);
>>
>> - if (num_channels > adc->cfg->max_channels) {
>> - dev_err(dev, "too many st,adc-channels: %d\n", num_channels);
>> - return -EINVAL;
>> - }
>> + return (ret / sizeof(u32));
>> +}
>> +
>> +static int stm32_adc_legacy_chan_init(struct udevice *dev, unsigned int
>> num_channels)
>> +{
>> + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);
>> + struct stm32_adc *adc = dev_get_priv(dev);
>> + u32 chans[STM32_ADC_CH_MAX];
>> + int i, ret;
>>
>> ret = dev_read_u32_array(dev, "st,adc-channels", chans, num_channels);
>> if (ret < 0) {
>> @@ -197,6 +197,30 @@ static int stm32_adc_chan_of_init(struct udevice *dev)
>> uc_pdata->channel_mask |= 1 << chans[i];
>> }
>>
>> + return ret;
>> +}
>> +
>> +static int stm32_adc_chan_of_init(struct udevice *dev)
>> +{
>> + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);
>> + struct stm32_adc *adc = dev_get_priv(dev);
>> + unsigned int num_channels;
>> + int ret;
>> +
>> + ret = stm32_adc_get_legacy_chan_count(dev);
>> + if (ret < 0)
>> + return ret;
>> + num_channels = ret;
>> +
>> + if (num_channels > adc->cfg->max_channels) {
>> + dev_err(dev, "too many st,adc-channels: %d\n", num_channels);
>> + return -EINVAL;
>> + }
>> +
>> + ret = stm32_adc_legacy_chan_init(dev, num_channels);
>> + if (ret < 0)
>> + return ret;
>> +
>> uc_pdata->data_mask = (1 << adc->cfg->num_bits) - 1;
>> uc_pdata->data_format = ADC_DATA_FORMAT_BIN;
>> uc_pdata->data_timeout_us = 100000;
>
>
> Reviewed-by: Patrice Chotard <patrice.chot...@foss.st.com>
>
> Thanks
> Patrice
> _______________________________________________
> Uboot-stm32 mailing list
> uboot-st...@st-md-mailman.stormreply.com
> https://st-md-mailman.stormreply.com/mailman/listinfo/uboot-stm32
Applied to u-boot-stm/master
Thanks
Patrice
