summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJinyoung Park <jinyoungp@nvidia.com>2013-11-14 16:47:24 +0900
committerHarry Hong <hhong@nvidia.com>2013-11-18 16:30:51 -0800
commit3b94ac3347a23101577128c359dd0294339dc2ec (patch)
tree10d2e76f1998ef8fa26de1023d005315f40a3146
parent41aafb5b88a3a27b3ab1027fd7387ec0cf100000 (diff)
staging: iio: adc: palmas: Force calibrate ADC value
Force calibrate ADC value for only TegraTab. Bug 1287901 Bug 1401769 Change-Id: I459f174afc93942104b887415bc42bb4e4d8af45 Signed-off-by: Jinyoung Park <jinyoungp@nvidia.com> Reviewed-on: http://git-master/r/330985 Reviewed-by: Harry Hong <hhong@nvidia.com> Tested-by: Harry Hong <hhong@nvidia.com>
-rw-r--r--drivers/staging/iio/adc/palmas_gpadc.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/staging/iio/adc/palmas_gpadc.c b/drivers/staging/iio/adc/palmas_gpadc.c
index 3535c6e170c4..1f375ca431d8 100644
--- a/drivers/staging/iio/adc/palmas_gpadc.c
+++ b/drivers/staging/iio/adc/palmas_gpadc.c
@@ -315,11 +315,15 @@ static int palmas_gpadc_read_raw(struct iio_dev *indio_dev,
goto out_mask_interrupt;
}
+#if !defined(CONFIG_MACH_TEGRATAB)
if (mask == IIO_CHAN_INFO_CALIBSCALE)
*val = palmas_gpadc_get_calibrated_code(adc, adc_chan,
ret);
else
*val = ret;
+#else
+ *val = palmas_gpadc_get_calibrated_code(adc, adc_chan, ret);
+#endif
if ((adc_chan == PALMAS_ADC_CH_IN3) && adc->ch3_dual_current
&& val2) {
@@ -337,11 +341,16 @@ static int palmas_gpadc_read_raw(struct iio_dev *indio_dev,
goto out_mask_interrupt;
}
+#if !defined(CONFIG_MACH_TEGRATAB)
if (mask == IIO_CHAN_INFO_CALIBSCALE)
*val2 = palmas_gpadc_get_calibrated_code(adc,
adc_chan, ret);
else
*val2 = ret;
+#else
+ *val2 = palmas_gpadc_get_calibrated_code(adc,
+ adc_chan, ret);
+#endif
}
ret = IIO_VAL_INT;