* [PATCH 1/3] ARM: shmobile: Remove stray closing parenthesis in debug description
2015-03-10 0:42 [GIT PULL] Second Round of Renesas ARM Based SoC Cleanup for v4.1 Simon Horman
@ 2015-03-10 0:43 ` Simon Horman
2015-03-10 0:43 ` [PATCH 2/3] ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set Simon Horman
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2015-03-10 0:43 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Remove the stray closing parenthesis in the config description for the
DEBUG_RCAR_GEN2_SCIF0 option.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/Kconfig.debug | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 1ca8dc7..3809ac9 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -806,7 +806,7 @@ choice
via SCIF2 on Renesas R-Car H1 (R8A7779).
config DEBUG_RCAR_GEN2_SCIF0
- bool "Kernel low-level debugging messages via SCIF0 on R8A7790/R8A7791/R8A7793)"
+ bool "Kernel low-level debugging messages via SCIF0 on R8A7790/R8A7791/R8A7793"
depends on ARCH_R8A7790 || ARCH_R8A7791 || ARCH_R8A7793
help
Say Y here if you want kernel low-level debugging support
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set
2015-03-10 0:42 [GIT PULL] Second Round of Renesas ARM Based SoC Cleanup for v4.1 Simon Horman
2015-03-10 0:43 ` [PATCH 1/3] ARM: shmobile: Remove stray closing parenthesis in debug description Simon Horman
@ 2015-03-10 0:43 ` Simon Horman
2015-03-10 0:43 ` [PATCH 3/3] ARM: shmobile: r8a7740: Remove restart callback Simon Horman
2015-03-11 22:08 ` [GIT PULL] Second Round of Renesas ARM Based SoC Cleanup for v4.1 Arnd Bergmann
3 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2015-03-10 0:43 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
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>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
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 d1fa625..51464cc 100644
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -50,9 +50,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;
@@ -128,9 +126,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
#ifdef CONFIG_ARCH_SHMOBILE_MULTI
clocksource_of_init();
#endif
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/3] ARM: shmobile: r8a7740: Remove restart callback
2015-03-10 0:42 [GIT PULL] Second Round of Renesas ARM Based SoC Cleanup for v4.1 Simon Horman
2015-03-10 0:43 ` [PATCH 1/3] ARM: shmobile: Remove stray closing parenthesis in debug description Simon Horman
2015-03-10 0:43 ` [PATCH 2/3] ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set Simon Horman
@ 2015-03-10 0:43 ` Simon Horman
2015-03-11 22:08 ` [GIT PULL] Second Round of Renesas ARM Based SoC Cleanup for v4.1 Arnd Bergmann
3 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2015-03-10 0:43 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Remove the restart handling hack from the r8a7740 generic multiplatform
case.
Restart on DT-based r8a7740 platforms is now handled through the
R-Mobile reset driver.
This reverts commit 1174c712afa2779f ("ARM: shmobile: r8a7740: Add
restart callback").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-r8a7740.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index dd64caf..9832e48 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -842,13 +842,6 @@ static void __init r8a7740_generic_init(void)
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
-#define RESCNT2 IOMEM(0xe6188020)
-static void r8a7740_restart(enum reboot_mode mode, const char *cmd)
-{
- /* Do soft power on reset */
- writel(1 << 31, RESCNT2);
-}
-
static const char *r8a7740_boards_compat_dt[] __initdata = {
"renesas,r8a7740",
NULL,
@@ -861,7 +854,6 @@ DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)")
.init_machine = r8a7740_generic_init,
.init_late = shmobile_init_late,
.dt_compat = r8a7740_boards_compat_dt,
- .restart = r8a7740_restart,
MACHINE_END
#endif /* CONFIG_USE_OF */
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [GIT PULL] Second Round of Renesas ARM Based SoC Cleanup for v4.1
2015-03-10 0:42 [GIT PULL] Second Round of Renesas ARM Based SoC Cleanup for v4.1 Simon Horman
` (2 preceding siblings ...)
2015-03-10 0:43 ` [PATCH 3/3] ARM: shmobile: r8a7740: Remove restart callback Simon Horman
@ 2015-03-11 22:08 ` Arnd Bergmann
2015-03-11 23:30 ` Simon Horman
3 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2015-03-11 22:08 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 10 March 2015 09:42:09 Simon Horman wrote:
> Please consider these second round of Renesas ARM based SoC cleanup for v4.1.
>
> This pull request is based on the previous round of
> such requests, tagged as renesas-soc-cleanup-for-v4.1,
> which you have already pulled.
>
I had grouped the renesas-soc-cleanup-for-v4.1 into next/multiplatform
rather than next/cleanup, and would like to keep the two separate
unless there is a good reason not to.
If you haven't already based other work on top of renesas-soc-cleanup2-for-v4.1
and there are no other conflicts, could you rebase it to -rc1?
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL] Second Round of Renesas ARM Based SoC Cleanup for v4.1
2015-03-11 22:08 ` [GIT PULL] Second Round of Renesas ARM Based SoC Cleanup for v4.1 Arnd Bergmann
@ 2015-03-11 23:30 ` Simon Horman
0 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2015-03-11 23:30 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Mar 11, 2015 at 11:08:18PM +0100, Arnd Bergmann wrote:
> On Tuesday 10 March 2015 09:42:09 Simon Horman wrote:
> > Please consider these second round of Renesas ARM based SoC cleanup for v4.1.
> >
> > This pull request is based on the previous round of
> > such requests, tagged as renesas-soc-cleanup-for-v4.1,
> > which you have already pulled.
> >
>
> I had grouped the renesas-soc-cleanup-for-v4.1 into next/multiplatform
> rather than next/cleanup, and would like to keep the two separate
> unless there is a good reason not to.
>
> If you haven't already based other work on top of renesas-soc-cleanup2-for-v4.1
> and there are no other conflicts, could you rebase it to -rc1?
Sure, I think that should be clean on my side.
I'll let you know if it turns out otherwise.
^ permalink raw reply [flat|nested] 6+ messages in thread