aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/Kconfig2
-rw-r--r--drivers/input/touchscreen/Kconfig2
-rw-r--r--drivers/input/touchscreen/ti_am335x_tsc.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 5f4967d01bc3..e2413acbbb16 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -168,7 +168,7 @@ config INPUT_MAX8997_HAPTIC
168 168
169config INPUT_MC13783_PWRBUTTON 169config INPUT_MC13783_PWRBUTTON
170 tristate "MC13783 ON buttons" 170 tristate "MC13783 ON buttons"
171 depends on MFD_MC13783 171 depends on MFD_MC13XXX
172 help 172 help
173 Support the ON buttons of MC13783 PMIC as an input device 173 Support the ON buttons of MC13783 PMIC as an input device
174 reporting power button status. 174 reporting power button status.
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 961d58d32647..07e9e82029d1 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -717,7 +717,7 @@ config TOUCHSCREEN_USB_COMPOSITE
717 717
718config TOUCHSCREEN_MC13783 718config TOUCHSCREEN_MC13783
719 tristate "Freescale MC13783 touchscreen input driver" 719 tristate "Freescale MC13783 touchscreen input driver"
720 depends on MFD_MC13783 720 depends on MFD_MC13XXX
721 help 721 help
722 Say Y here if you have an Freescale MC13783 PMIC on your 722 Say Y here if you have an Freescale MC13783 PMIC on your
723 board and want to use its touchscreen 723 board and want to use its touchscreen
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
204static void titsc_read_coordinates(struct titsc *ts_dev, 204static 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;