input: ti_am33x_tsc: Step enable bits made configurable

Current code has hard coded value written to
step enable bits. Now the bits are updated based
on how many steps are needed to be configured got
from platform data.

The user needs to take care not to exceed
the count more than 16. While using ADC and TSC
one should take care to set this parameter correctly.

Sebastian added the common lock and moved the code, that manipulates the
steps, from into the mfd module.

Signed-off-by: Patil, Rachna <rachna@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c
index 16077d3d80ba..23d6a4dacc88 100644
--- a/drivers/input/touchscreen/ti_am335x_tsc.c
+++ b/drivers/input/touchscreen/ti_am335x_tsc.c
@@ -57,6 +57,7 @@ static void titsc_writel(struct titsc *tsc, unsigned int reg,
 static void titsc_step_config(struct titsc *ts_dev)
 {
         unsigned int    config;
+        unsigned int    stepenable = 0;
         int i, total_steps;
 
         /* Configure the Step registers */
@@ -128,7 +129,9 @@ static void titsc_step_config(struct titsc *ts_dev)
         titsc_writel(ts_dev, REG_STEPDELAY(total_steps + 2),
                         STEPCONFIG_OPENDLY);
 
-        titsc_writel(ts_dev, REG_SE, STPENB_STEPENB_TC);
+        /* The steps1 … end and bit 0 for TS_Charge */
+        stepenable = (1 << (total_steps + 2)) - 1;
+        am335x_tsc_se_set(ts_dev->mfd_tscadc, stepenable);
 }
 
 static void titsc_read_coordinates(struct titsc *ts_dev,
@@ -250,7 +253,7 @@ static irqreturn_t titsc_irq(int irq, void *dev)
 
         titsc_writel(ts_dev, REG_IRQSTATUS, irqclr);
 
-        titsc_writel(ts_dev, REG_SE, STPENB_STEPENB_TC);
+        am335x_tsc_se_update(ts_dev->mfd_tscadc);
         return IRQ_HANDLED;
 }
 
@@ -334,6 +337,11 @@ static int titsc_remove(struct platform_device *pdev)
 
         free_irq(ts_dev->irq, ts_dev);
 
+        /* total steps followed by the enable mask */
+        steps = 2 * ts_dev->steps_to_configure + 2;
+        steps = (1 << steps) - 1;
+        am335x_tsc_se_clr(ts_dev->mfd_tscadc, steps);
+
         input_unregister_device(ts_dev->input);
 
         platform_set_drvdata(pdev, NULL);