[PATCH 6/6] ARM: at91: move at91rm9200_idle() to clk/at91/pmc.c

[mturquette@linaro.org (Mike Turquette)]

Quoting Alexandre Belloni (2015-01-12 13:23:45)
> Move at91rm9200_idle() along with at91sam9_idle() in clk/at91/pmc.c.
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
> Cc: Mike Turquette <mturquette@linaro.org>

Acked-by: Michael Turquette <mturquette@linaro.org>

> 
> Mike, Boris,
> I guess that one can go through the at91 tree unless you have any objections.
> 
>  arch/arm/mach-at91/at91rm9200.c | 9 ---------
>  arch/arm/mach-at91/generic.h    | 1 +
>  drivers/clk/at91/pmc.c          | 9 +++++++++
>  3 files changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
> index fc7c26138037..3be1963f5c56 100644
> --- a/arch/arm/mach-at91/at91rm9200.c
> +++ b/arch/arm/mach-at91/at91rm9200.c
> @@ -21,14 +21,6 @@
>  #include "soc.h"
>  #include "generic.h"
>  
> -static void at91rm9200_idle(void)
> -{
> -       /*
> -        * Disable the processor clock.  The processor will be automatically
> -        * re-enabled by an interrupt or by a reset.
> -        */
> -       at91_pmc_write(AT91_PMC_SCDR, AT91_PMC_PCK);
> -}
>  
>  static void at91rm9200_restart(enum reboot_mode reboot_mode, const char *cmd)
>  {
> @@ -49,7 +41,6 @@ static void __init at91rm9200_initialize(void)
>         arm_pm_restart = at91rm9200_restart;
>  }
>  
> -
>  AT91_SOC_START(at91rm9200)
>         .init = at91rm9200_initialize,
>  AT91_SOC_END
> diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
> index 18d5547f11d5..c4aa21fb765f 100644
> --- a/arch/arm/mach-at91/generic.h
> +++ b/arch/arm/mach-at91/generic.h
> @@ -25,6 +25,7 @@ extern void __init at91_dt_initialize(void);
>  extern void at91rm9200_timer_init(void);
>  
>  /* idle */
> +extern void at91rm9200_idle(void);
>  extern void at91sam9_idle(void);
>  
>  /* Matrix */
> diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c
> index 386999b4f8eb..f07c8152e5cc 100644
> --- a/drivers/clk/at91/pmc.c
> +++ b/drivers/clk/at91/pmc.c
> @@ -27,6 +27,15 @@
>  void __iomem *at91_pmc_base;
>  EXPORT_SYMBOL_GPL(at91_pmc_base);
>  
> +void at91rm9200_idle(void)
> +{
> +       /*
> +        * Disable the processor clock.  The processor will be automatically
> +        * re-enabled by an interrupt or by a reset.
> +        */
> +       at91_pmc_write(AT91_PMC_SCDR, AT91_PMC_PCK);
> +}
> +
>  void at91sam9_idle(void)
>  {
>         at91_pmc_write(AT91_PMC_SCDR, AT91_PMC_PCK);
> -- 
> 2.1.0
>