From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752060AbbCFIrc (ORCPT ); Fri, 6 Mar 2015 03:47:32 -0500 Received: from down.free-electrons.com ([37.187.137.238]:35352 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750728AbbCFIra (ORCPT ); Fri, 6 Mar 2015 03:47:30 -0500 Date: Fri, 6 Mar 2015 09:47:27 +0100 From: Alexandre Belloni To: Daniel Lezcano Cc: Nicolas Ferre , Boris Brezillon , Jean-Christophe Plagniol-Villard , Thomas Gleixner , Lee Jones , Wim Van Sebroeck , Guenter Roeck , Sebastian Reichel , Dmitry Eremin-Solenikov , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-watchdog@vger.kernel.org, linux-pm@vger.kernel.org Subject: Re: [PATCH v4 8/9] clocksource: atmel-st: use syscon/regmap Message-ID: <20150306084727.GH3989@piout.net> References: <1425570594-13124-1-git-send-email-alexandre.belloni@free-electrons.com> <1425570594-13124-9-git-send-email-alexandre.belloni@free-electrons.com> <54F96896.6040204@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <54F96896.6040204@linaro.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06/03/2015 at 09:43:02 +0100, Daniel Lezcano wrote : > On 03/05/2015 04:49 PM, Alexandre Belloni wrote: > >The register range from the system timer is also used by the watchdog driver. > >Use a regmap to handle concurrent accesses. > > > >Signed-off-by: Alexandre Belloni > >Acked-by: Boris Brezillon > >--- > > drivers/clocksource/timer-atmel-st.c | 99 ++++++++++++++---------------------- > > 1 file changed, 37 insertions(+), 62 deletions(-) > > > >diff --git a/drivers/clocksource/timer-atmel-st.c b/drivers/clocksource/timer-atmel-st.c > >index 7d062ab32674..c4a52e32675e 100644 > >--- a/drivers/clocksource/timer-atmel-st.c > >+++ b/drivers/clocksource/timer-atmel-st.c > >@@ -24,19 +24,19 @@ > > #include > > #include > > #include > >-#include > >-#include > >+#include > >+#include > > #include > >+#include > > > > #include > > > >-#include > >-#include > >- > > static unsigned long last_crtr; > > static u32 irqmask; > > static struct clock_event_device clkevt; > >+static struct regmap *regmap_st; > > > >+#define AT91_SLOW_CLOCK 32768 > > #define RM9200_TIMER_LATCH ((AT91_SLOW_CLOCK + HZ/2) / HZ) > > > > /* > >@@ -46,11 +46,11 @@ static struct clock_event_device clkevt; > > */ > > static inline unsigned long read_CRTR(void) > > { > >- unsigned long x1, x2; > >+ unsigned int x1, x2; > > > >- x1 = at91_st_read(AT91_ST_CRTR); > >+ regmap_read(regmap_st, AT91_ST_CRTR, &x1); > > do { > >- x2 = at91_st_read(AT91_ST_CRTR); > >+ regmap_read(regmap_st, AT91_ST_CRTR, &x2); > > if (x1 == x2) > > break; > > x1 = x2; > >@@ -63,7 +63,10 @@ static inline unsigned long read_CRTR(void) > > */ > > static irqreturn_t at91rm9200_timer_interrupt(int irq, void *dev_id) > > { > >- u32 sr = at91_st_read(AT91_ST_SR) & irqmask; > >+ u32 sr; > >+ > >+ regmap_read(regmap_st, AT91_ST_SR, &sr); > >+ sr &= irqmask; > > > > /* > > * irqs should be disabled here, but as the irq is shared they are only > >@@ -96,7 +99,7 @@ static struct irqaction at91rm9200_timer_irq = { > > .name = "at91_tick", > > .flags = IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL, > > .handler = at91rm9200_timer_interrupt, > >- .irq = NR_IRQS_LEGACY + AT91_ID_SYS, > >+ .irq = 0, > > Is this change related to regmap ? > It is related to the removing of hardware.h. I can do that in a separate patch if you prefer. > By the way, perhaps take the opportunity to replace setup_irq by request_irq > (and check the return value) ? > I tried and it fails, I didn't investigate yet. -- Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com