diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2014-09-08 15:28:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-14 08:59:50 -0800 |
| commit | d2501bb0cf166503c427f13aeb73547ccecf66f5 (patch) | |
| tree | 7077149b0aee2e52be222fa28914bae106472fe3 /drivers | |
| parent | bb01842184bc89666819ee7dceb78c61505036ed (diff) | |
| download | linux-stable-d2501bb0cf166503c427f13aeb73547ccecf66f5.tar.gz linux-stable-d2501bb0cf166503c427f13aeb73547ccecf66f5.tar.bz2 linux-stable-d2501bb0cf166503c427f13aeb73547ccecf66f5.zip | |
mfd: ti_am335x_tscadc: Fix TSC resume
commit 6a71f38dd87f255a0586104ce2a14d5a3ddf3401 upstream.
In the resume path, the ADC invokes am335x_tsc_se_set_cache() with 0 as
the steps argument if continous mode is not in use. This in turn disables
all steps and so the TSC is not working until one ADC sampling is
performed.
This patch fixes it by writing the current cached mask instead of the
passed steps.
Fixes: 7ca6740cd1cd ("mfd: input: iio: ti_amm335x: Rework TSC/ADCA
synchronization")
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/ti_am335x_tscadc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c index e3076afe6b3c..e87a2485468f 100644 --- a/drivers/mfd/ti_am335x_tscadc.c +++ b/drivers/mfd/ti_am335x_tscadc.c @@ -58,7 +58,7 @@ void am335x_tsc_se_set_cache(struct ti_tscadc_dev *tsadc, u32 val) if (tsadc->adc_waiting) wake_up(&tsadc->reg_se_wait); else if (!tsadc->adc_in_use) - tscadc_writel(tsadc, REG_SE, val); + tscadc_writel(tsadc, REG_SE, tsadc->reg_se_cache); spin_unlock_irqrestore(&tsadc->reg_lock, flags); } |