summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2014-01-21 12:26:55 +0400
committerLee Jones <lee.jones@linaro.org>2014-01-21 12:26:55 +0400
commit28b4c2948fe005da0f70d492f59593f862b3f773 (patch)
treef45d67d4dd230bdfffdb9fa93eea32913bf14c96 /drivers/input
parent09fd19da0074b86030a00303522b2ba63a4399b7 (diff)
parent7ca6740cd1cd410828a01151a044b51910d06eff (diff)
downloadlinux-28b4c2948fe005da0f70d492f59593f862b3f773.tar.xz
Merge tag 'ib-iio-input-3.13-1' into for-mfd-next
Immutable branch for IIO and Input
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/ti_am335x_tsc.c4
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)
/* The steps1 … end and bit 0 for TS_Charge */
stepenable = (1 << (end_step + 2)) - 1;
ts_dev->step_mask = stepenable;
- am335x_tsc_se_set(ts_dev->mfd_tscadc, ts_dev->step_mask);
+ am335x_tsc_se_set_cache(ts_dev->mfd_tscadc, ts_dev->step_mask);
}
static void titsc_read_coordinates(struct titsc *ts_dev,
@@ -322,7 +322,7 @@ static irqreturn_t titsc_irq(int irq, void *dev)
if (irqclr) {
titsc_writel(ts_dev, REG_IRQSTATUS, irqclr);
- am335x_tsc_se_set(ts_dev->mfd_tscadc, ts_dev->step_mask);
+ am335x_tsc_se_set_cache(ts_dev->mfd_tscadc, ts_dev->step_mask);
return IRQ_HANDLED;
}
return IRQ_NONE;