diff options
author | Lee Jones <lee.jones@linaro.org> | 2014-01-21 03:26:55 -0500 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2014-01-21 03:26:55 -0500 |
commit | 28b4c2948fe005da0f70d492f59593f862b3f773 (patch) | |
tree | f45d67d4dd230bdfffdb9fa93eea32913bf14c96 /drivers/input/touchscreen | |
parent | 09fd19da0074b86030a00303522b2ba63a4399b7 (diff) | |
parent | 7ca6740cd1cd410828a01151a044b51910d06eff (diff) |
Merge tag 'ib-iio-input-3.13-1' into for-mfd-next
Immutable branch for IIO and Input
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r-- | drivers/input/touchscreen/ti_am335x_tsc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c index 68beadaabceb..2ca5a7bee04e 100644 --- a/drivers/input/touchscreen/ti_am335x_tsc.c +++ b/drivers/input/touchscreen/ti_am335x_tsc.c | |||
@@ -198,7 +198,7 @@ static void titsc_step_config(struct titsc *ts_dev) | |||
198 | /* The steps1 … end and bit 0 for TS_Charge */ | 198 | /* The steps1 … end and bit 0 for TS_Charge */ |
199 | stepenable = (1 << (end_step + 2)) - 1; | 199 | stepenable = (1 << (end_step + 2)) - 1; |
200 | ts_dev->step_mask = stepenable; | 200 | ts_dev->step_mask = stepenable; |
201 | am335x_tsc_se_set(ts_dev->mfd_tscadc, ts_dev->step_mask); | 201 | am335x_tsc_se_set_cache(ts_dev->mfd_tscadc, ts_dev->step_mask); |
202 | } | 202 | } |
203 | 203 | ||
204 | static void titsc_read_coordinates(struct titsc *ts_dev, | 204 | static void titsc_read_coordinates(struct titsc *ts_dev, |
@@ -322,7 +322,7 @@ static irqreturn_t titsc_irq(int irq, void *dev) | |||
322 | 322 | ||
323 | if (irqclr) { | 323 | if (irqclr) { |
324 | titsc_writel(ts_dev, REG_IRQSTATUS, irqclr); | 324 | titsc_writel(ts_dev, REG_IRQSTATUS, irqclr); |
325 | am335x_tsc_se_set(ts_dev->mfd_tscadc, ts_dev->step_mask); | 325 | am335x_tsc_se_set_cache(ts_dev->mfd_tscadc, ts_dev->step_mask); |
326 | return IRQ_HANDLED; | 326 | return IRQ_HANDLED; |
327 | } | 327 | } |
328 | return IRQ_NONE; | 328 | return IRQ_NONE; |