From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754684AbbAOQjM (ORCPT ); Thu, 15 Jan 2015 11:39:12 -0500 Received: from mail-we0-f178.google.com ([74.125.82.178]:51212 "EHLO mail-we0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753242AbbAOQjK (ORCPT ); Thu, 15 Jan 2015 11:39:10 -0500 Message-ID: <54B7ED29.9060700@linaro.org> Date: Thu, 15 Jan 2015 17:39:05 +0100 From: Daniel Lezcano User-Agent: Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Alexandre Belloni , Nicolas Ferre CC: Boris Brezillon , Jean-Christophe Plagniol-Villard , Thomas Gleixner , Samuel Ortiz , Lee Jones , Wim Van Sebroeck , Guenter Roeck , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-watchdog@vger.kernel.org Subject: Re: [PATCH v3 5/8] ARM: at91: move the restart function to the system timer driver References: <1421077023-30954-1-git-send-email-alexandre.belloni@free-electrons.com> <1421077023-30954-6-git-send-email-alexandre.belloni@free-electrons.com> In-Reply-To: <1421077023-30954-6-git-send-email-alexandre.belloni@free-electrons.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/12/2015 04:37 PM, Alexandre Belloni wrote: > Restarting on an at91rm9200 is handled by using the system timer. Move that > function to the system timer driver. > > Signed-off-by: Alexandre Belloni > Acked-by: Boris Brezillon > --- > arch/arm/mach-at91/at91rm9200.c | 11 ----------- > drivers/clocksource/timer-atmel-st.c | 12 ++++++++++++ > 2 files changed, 12 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c > index b52916947535..4ea889cd6091 100644 > --- a/arch/arm/mach-at91/at91rm9200.c > +++ b/arch/arm/mach-at91/at91rm9200.c > @@ -15,7 +15,6 @@ > > #include > #include > -#include > #include > > #include "soc.h" > @@ -30,15 +29,6 @@ static void at91rm9200_idle(void) > at91_pmc_write(AT91_PMC_SCDR, AT91_PMC_PCK); > } > > -static void at91rm9200_restart(enum reboot_mode reboot_mode, const char *cmd) > -{ > - /* > - * Perform a hardware reset with the use of the Watchdog timer. > - */ > - at91_st_write(AT91_ST_WDMR, AT91_ST_RSTEN | AT91_ST_EXTEN | 1); > - at91_st_write(AT91_ST_CR, AT91_ST_WDRST); > -} > - > /* -------------------------------------------------------------------- > * AT91RM9200 processor initialization > * -------------------------------------------------------------------- */ > @@ -51,7 +41,6 @@ static void __init at91rm9200_map_io(void) > static void __init at91rm9200_initialize(void) > { > arm_pm_idle = at91rm9200_idle; > - arm_pm_restart = at91rm9200_restart; > } > > > diff --git a/drivers/clocksource/timer-atmel-st.c b/drivers/clocksource/timer-atmel-st.c > index 51761f8927b7..522583d6cc78 100644 > --- a/drivers/clocksource/timer-atmel-st.c > +++ b/drivers/clocksource/timer-atmel-st.c > @@ -29,6 +29,7 @@ > #include > > #include > +#include > > #include > #include > @@ -180,6 +181,15 @@ static struct clock_event_device clkevt = { > .set_mode = clkevt32k_mode, > }; > > +static void at91rm9200_restart(enum reboot_mode reboot_mode, const char *cmd) > +{ > + /* > + * Perform a hardware reset with the use of the Watchdog timer. > + */ > + at91_st_write(AT91_ST_WDMR, AT91_ST_RSTEN | AT91_ST_EXTEN | 1); > + at91_st_write(AT91_ST_CR, AT91_ST_WDRST); > +} > + > void __iomem *at91_st_base; > EXPORT_SYMBOL_GPL(at91_st_base); > > @@ -248,4 +258,6 @@ void __init at91rm9200_timer_init(void) > > /* register clocksource */ > clocksource_register_hz(&clk32k, AT91_SLOW_CLOCK); > + > + arm_pm_restart = at91rm9200_restart; > } Mmh, I can't clearly explain why but I have a problem with that. Can you explain why restart code falls in the clockevents driver ? -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog