* [PATCH] ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set
@ 2015-01-26 16:21 ` Geert Uytterhoeven
0 siblings, 0 replies; 8+ messages in thread
From: Geert Uytterhoeven @ 2015-01-26 16:21 UTC (permalink / raw)
To: linux-arm-kernel
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
---
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH] ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set
@ 2015-01-26 16:21 ` Geert Uytterhoeven
0 siblings, 0 replies; 8+ messages in thread
From: Geert Uytterhoeven @ 2015-01-26 16:21 UTC (permalink / raw)
To: linux-arm-kernel
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
---
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set
2015-01-26 16:21 ` Geert Uytterhoeven
@ 2015-01-26 16:44 ` Sergei Shtylyov
-1 siblings, 0 replies; 8+ messages in thread
From: Sergei Shtylyov @ 2015-01-26 16:44 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
On 01/26/2015 07:21 PM, 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
> ---
> 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)
Is CONFIG_ARM_ARCH_TIMER always defined too? I guess not...
> u32 mode = rcar_gen2_read_mode_pins();
> -#endif
> #ifdef CONFIG_ARM_ARCH_TIMER
... or you would have removed this as well?
> void __iomem *base;
> int extal_mhz = 0;
[...]
WBR, Sergei
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set
@ 2015-01-26 16:44 ` Sergei Shtylyov
0 siblings, 0 replies; 8+ messages in thread
From: Sergei Shtylyov @ 2015-01-26 16:44 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
On 01/26/2015 07:21 PM, 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
> ---
> 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)
Is CONFIG_ARM_ARCH_TIMER always defined too? I guess not...
> u32 mode = rcar_gen2_read_mode_pins();
> -#endif
> #ifdef CONFIG_ARM_ARCH_TIMER
... or you would have removed this as well?
> void __iomem *base;
> int extal_mhz = 0;
[...]
WBR, Sergei
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set
2015-01-26 16:44 ` Sergei Shtylyov
@ 2015-01-26 17:45 ` Geert Uytterhoeven
-1 siblings, 0 replies; 8+ messages in thread
From: Geert Uytterhoeven @ 2015-01-26 17:45 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jan 26, 2015 at 5:44 PM, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
>> 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)
>
>
> Is CONFIG_ARM_ARCH_TIMER always defined too? I guess not...
Nope...
("x || true" = "true")
>> u32 mode = rcar_gen2_read_mode_pins();
>> -#endif
>> #ifdef CONFIG_ARM_ARCH_TIMER
>
>
> ... or you would have removed this as well?
... and if it would, that could have been a separate change ;-)
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set
@ 2015-01-26 17:45 ` Geert Uytterhoeven
0 siblings, 0 replies; 8+ messages in thread
From: Geert Uytterhoeven @ 2015-01-26 17:45 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jan 26, 2015 at 5:44 PM, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
>> 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)
>
>
> Is CONFIG_ARM_ARCH_TIMER always defined too? I guess not...
Nope...
("x || true" == "true")
>> u32 mode = rcar_gen2_read_mode_pins();
>> -#endif
>> #ifdef CONFIG_ARM_ARCH_TIMER
>
>
> ... or you would have removed this as well?
... and if it would, that could have been a separate change ;-)
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set
2015-01-26 16:21 ` Geert Uytterhoeven
@ 2015-01-27 0:27 ` Simon Horman
-1 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2015-01-27 0:27 UTC (permalink / raw)
To: linux-arm-kernel
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
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set
@ 2015-01-27 0:27 ` Simon Horman
0 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2015-01-27 0:27 UTC (permalink / raw)
To: linux-arm-kernel
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
>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-01-27 0:27 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2015-01-27 0:27 ` Simon Horman
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.