mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: tglx@linutronix.de
Cc: john.stultz@linaro.org, linux-kernel@vger.kernel.org,
	arnd@arndb.de, Caesar Wang <wxt@rock-chips.com>,
	Heiko Stuebner <heiko@sntech.de>,
	linux-arm-kernel@lists.infradead.org (moderated
	list:ARM/Rockchip SoC...),
	linux-rockchip@lists.infradead.org (open list:ARM/Rockchip
	SoC...)
Subject: [PATCH 03/22] clocksource/drivers/rockchip: Make the driver more compatible
Date: Mon,  2 Nov 2015 13:56:31 +0100	[thread overview]
Message-ID: <1446469011-22710-3-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1446469011-22710-1-git-send-email-daniel.lezcano@linaro.org>

From: Caesar Wang <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>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 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 d3c1742..724c321 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


  parent reply	other threads:[~2015-11-02 13:05 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-02 12:56 [PATCH 01/22] clocksource/drivers/pistachio: Add the COMPILE_TEST option Daniel Lezcano
2015-11-02 12:56 ` [PATCH 02/22] clocksource/drivers/mediatek: " Daniel Lezcano
2015-11-02 12:56 ` Daniel Lezcano [this message]
2015-11-02 15:33   ` [PATCH 03/22] clocksource/drivers/rockchip: Make the driver more compatible Arnd Bergmann
2015-11-02 16:32     ` Daniel Lezcano
2015-11-02 21:44       ` Arnd Bergmann
2015-11-02 12:56 ` [PATCH 04/22] clocksource/drivers/rockchip: Add COMPILE_TEST option Daniel Lezcano
2015-11-02 12:56 ` [PATCH 05/22] clocksource/drivers/armada-370-xp: Add the " Daniel Lezcano
2015-11-02 12:56 ` [PATCH 06/22] clocksource/drivers/meson6: " Daniel Lezcano
2015-11-02 12:56 ` [PATCH 07/22] clocksource/drivers/orion: " Daniel Lezcano
2015-11-02 12:56 ` [PATCH 08/22] clocksource/drivers/digicolor: " Daniel Lezcano
2015-11-02 12:56 ` [PATCH 09/22] clocksource/drivers/dw_apb: " Daniel Lezcano
2015-11-02 12:56 ` [PATCH 10/22] clocksource/drivers/sun4i: " Daniel Lezcano
2015-11-02 12:56 ` [PATCH 11/22] clocksource/drivers/sun5i: " Daniel Lezcano
2015-11-02 12:56 ` [PATCH 12/22] clocksource/drivers/tegra2: " Daniel Lezcano
2015-11-02 12:56 ` [PATCH 13/22] clocksource/drivers/vt8500: Remove unneeded header Daniel Lezcano
2015-11-02 12:56 ` [PATCH 14/22] clocksource/drivers/vt8500: Add the COMPILE_TEST option Daniel Lezcano
2015-11-02 12:56 ` [PATCH 15/22] clocksource/drivers/cadence_ttc: " Daniel Lezcano
2015-11-02 12:56 ` [PATCH 16/22] clocksource/drivers/asm9260: " Daniel Lezcano
2015-11-02 12:56 ` [PATCH 17/22] clocksource/drivers/lpc32xx: " Daniel Lezcano
2015-11-02 12:56 ` [PATCH 18/22] clocksource/drivers/nomadik_mtu: " Daniel Lezcano
2015-11-02 12:56 ` [PATCH 19/22] clocksource/drivers/prcmu: Fix Kconfig and add " Daniel Lezcano
2015-11-02 14:40   ` Linus Walleij
2015-11-02 14:57     ` Daniel Lezcano
2015-11-02 12:56 ` [PATCH 20/22] clocksource/drivers/exynos_mct: " Daniel Lezcano
2015-11-03  0:30   ` Krzysztof Kozlowski
2015-11-03  0:59     ` Krzysztof Kozlowski
2015-11-03  8:40       ` Daniel Lezcano
2015-11-03 10:02         ` Arnd Bergmann
2015-11-03 11:08           ` Daniel Lezcano
2015-11-03 12:01           ` Krzysztof Kozlowski
2015-11-03 12:04             ` Daniel Lezcano
2015-11-03 15:18           ` John Stultz
2015-11-03  0:54   ` Chanwoo Choi
2015-11-02 12:56 ` [PATCH 21/22] clocksource/drivers/samsung-pwm: Add the " Daniel Lezcano
2015-11-02 12:56 ` [PATCH 22/22] clocksource/drivers/fsl-ftm: " Daniel Lezcano

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=1446469011-22710-3-git-send-email-daniel.lezcano@linaro.org \
    --to=daniel.lezcano@linaro.org \
    --cc=arnd@arndb.de \
    --cc=heiko@sntech.de \
    --cc=john.stultz@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=tglx@linutronix.de \
    --cc=wxt@rock-chips.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®