All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Horman <horms@verge.net.au>
To: linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set
Date: Tue, 27 Jan 2015 00:27:49 +0000	[thread overview]
Message-ID: <20150127002748.GA29710@verge.net.au> (raw)
In-Reply-To: <1422289274-20605-1-git-send-email-geert+renesas@glider.be>

On Mon, Jan 26, 2015 at 05:21:14PM +0100, Geert Uytterhoeven wrote:
> Since commit e042681894b62d60 ("ARM: shmobile: r8a7790: Remove legacy
> code"), all R-Car Gen2 SoCs are supported by multiplatform kernels only.
> As CONFIG_COMMON_CLK is always set for multiplatform kernels, we can
> remove related #ifdefs in code specific to R-Car Gen2 SoCs.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> Depends on renesas-lager-board-removal-for-v3.20

Thanks, I have queued this up in the soc-for-v3.21 branch.

> ---
>  arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> index e2b9bb46393d898d..aa3339258d9c0232 100644
> --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
> +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> @@ -51,9 +51,7 @@ u32 rcar_gen2_read_mode_pins(void)
>  
>  void __init rcar_gen2_timer_init(void)
>  {
> -#if defined(CONFIG_ARM_ARCH_TIMER) || defined(CONFIG_COMMON_CLK)
>  	u32 mode = rcar_gen2_read_mode_pins();
> -#endif
>  #ifdef CONFIG_ARM_ARCH_TIMER
>  	void __iomem *base;
>  	int extal_mhz = 0;
> @@ -129,9 +127,7 @@ void __init rcar_gen2_timer_init(void)
>  	iounmap(base);
>  #endif /* CONFIG_ARM_ARCH_TIMER */
>  
> -#ifdef CONFIG_COMMON_CLK
>  	rcar_gen2_clocks_init(mode);
> -#endif
>  	clocksource_of_init();
>  }
>  
> -- 
> 1.9.1
> 

WARNING: multiple messages have this Message-ID (diff)
From: horms@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set
Date: Tue, 27 Jan 2015 09:27:49 +0900	[thread overview]
Message-ID: <20150127002748.GA29710@verge.net.au> (raw)
In-Reply-To: <1422289274-20605-1-git-send-email-geert+renesas@glider.be>

On Mon, Jan 26, 2015 at 05:21:14PM +0100, Geert Uytterhoeven wrote:
> Since commit e042681894b62d60 ("ARM: shmobile: r8a7790: Remove legacy
> code"), all R-Car Gen2 SoCs are supported by multiplatform kernels only.
> As CONFIG_COMMON_CLK is always set for multiplatform kernels, we can
> remove related #ifdefs in code specific to R-Car Gen2 SoCs.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> Depends on renesas-lager-board-removal-for-v3.20

Thanks, I have queued this up in the soc-for-v3.21 branch.

> ---
>  arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> index e2b9bb46393d898d..aa3339258d9c0232 100644
> --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
> +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> @@ -51,9 +51,7 @@ u32 rcar_gen2_read_mode_pins(void)
>  
>  void __init rcar_gen2_timer_init(void)
>  {
> -#if defined(CONFIG_ARM_ARCH_TIMER) || defined(CONFIG_COMMON_CLK)
>  	u32 mode = rcar_gen2_read_mode_pins();
> -#endif
>  #ifdef CONFIG_ARM_ARCH_TIMER
>  	void __iomem *base;
>  	int extal_mhz = 0;
> @@ -129,9 +127,7 @@ void __init rcar_gen2_timer_init(void)
>  	iounmap(base);
>  #endif /* CONFIG_ARM_ARCH_TIMER */
>  
> -#ifdef CONFIG_COMMON_CLK
>  	rcar_gen2_clocks_init(mode);
> -#endif
>  	clocksource_of_init();
>  }
>  
> -- 
> 1.9.1
> 

  parent reply	other threads:[~2015-01-27  0:27 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-26 16:21 [PATCH] ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set Geert Uytterhoeven
2015-01-26 16:21 ` Geert Uytterhoeven
2015-01-26 16:44 ` Sergei Shtylyov
2015-01-26 16:44   ` Sergei Shtylyov
2015-01-26 17:45   ` Geert Uytterhoeven
2015-01-26 17:45     ` Geert Uytterhoeven
2015-01-27  0:27 ` Simon Horman [this message]
2015-01-27  0:27   ` Simon Horman

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=20150127002748.GA29710@verge.net.au \
    --to=horms@verge.net.au \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.