Commit c9d07120 authored by Marcelo Schmitt's avatar Marcelo Schmitt Committed by Jonathan Cameron

staging: iio: ad5933: change regulator binging for vref

Set a single voltage regulator for all voltage references.
Remove voltage reference value from default platafrom data struct.
Signed-off-by: default avatarMarcelo Schmitt <marcelo.schmitt1@gmail.com>
Signed-off-by: default avatarGabriel Capella <gabriel@capella.pro>
Co-developed-by: default avatarGabriel Capella <gabriel@capella.pro>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 7f6b6d55
...@@ -91,7 +91,6 @@ ...@@ -91,7 +91,6 @@
struct ad5933_platform_data { struct ad5933_platform_data {
unsigned long ext_clk_hz; unsigned long ext_clk_hz;
unsigned short vref_mv;
}; };
struct ad5933_state { struct ad5933_state {
...@@ -113,7 +112,6 @@ struct ad5933_state { ...@@ -113,7 +112,6 @@ struct ad5933_state {
}; };
static struct ad5933_platform_data ad5933_default_pdata = { static struct ad5933_platform_data ad5933_default_pdata = {
.vref_mv = 3300,
}; };
#define AD5933_CHANNEL(_type, _extend_name, _info_mask_separate, _address, \ #define AD5933_CHANNEL(_type, _extend_name, _info_mask_separate, _address, \
...@@ -691,7 +689,7 @@ static void ad5933_work(struct work_struct *work) ...@@ -691,7 +689,7 @@ static void ad5933_work(struct work_struct *work)
static int ad5933_probe(struct i2c_client *client, static int ad5933_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
int ret, voltage_uv = 0; int ret;
struct ad5933_platform_data *pdata = dev_get_platdata(&client->dev); struct ad5933_platform_data *pdata = dev_get_platdata(&client->dev);
struct ad5933_state *st; struct ad5933_state *st;
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
...@@ -718,12 +716,12 @@ static int ad5933_probe(struct i2c_client *client, ...@@ -718,12 +716,12 @@ static int ad5933_probe(struct i2c_client *client,
dev_err(&client->dev, "Failed to enable specified VDD supply\n"); dev_err(&client->dev, "Failed to enable specified VDD supply\n");
return ret; return ret;
} }
voltage_uv = regulator_get_voltage(st->reg); ret = regulator_get_voltage(st->reg);
if (ret < 0)
goto error_disable_reg;
if (voltage_uv) st->vref_mv = ret / 1000;
st->vref_mv = voltage_uv / 1000;
else
st->vref_mv = pdata->vref_mv;
if (pdata->ext_clk_hz) { if (pdata->ext_clk_hz) {
st->mclk_hz = pdata->ext_clk_hz; st->mclk_hz = pdata->ext_clk_hz;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment