diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2013-12-19 10:28:29 -0500 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2014-01-07 03:41:15 -0500 |
commit | 7e170c6e4f7501bea900aa66b2b27a6ce5001e25 (patch) | |
tree | 76eea8291945b24d8bbbf215243f7239c9728a08 /drivers/mfd/ti_am335x_tscadc.c | |
parent | 3466bd2273b81a0a29d0e134ba1c78b64b84f40b (diff) |
mfd: ti_am335x_tscadc: Don't read back REG_SE
The purpose of reg_se_cache has been defeated. It should avoid the
read-back of the register to avoid the latency and the fact that the
bits are reset to 0 after the individual conversation took place.
The reason why this is required like this to work, is that read-back of
the register removes the bits of the ADC so they do not start another
conversation after the register is re-written from the TSC side for the
update.
To avoid the not required read-back I introduce a "set once" variant which
does not update the cache mask. After the conversation completes, the
bit is removed from the SE register anyway and we don't plan a new
conversation "any time soon". The current set function is renamed to
set_cache to distinguish the two operations.
This is a small preparation for a larger sync-rework.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/ti_am335x_tscadc.c')
-rw-r--r-- | drivers/mfd/ti_am335x_tscadc.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c index 67d0eb469a45..cb0c211fc7d8 100644 --- a/drivers/mfd/ti_am335x_tscadc.c +++ b/drivers/mfd/ti_am335x_tscadc.c | |||
@@ -53,24 +53,32 @@ static void am335x_tsc_se_update(struct ti_tscadc_dev *tsadc) | |||
53 | tscadc_writel(tsadc, REG_SE, tsadc->reg_se_cache); | 53 | tscadc_writel(tsadc, REG_SE, tsadc->reg_se_cache); |
54 | } | 54 | } |
55 | 55 | ||
56 | void am335x_tsc_se_set(struct ti_tscadc_dev *tsadc, u32 val) | 56 | void am335x_tsc_se_set_cache(struct ti_tscadc_dev *tsadc, u32 val) |
57 | { | 57 | { |
58 | unsigned long flags; | 58 | unsigned long flags; |
59 | 59 | ||
60 | spin_lock_irqsave(&tsadc->reg_lock, flags); | 60 | spin_lock_irqsave(&tsadc->reg_lock, flags); |
61 | tsadc->reg_se_cache = tscadc_readl(tsadc, REG_SE); | ||
62 | tsadc->reg_se_cache |= val; | 61 | tsadc->reg_se_cache |= val; |
63 | am335x_tsc_se_update(tsadc); | 62 | am335x_tsc_se_update(tsadc); |
64 | spin_unlock_irqrestore(&tsadc->reg_lock, flags); | 63 | spin_unlock_irqrestore(&tsadc->reg_lock, flags); |
65 | } | 64 | } |
66 | EXPORT_SYMBOL_GPL(am335x_tsc_se_set); | 65 | EXPORT_SYMBOL_GPL(am335x_tsc_se_set_cache); |
66 | |||
67 | void am335x_tsc_se_set_once(struct ti_tscadc_dev *tsadc, u32 val) | ||
68 | { | ||
69 | unsigned long flags; | ||
70 | |||
71 | spin_lock_irqsave(&tsadc->reg_lock, flags); | ||
72 | tscadc_writel(tsadc, REG_SE, tsadc->reg_se_cache | val); | ||
73 | spin_unlock_irqrestore(&tsadc->reg_lock, flags); | ||
74 | } | ||
75 | EXPORT_SYMBOL_GPL(am335x_tsc_se_set_once); | ||
67 | 76 | ||
68 | void am335x_tsc_se_clr(struct ti_tscadc_dev *tsadc, u32 val) | 77 | void am335x_tsc_se_clr(struct ti_tscadc_dev *tsadc, u32 val) |
69 | { | 78 | { |
70 | unsigned long flags; | 79 | unsigned long flags; |
71 | 80 | ||
72 | spin_lock_irqsave(&tsadc->reg_lock, flags); | 81 | spin_lock_irqsave(&tsadc->reg_lock, flags); |
73 | tsadc->reg_se_cache = tscadc_readl(tsadc, REG_SE); | ||
74 | tsadc->reg_se_cache &= ~val; | 82 | tsadc->reg_se_cache &= ~val; |
75 | am335x_tsc_se_update(tsadc); | 83 | am335x_tsc_se_update(tsadc); |
76 | spin_unlock_irqrestore(&tsadc->reg_lock, flags); | 84 | spin_unlock_irqrestore(&tsadc->reg_lock, flags); |