From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: tglx@linutronix.de
Cc: linux-kernel@vger.kernel.org, Anson Huang <Anson.Huang@nxp.com>
Subject: [PATCH 5/6] clocksource/drivers/imx-tpm: Correct some registers operation flow
Date: Tue, 3 Apr 2018 15:00:29 +0200 [thread overview]
Message-ID: <1522760432-32048-5-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1522760432-32048-1-git-send-email-daniel.lezcano@linaro.org>
From: Anson Huang <Anson.Huang@nxp.com>
According to i.MX7ULP reference manual, TPM_SC_CPWMS can ONLY be written when
counter is disabled, TPM_SC_TOF is write-1-clear, TPM_C0SC_CHF is also
write-1-clear, correct these registers initialization flow;
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/timer-imx-tpm.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/clocksource/timer-imx-tpm.c b/drivers/clocksource/timer-imx-tpm.c
index 3f97d49..7403e49 100644
--- a/drivers/clocksource/timer-imx-tpm.c
+++ b/drivers/clocksource/timer-imx-tpm.c
@@ -20,6 +20,7 @@
#define TPM_SC 0x10
#define TPM_SC_CMOD_INC_PER_CNT (0x1 << 3)
#define TPM_SC_CMOD_DIV_DEFAULT 0x3
+#define TPM_SC_TOF_MASK (0x1 << 7)
#define TPM_CNT 0x14
#define TPM_MOD 0x18
#define TPM_STATUS 0x1c
@@ -29,6 +30,7 @@
#define TPM_C0SC_MODE_SHIFT 2
#define TPM_C0SC_MODE_MASK 0x3c
#define TPM_C0SC_MODE_SW_COMPARE 0x4
+#define TPM_C0SC_CHF_MASK (0x1 << 7)
#define TPM_C0V 0x24
static void __iomem *timer_base;
@@ -205,9 +207,13 @@ static int __init tpm_timer_init(struct device_node *np)
* 4) Channel0 disabled
* 5) DMA transfers disabled
*/
+ /* make sure counter is disabled */
writel(0, timer_base + TPM_SC);
+ /* TOF is W1C */
+ writel(TPM_SC_TOF_MASK, timer_base + TPM_SC);
writel(0, timer_base + TPM_CNT);
- writel(0, timer_base + TPM_C0SC);
+ /* CHF is W1C */
+ writel(TPM_C0SC_CHF_MASK, timer_base + TPM_C0SC);
/* increase per cnt, div 8 by default */
writel(TPM_SC_CMOD_INC_PER_CNT | TPM_SC_CMOD_DIV_DEFAULT,
--
2.7.4
next prev parent reply other threads:[~2018-04-03 13:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-03 13:00 [GIT PULL] clockevents for 4.17 Daniel Lezcano
2018-04-03 13:00 ` [PATCH 1/6] dt-binding: timer: document NPCM7xx timer DT bindings Daniel Lezcano
2018-04-03 13:00 ` [PATCH 2/6] clocksource/drivers/npcm: Add NPCM7xx timer driver Daniel Lezcano
2018-04-03 13:00 ` [PATCH 3/6] dt-bindings: timer: tpm: fix typo of clock name Daniel Lezcano
2018-04-03 13:00 ` [PATCH 4/6] clocksource/drivers/imx-tpm: Fix " Daniel Lezcano
2018-04-03 13:00 ` Daniel Lezcano [this message]
2018-04-05 16:43 ` [PATCH 5/6] clocksource/drivers/imx-tpm: Correct some registers operation flow Sasha Levin
2018-04-03 13:00 ` [PATCH 6/6] clocksource/drivers/imx-tpm: Add different counter width support Daniel Lezcano
2018-04-16 8:44 ` [GIT PULL] clockevents for 4.17 Joel Stanley
[not found] ` <CAP6Zq1jdXj0f0WfWK-b1X0hW=LcyMhxcLchHDkfVk2Fhho_HVg@mail.gmail.com>
2018-04-30 14:54 ` Thomas Gleixner
2018-04-30 15:00 ` Thomas Gleixner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1522760432-32048-5-git-send-email-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=Anson.Huang@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome