From: Caesar Wang <wxt@rock-chips.com>
To: heiko@sntech.de, daniel.lezcano@linaro.org, will.deacon@arm.com,
catalin.marinas@arm.com
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-rockchip@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
Caesar Wang <wxt@rock-chips.com>
Subject: [PATCH v2 1/4] clocksource: rockchip: Make the driver more compatible
Date: Fri, 25 Sep 2015 10:14:55 +0800 [thread overview]
Message-ID: <1443147298-12603-2-git-send-email-wxt@rock-chips.com> (raw)
In-Reply-To: <1443147298-12603-1-git-send-email-wxt@rock-chips.com>
Build the arm64 SoCs (e.g.: RK3368) on Rockchip platform,
There are some failure with build up on timer driver for rockchip.
Says:
/tmp/ccdAnNy5.s:47: Error: missing immediate expression at operand 1 --
`dsb`
...
The problem was different semantics of dsb on btw arm32 and arm64,
Here we can convert the dsb with insteading of dsb(sy).The "sy" param
is the default which you are allow to omit, so on arm32 dsb()and dsb(sy)
are the same.
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
---
Changes in v2:
- As Heiko/Daniel comments, let's split it into two patch.
Changes in v1:
- As Russell, Thomas, Daniel comments, let's replace NO_IRQ by '!irq'.
drivers/clocksource/rockchip_timer.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/clocksource/rockchip_timer.c b/drivers/clocksource/rockchip_timer.c
index bb2c2b0..3ace7ac 100644
--- a/drivers/clocksource/rockchip_timer.c
+++ b/drivers/clocksource/rockchip_timer.c
@@ -49,14 +49,14 @@ static inline void __iomem *rk_base(struct clock_event_device *ce)
static inline void rk_timer_disable(struct clock_event_device *ce)
{
writel_relaxed(TIMER_DISABLE, rk_base(ce) + TIMER_CONTROL_REG);
- dsb();
+ dsb(sy);
}
static inline void rk_timer_enable(struct clock_event_device *ce, u32 flags)
{
writel_relaxed(TIMER_ENABLE | TIMER_INT_UNMASK | flags,
rk_base(ce) + TIMER_CONTROL_REG);
- dsb();
+ dsb(sy);
}
static void rk_timer_update_counter(unsigned long cycles,
@@ -64,13 +64,13 @@ static void rk_timer_update_counter(unsigned long cycles,
{
writel_relaxed(cycles, rk_base(ce) + TIMER_LOAD_COUNT0);
writel_relaxed(0, rk_base(ce) + TIMER_LOAD_COUNT1);
- dsb();
+ dsb(sy);
}
static void rk_timer_interrupt_clear(struct clock_event_device *ce)
{
writel_relaxed(1, rk_base(ce) + TIMER_INT_STATUS);
- dsb();
+ dsb(sy);
}
static inline int rk_timer_set_next_event(unsigned long cycles,
--
1.9.1
next prev parent reply other threads:[~2015-09-25 2:15 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-25 2:14 [PATCH v2 0/4] Support the timer on RK3368 SoC Caesar Wang
2015-09-25 2:14 ` Caesar Wang [this message]
2015-09-29 4:18 ` [PATCH v2 1/4] clocksource: rockchip: Make the driver more compatible Daniel Lezcano
2015-09-30 19:14 ` Heiko Stübner
2015-10-30 3:43 ` Caesar Wang
2015-10-30 10:42 ` Daniel Lezcano
2015-10-30 23:47 ` Heiko Stuebner
2015-10-31 13:04 ` Daniel Lezcano
2015-11-02 17:28 ` Daniel Lezcano
2015-11-03 2:00 ` Caesar Wang
2015-11-03 8:32 ` Daniel Lezcano
2015-11-03 9:59 ` Caesar Wang
2015-09-25 2:14 ` [PATCH v2 2/4] clocksource: rockchip: trivial: Make the driver more readability Caesar Wang
2015-09-29 4:18 ` Daniel Lezcano
2015-09-25 2:14 ` [PATCH v2 3/4] arm64: Enable the timer on Rockchip architecture Caesar Wang
2016-01-25 13:51 ` Heiko Stübner
2015-09-25 2:14 ` [PATCH v2 4/4] arm64: dts: rockchip: Add the needed timer for RK3368 SoC Caesar Wang
2015-12-13 0:47 ` Heiko Stübner
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=1443147298-12603-2-git-send-email-wxt@rock-chips.com \
--to=wxt@rock-chips.com \
--cc=catalin.marinas@arm.com \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=will.deacon@arm.com \
/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
all inboxes | Powered by JetHome®