Skip to content

Commit

Permalink
mfd: ti_am335x_tscadc: Fix TSC resume
Browse files Browse the repository at this point in the history
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: 7ca6740 ("mfd: input: iio: ti_amm335x: Rework TSC/ADCA
synchronization")
Cc: stable@vger.kernel.org # v3.13+
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
  • Loading branch information
Sebastian Andrzej Siewior authored and Lee Jones committed Sep 26, 2014
1 parent 0b496b4 commit 6a71f38
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/mfd/ti_am335x_tscadc.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,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);
}
Expand Down

0 comments on commit 6a71f38

Please sign in to comment.