aboutsummaryrefslogtreecommitdiff
path: root/drivers/adc
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/adc')
-rw-r--r--drivers/adc/adc-uclass.c32
-rw-r--r--drivers/adc/exynos-adc.c2
-rw-r--r--drivers/adc/meson-saradc.c2
-rw-r--r--drivers/adc/rockchip-saradc.c4
-rw-r--r--drivers/adc/sandbox.c2
-rw-r--r--drivers/adc/stm32-adc.c6
6 files changed, 24 insertions, 24 deletions
diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c
index 7d0c857947..99b83cab47 100644
--- a/drivers/adc/adc-uclass.c
+++ b/drivers/adc/adc-uclass.c
@@ -15,7 +15,7 @@
#include <linux/delay.h>
#include <power/regulator.h>
-#define ADC_UCLASS_PLATDATA_SIZE sizeof(struct adc_uclass_platdata)
+#define ADC_UCLASS_PLATDATA_SIZE sizeof(struct adc_uclass_plat)
#define CHECK_NUMBER true
#define CHECK_MASK (!CHECK_NUMBER)
@@ -29,7 +29,7 @@ extern void sdelay(unsigned long loops);
static int check_channel(struct udevice *dev, int value, bool number_or_mask,
const char *caller_function)
{
- struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev);
+ struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);
unsigned mask = number_or_mask ? (1 << value) : value;
/* For the real ADC hardware, some ADC channels can be inactive.
@@ -48,7 +48,7 @@ static int check_channel(struct udevice *dev, int value, bool number_or_mask,
static int adc_supply_enable(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);
const char *supply_type;
int ret = 0;
@@ -70,7 +70,7 @@ static int adc_supply_enable(struct udevice *dev)
int adc_data_mask(struct udevice *dev, unsigned int *data_mask)
{
- struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev);
+ struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);
if (!uc_pdata)
return -ENOSYS;
@@ -81,7 +81,7 @@ int adc_data_mask(struct udevice *dev, unsigned int *data_mask)
int adc_channel_mask(struct udevice *dev, unsigned int *channel_mask)
{
- struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev);
+ struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);
if (!uc_pdata)
return -ENOSYS;
@@ -141,7 +141,7 @@ int adc_start_channels(struct udevice *dev, unsigned int channel_mask)
int adc_channel_data(struct udevice *dev, int channel, unsigned int *data)
{
- struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev);
+ struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);
const struct adc_ops *ops = dev_get_driver_ops(dev);
unsigned int timeout_us = uc_pdata->data_timeout_us;
int ret;
@@ -168,7 +168,7 @@ int adc_channel_data(struct udevice *dev, int channel, unsigned int *data)
int adc_channels_data(struct udevice *dev, unsigned int channel_mask,
struct adc_channel *channels)
{
- struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev);
+ struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);
unsigned int timeout_us = uc_pdata->multidata_timeout_us;
const struct adc_ops *ops = dev_get_driver_ops(dev);
int ret;
@@ -269,7 +269,7 @@ try_manual:
static int adc_vdd_platdata_update(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);
int ret;
/* Warning!
@@ -292,7 +292,7 @@ static int adc_vdd_platdata_update(struct udevice *dev)
static int adc_vss_platdata_update(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);
int ret;
if (!uc_pdata->vss_supply)
@@ -309,7 +309,7 @@ static int adc_vss_platdata_update(struct udevice *dev)
int adc_vdd_value(struct udevice *dev, int *uV)
{
- struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev);
+ struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);
int ret, value_sign = uc_pdata->vdd_polarity_negative ? -1 : 1;
/* Update the regulator Value. */
@@ -327,7 +327,7 @@ int adc_vdd_value(struct udevice *dev, int *uV)
int adc_vss_value(struct udevice *dev, int *uV)
{
- struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev);
+ struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);
int ret, value_sign = uc_pdata->vss_polarity_negative ? -1 : 1;
/* Update the regulator Value. */
@@ -369,7 +369,7 @@ int adc_raw_to_uV(struct udevice *dev, unsigned int raw, int *uV)
static int adc_vdd_platdata_set(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);
int ret;
char *prop;
@@ -394,7 +394,7 @@ static int adc_vdd_platdata_set(struct udevice *dev)
static int adc_vss_platdata_set(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);
int ret;
char *prop;
@@ -420,12 +420,12 @@ static int adc_pre_probe(struct udevice *dev)
{
int ret;
- /* Set ADC VDD platdata: polarity, uV, regulator (phandle). */
+ /* Set ADC VDD plat: polarity, uV, regulator (phandle). */
ret = adc_vdd_platdata_set(dev);
if (ret)
pr_err("%s: Can't update Vdd. Error: %d", dev->name, ret);
- /* Set ADC VSS platdata: polarity, uV, regulator (phandle). */
+ /* Set ADC VSS plat: polarity, uV, regulator (phandle). */
ret = adc_vss_platdata_set(dev);
if (ret)
pr_err("%s: Can't update Vss. Error: %d", dev->name, ret);
@@ -437,5 +437,5 @@ UCLASS_DRIVER(adc) = {
.id = UCLASS_ADC,
.name = "adc",
.pre_probe = adc_pre_probe,
- .per_device_platdata_auto = ADC_UCLASS_PLATDATA_SIZE,
+ .per_device_plat_auto = ADC_UCLASS_PLATDATA_SIZE,
};
diff --git a/drivers/adc/exynos-adc.c b/drivers/adc/exynos-adc.c
index 6bdc45a5fc..6ae46aed15 100644
--- a/drivers/adc/exynos-adc.c
+++ b/drivers/adc/exynos-adc.c
@@ -103,7 +103,7 @@ int exynos_adc_probe(struct udevice *dev)
int exynos_adc_ofdata_to_platdata(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 exynos_adc_priv *priv = dev_get_priv(dev);
priv->regs = dev_read_addr_ptr(dev);
diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c
index 469ab1f178..ac75742657 100644
--- a/drivers/adc/meson-saradc.c
+++ b/drivers/adc/meson-saradc.c
@@ -677,7 +677,7 @@ static int meson_saradc_probe(struct udevice *dev)
int meson_saradc_ofdata_to_platdata(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 meson_saradc_priv *priv = dev_get_priv(dev);
priv->data = (struct meson_saradc_data *)dev_get_driver_data(dev);
diff --git a/drivers/adc/rockchip-saradc.c b/drivers/adc/rockchip-saradc.c
index 1e12720974..4af7416a41 100644
--- a/drivers/adc/rockchip-saradc.c
+++ b/drivers/adc/rockchip-saradc.c
@@ -44,7 +44,7 @@ int rockchip_saradc_channel_data(struct udevice *dev, int channel,
unsigned int *data)
{
struct rockchip_saradc_priv *priv = dev_get_priv(dev);
- struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev);
+ struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);
if (channel != priv->active_channel) {
pr_err("Requested channel is not active!");
@@ -119,7 +119,7 @@ int rockchip_saradc_probe(struct udevice *dev)
int rockchip_saradc_ofdata_to_platdata(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 rockchip_saradc_priv *priv = dev_get_priv(dev);
struct rockchip_saradc_data *data;
diff --git a/drivers/adc/sandbox.c b/drivers/adc/sandbox.c
index 14f2c2a7ed..905ce4fc51 100644
--- a/drivers/adc/sandbox.c
+++ b/drivers/adc/sandbox.c
@@ -137,7 +137,7 @@ int sandbox_adc_probe(struct udevice *dev)
int sandbox_adc_ofdata_to_platdata(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);
uc_pdata->data_mask = SANDBOX_ADC_DATA_MASK;
uc_pdata->data_format = ADC_DATA_FORMAT_BIN;
diff --git a/drivers/adc/stm32-adc.c b/drivers/adc/stm32-adc.c
index 2c6984f2aa..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;