[PATCH v2 22/46] mfd: ti_am335x_tscadc: Gather the ctrl register logic in one place

Miquel Raynal
2021-09-02T21:52:38Z

Instead of deriving in the probe and in the resume path the value of the
ctrl register, let's do it only once in the probe, save the value of
this register in the driver's structure and use it from the resume
callback.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
drivers/mfd/ti_am335x_tscadc.c | 33 ++++++++--------------------
include/linux/mfd/ti_am335x_tscadc.h | 2 +-
2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index 61f878c7593b..a3ff3cc29318 100644
--- a/drivers/mfd/ti_am335x_tscadc.c
+++ b/drivers/mfd/ti_am335x_tscadc.c
@@ -121,7 +121,7 @@ static int ti_tscadc_probe(struct platform_device *pdev)
struct property *prop;
const __be32 *cur;
u32 val;
- int err, ctrl;
+ int err;
int tsc_wires = 0, adc_channels = 0, cell_idx = 0, total_channels;
int readouts = 0;

@@ -220,21 +220,20 @@ static int ti_tscadc_probe(struct platform_device *pdev)
regmap_write(tscadc->regmap, REG_CLKDIV, tscadc->clk_div);

/* Set the control register bits */
- ctrl = CNTRLREG_STEPCONFIGWRT | CNTRLREG_STEPID;
+ tscadc->ctrl = CNTRLREG_STEPCONFIGWRT | CNTRLREG_STEPID;
if (tsc_wires > 0) {
- tscadc->tsc_wires = tsc_wires;
+ tscadc->ctrl |= CNTRLREG_TSCENB;
if (tsc_wires == 5)
- ctrl |= CNTRLREG_5WIRE | CNTRLREG_TSCENB;
+ tscadc->ctrl |= CNTRLREG_5WIRE;
else
- ctrl |= CNTRLREG_4WIRE | CNTRLREG_TSCENB;
+ tscadc->ctrl |= CNTRLREG_4WIRE;
}
- regmap_write(tscadc->regmap, REG_CTRL, ctrl);
+ regmap_write(tscadc->regmap, REG_CTRL, tscadc->ctrl);

tscadc_idle_config(tscadc);

/* Enable the TSC module enable bit */
- ctrl |= CNTRLREG_TSCSSENB;
- regmap_write(tscadc->regmap, REG_CTRL, ctrl);
+ regmap_write(tscadc->regmap, REG_CTRL, tscadc->ctrl | CNTRLREG_TSCSSENB);

/* TSC Cell */
if (tsc_wires > 0) {
@@ -309,27 +308,13 @@ static int __maybe_unused tscadc_suspend(struct device *dev)
static int __maybe_unused tscadc_resume(struct device *dev)
{
struct ti_tscadc_dev *tscadc = dev_get_drvdata(dev);
- u32 ctrl;

pm_runtime_get_sync(dev);

- /* context restore */
regmap_write(tscadc->regmap, REG_CLKDIV, tscadc->clk_div);
-
- ctrl = CNTRLREG_STEPCONFIGWRT | CNTRLREG_STEPID;
- if (tscadc->tsc_wires > 0) {
- if (tscadc->tsc_wires == 5)
- ctrl |= CNTRLREG_5WIRE | CNTRLREG_TSCENB;
- else
- ctrl |= CNTRLREG_4WIRE | CNTRLREG_TSCENB;
- }
-
- regmap_write(tscadc->regmap, REG_CTRL, ctrl);
-
+ regmap_write(tscadc->regmap, REG_CTRL, tscadc->ctrl);
tscadc_idle_config(tscadc);
-
- ctrl |= CNTRLREG_TSCSSENB;
- regmap_write(tscadc->regmap, REG_CTRL, ctrl);
+ regmap_write(tscadc->regmap, REG_CTRL, tscadc->ctrl | CNTRLREG_TSCSSENB);

return 0;
}
diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h
index e734fb97dff8..02963b6ebbac 100644
--- a/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@ -177,8 +177,8 @@ struct ti_tscadc_dev {
phys_addr_t tscadc_phys_base;
const struct ti_tscadc_data *data;
int irq;
- int tsc_wires;
struct mfd_cell cells[TSCADC_CELLS];
+ u32 ctrl;
u32 reg_se_cache;
bool adc_waiting;
bool adc_in_use;
--
2.27.0