diff options
author | Tom Rini <trini@konsulko.com> | 2020-12-14 18:57:57 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-12-14 18:57:57 -0500 |
commit | 8351a29d2df18c92d8e365cfa848218c3859f3d2 (patch) | |
tree | 5d29001be9accfb8029df9d9ed78fba196ee07b9 /drivers/adc/stm32-adc.c | |
parent | ddaa94978583d07ec515e7226e397221d8cc44c8 (diff) | |
parent | b7bbd553de0d9752f919dfc616f560f6f2504c14 (diff) |
Merge tag 'dm-pull-14dec20' of git://git.denx.de/u-boot-dm into next
Driver model tidy-up for livetree
Driver model big rename for consistency
Python 3 clean-ups for patman
Update sandbox serial driver to use membuff
Diffstat (limited to 'drivers/adc/stm32-adc.c')
-rw-r--r-- | drivers/adc/stm32-adc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/adc/stm32-adc.c b/drivers/adc/stm32-adc.c index 3f0ed48846..ad8d1a32cd 100644 --- a/drivers/adc/stm32-adc.c +++ b/drivers/adc/stm32-adc.c @@ -80,7 +80,7 @@ static int stm32_adc_stop(struct udevice *dev) static int stm32_adc_start_channel(struct udevice *dev, int channel) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); struct stm32_adc_common *common = dev_get_priv(dev_get_parent(dev)); struct stm32_adc *adc = dev_get_priv(dev); int ret; @@ -164,7 +164,7 @@ static int stm32_adc_channel_data(struct udevice *dev, int channel, static int stm32_adc_chan_of_init(struct udevice *dev) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(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; @@ -206,7 +206,7 @@ static int stm32_adc_chan_of_init(struct udevice *dev) static int stm32_adc_probe(struct udevice *dev) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); struct stm32_adc_common *common = dev_get_priv(dev_get_parent(dev)); struct stm32_adc *adc = dev_get_priv(dev); int offset; @@ -258,5 +258,5 @@ U_BOOT_DRIVER(stm32_adc) = { .of_match = stm32_adc_ids, .probe = stm32_adc_probe, .ops = &stm32_adc_ops, - .priv_auto_alloc_size = sizeof(struct stm32_adc), + .priv_auto = sizeof(struct stm32_adc), }; |