diff options
| author | Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> | 2021-09-27 20:48:35 +0300 |
|---|---|---|
| committer | Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> | 2021-10-01 21:36:48 +0300 |
| commit | 63d766567cca9b61dbcd18ca4315536ab08962bd (patch) | |
| tree | 48f0ad3368dc9a3ce52566031fe9f64f2ef276ee | |
| parent | 37b8109671112cbe09d5325bb684a0718f6af341 (diff) | |
| download | linux-63d766567cca9b61dbcd18ca4315536ab08962bd.tar.xz | |
fixup! Igore 0x3FF in aspeed_adc driver
Revert 0256271cd3840545a13728b07e1bc6baf0cd75db.
Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
| -rw-r--r-- | drivers/iio/adc/aspeed_adc.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c index 44510dc9eb99..c2d5f899430d 100644 --- a/drivers/iio/adc/aspeed_adc.c +++ b/drivers/iio/adc/aspeed_adc.c @@ -53,9 +53,6 @@ #define ASPEED_ADC_INIT_POLLING_TIME 500 #define ASPEED_ADC_INIT_TIMEOUT 500000 -#define ASPEED_ADC_CHANNELS_MAX 16 -#define ASPEED_ADC_RAW_VALUE_MAX GENMASK(ASPEED_RESOLUTION_BITS-1, 0) - struct aspeed_adc_model_data { const char *model_name; unsigned int min_sampling_rate; // Hz @@ -74,7 +71,6 @@ struct aspeed_adc_data { struct clk_hw *clk_scaler; struct reset_control *rst; int cv; - int channel_raw_value[ASPEED_ADC_CHANNELS_MAX]; }; #define ASPEED_CHAN(_idx, _data_reg_addr) { \ @@ -128,13 +124,6 @@ static int aspeed_adc_read_raw(struct iio_dev *indio_dev, switch (mask) { case IIO_CHAN_INFO_RAW: *val = readw(data->base + chan->address); - if (*val == ASPEED_ADC_RAW_VALUE_MAX) { - *val = data->channel_raw_value[chan->channel]; - pr_err("aspeed_adc: channel %d drop invalid raw reading %d\n", - chan->channel, ASPEED_ADC_RAW_VALUE_MAX); - } else { - data->channel_raw_value[chan->channel] = *val; - } return IIO_VAL_INT; case IIO_CHAN_INFO_SCALE: @@ -216,7 +205,6 @@ static int aspeed_adc_probe(struct platform_device *pdev) int ret; u32 eng_ctrl = 0; u32 adc_engine_control_reg_val; - int i; indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*data)); if (!indio_dev) @@ -308,9 +296,6 @@ static int aspeed_adc_probe(struct platform_device *pdev) data->cv = 0x200 - (readl(data->base + 0x10) & GENMASK(9, 0)); - for (i = 0; i < ASPEED_ADC_CHANNELS_MAX; i++) - data->channel_raw_value[i] = ASPEED_ADC_RAW_VALUE_MAX; - writel(eng_ctrl | ASPEED_OPERATION_MODE_NORMAL | ASPEED_ENGINE_ENABLE | ASPEED_AUTOPENSATING, data->base + ASPEED_REG_ENGINE_CONTROL); printk(KERN_INFO "aspeed_adc: cv %d \n", data->cv); |