From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Horman Date: Tue, 27 Jan 2015 00:27:49 +0000 Subject: Re: [PATCH] ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set Message-Id: <20150127002748.GA29710@verge.net.au> List-Id: References: <1422289274-20605-1-git-send-email-geert+renesas@glider.be> In-Reply-To: <1422289274-20605-1-git-send-email-geert+renesas@glider.be> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-arm-kernel@lists.infradead.org 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 > --- > 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 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: horms@verge.net.au (Simon Horman) Date: Tue, 27 Jan 2015 09:27:49 +0900 Subject: [PATCH] ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set In-Reply-To: <1422289274-20605-1-git-send-email-geert+renesas@glider.be> References: <1422289274-20605-1-git-send-email-geert+renesas@glider.be> Message-ID: <20150127002748.GA29710@verge.net.au> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 > --- > 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 >