summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChanho Park <chanho61.park@samsung.com>2016-11-08 06:59:32 +0900
committerChanho Park <chanho61.park@samsung.com>2016-11-08 07:04:37 +0900
commitd4b2e57dda0906f61178da0e9b93bbbde8e084d1 (patch)
tree08be250e091ea5cc309d8f93942f90e25d505719
parent5525b2fec31d4059bfe283e0382706d019f573da (diff)
downloadlinux-artik7-d4b2e57dda0906f61178da0e9b93bbbde8e084d1.tar.gz
linux-artik7-d4b2e57dda0906f61178da0e9b93bbbde8e084d1.tar.bz2
linux-artik7-d4b2e57dda0906f61178da0e9b93bbbde8e084d1.zip
Revert "iio: adc: irq disable during sampling in s5p4418"
This reverts commit fb66560e2e79df5651c8af2464a0a6bbe8d713f7. Change-Id: I222a37970a1402994b25799e07802ed185a4e620 Signed-off-by: Chanho Park <chanho61.park@samsung.com>
-rw-r--r--drivers/iio/adc/nexell_adc.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/iio/adc/nexell_adc.c b/drivers/iio/adc/nexell_adc.c
index 82a551b5521c..322db7dd1abc 100644
--- a/drivers/iio/adc/nexell_adc.c
+++ b/drivers/iio/adc/nexell_adc.c
@@ -165,7 +165,6 @@ static int setup_adc_con(struct nexell_adc_info *adc)
return 0;
}
-/* you must irq re-enable after sampling */
static void nexell_adc_v1_ch_start(void __iomem *reg, int ch)
{
unsigned int adcon = 0;
@@ -177,7 +176,6 @@ static void nexell_adc_v1_ch_start(void __iomem *reg, int ch)
adcon = readl(ADC_V1_CON(reg));
adcon |= ADC_V1_CON_ADEN; /* start */
- local_irq_disable();
writel(adcon, ADC_V1_CON(reg));
}
@@ -198,7 +196,6 @@ static int nexell_adc_v1_read_polling(struct nexell_adc_info *adc, int ch)
}
wait--;
}
- local_irq_enable();
if (wait == 0)
return -ETIMEDOUT;