dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 09:12:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

adc: stm32mp15: split channel init into several routines

Browse Source 
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.moysan@foss.st.com>
Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
This commit is contained in:
Olivier Moysan
2022-11-23 16:20:15 +01:00
committed by Patrice Chotard
parent 2c8d548f4e
commit 1727d46bf9
1 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/adc/stm32-adc.c
View File

@@ -162,12 +162,8 @@ static int stm32_adc_channel_data(struct udevice *dev, int channel,
return 0; 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; int ret;
/* Retrieve single ended channels listed in device tree */ /* Retrieve single ended channels listed in device tree */
@@ -176,13 +172,17 @@ static int stm32_adc_chan_of_init(struct udevice *dev)
dev_err(dev, "can't get st,adc-channels: %d\n", ret); dev_err(dev, "can't get st,adc-channels: %d\n", ret);
return ret; return ret;
} }
num_channels = ret / sizeof(u32);
if (num_channels > adc->cfg->max_channels) { return (ret / sizeof(u32));
dev_err(dev, "too many st,adc-channels: %d\n", num_channels);
return -EINVAL;
} }
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); ret = dev_read_u32_array(dev, "st,adc-channels", chans, num_channels);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "can't read st,adc-channels: %d\n", ret); dev_err(dev, "can't read st,adc-channels: %d\n", ret);
@@ -197,6 +197,30 @@ static int stm32_adc_chan_of_init(struct udevice *dev)
uc_pdata->channel_mask |= 1 << chans[i]; 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_mask = (1 << adc->cfg->num_bits) - 1;
uc_pdata->data_format = ADC_DATA_FORMAT_BIN; uc_pdata->data_format = ADC_DATA_FORMAT_BIN;
uc_pdata->data_timeout_us = 100000; uc_pdata->data_timeout_us = 100000;