| Message ID | 20210902215144.507243-21-miquel.raynal@bootlin.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | TI AM437X ADC1 | expand |
On Thu, 2 Sep 2021 23:51:18 +0200 Miquel Raynal <miquel.raynal@bootlin.com> wrote: > The idle register is valid no matter if the touchscreen is used or not, > let's always configure it. > > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> With the earlier reorganization this now obviously only doing what you say. Thanks for tidying that up. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/mfd/ti_am335x_tscadc.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c > index 4a24fc1141cf..5f189da99468 100644 > --- a/drivers/mfd/ti_am335x_tscadc.c > +++ b/drivers/mfd/ti_am335x_tscadc.c > @@ -223,16 +223,16 @@ static int ti_tscadc_probe(struct platform_device *pdev) > ctrl = CNTRLREG_STEPCONFIGWRT | CNTRLREG_STEPID; > regmap_write(tscadc->regmap, REG_CTRL, ctrl); > > - /* Set register bits for Idle Config Mode */ > if (tsc_wires > 0) { > tscadc->tsc_wires = tsc_wires; > if (tsc_wires == 5) > ctrl |= CNTRLREG_5WIRE | CNTRLREG_TSCENB; > else > ctrl |= CNTRLREG_4WIRE | CNTRLREG_TSCENB; > - tscadc_idle_config(tscadc); > } > > + tscadc_idle_config(tscadc); > + > /* Enable the TSC module enable bit */ > ctrl |= CNTRLREG_TSCSSENB; > regmap_write(tscadc->regmap, REG_CTRL, ctrl); > @@ -323,8 +323,10 @@ static int __maybe_unused tscadc_resume(struct device *dev) > ctrl |= CNTRLREG_5WIRE | CNTRLREG_TSCENB; > else > ctrl |= CNTRLREG_4WIRE | CNTRLREG_TSCENB; > - tscadc_idle_config(tscadc); > } > + > + tscadc_idle_config(tscadc); > + > ctrl |= CNTRLREG_TSCSSENB; > regmap_write(tscadc->regmap, REG_CTRL, ctrl); >
diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c index 4a24fc1141cf..5f189da99468 100644 --- a/drivers/mfd/ti_am335x_tscadc.c +++ b/drivers/mfd/ti_am335x_tscadc.c @@ -223,16 +223,16 @@ static int ti_tscadc_probe(struct platform_device *pdev) ctrl = CNTRLREG_STEPCONFIGWRT | CNTRLREG_STEPID; regmap_write(tscadc->regmap, REG_CTRL, ctrl); - /* Set register bits for Idle Config Mode */ if (tsc_wires > 0) { tscadc->tsc_wires = tsc_wires; if (tsc_wires == 5) ctrl |= CNTRLREG_5WIRE | CNTRLREG_TSCENB; else ctrl |= CNTRLREG_4WIRE | CNTRLREG_TSCENB; - tscadc_idle_config(tscadc); } + tscadc_idle_config(tscadc); + /* Enable the TSC module enable bit */ ctrl |= CNTRLREG_TSCSSENB; regmap_write(tscadc->regmap, REG_CTRL, ctrl); @@ -323,8 +323,10 @@ static int __maybe_unused tscadc_resume(struct device *dev) ctrl |= CNTRLREG_5WIRE | CNTRLREG_TSCENB; else ctrl |= CNTRLREG_4WIRE | CNTRLREG_TSCENB; - tscadc_idle_config(tscadc); } + + tscadc_idle_config(tscadc); + ctrl |= CNTRLREG_TSCSSENB; regmap_write(tscadc->regmap, REG_CTRL, ctrl);
The idle register is valid no matter if the touchscreen is used or not, let's always configure it. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- drivers/mfd/ti_am335x_tscadc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)