* [PATCH v3 6/7] ARM: shmobile: sh73a0: disable legacy clock initialization
@ 2014-10-28 17:02 Ulrich Hecht
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Hecht @ 2014-10-28 17:02 UTC (permalink / raw)
To: linux-sh
Disables sh73a0_clock_init() if CCF is enabled.
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
arch/arm/mach-shmobile/setup-sh73a0.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index 2955a08..3134bc1 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -742,7 +742,9 @@ void __init __weak sh73a0_register_twd(void) { }
void __init sh73a0_earlytimer_init(void)
{
shmobile_init_delay();
+#ifndef CONFIG_COMMON_CLK
sh73a0_clock_init();
+#endif
shmobile_earlytimer_init();
sh73a0_register_twd();
}
@@ -761,8 +763,9 @@ void __init sh73a0_add_early_devices(void)
void __init sh73a0_add_standard_devices_dt(void)
{
/* clocks are setup late during boot in the case of DT */
+#ifndef CONFIG_COMMON_CLK
sh73a0_clock_init();
-
+#endif
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
--
1.8.4.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3 6/7] ARM: shmobile: sh73a0: disable legacy clock initialization
@ 2014-11-05 15:49 Laurent Pinchart
0 siblings, 0 replies; 2+ messages in thread
From: Laurent Pinchart @ 2014-11-05 15:49 UTC (permalink / raw)
To: linux-sh
Hi Ulrich,
Thank you for the patch.
On Tuesday 28 October 2014 18:02:15 Ulrich Hecht wrote:
> Disables sh73a0_clock_init() if CCF is enabled.
>
> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> arch/arm/mach-shmobile/setup-sh73a0.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c
> b/arch/arm/mach-shmobile/setup-sh73a0.c index 2955a08..3134bc1 100644
> --- a/arch/arm/mach-shmobile/setup-sh73a0.c
> +++ b/arch/arm/mach-shmobile/setup-sh73a0.c
> @@ -742,7 +742,9 @@ void __init __weak sh73a0_register_twd(void) { }
> void __init sh73a0_earlytimer_init(void)
> {
> shmobile_init_delay();
> +#ifndef CONFIG_COMMON_CLK
> sh73a0_clock_init();
> +#endif
> shmobile_earlytimer_init();
> sh73a0_register_twd();
> }
> @@ -761,8 +763,9 @@ void __init sh73a0_add_early_devices(void)
> void __init sh73a0_add_standard_devices_dt(void)
> {
> /* clocks are setup late during boot in the case of DT */
> +#ifndef CONFIG_COMMON_CLK
> sh73a0_clock_init();
> -
> +#endif
> of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
> }
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-11-05 15:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-05 15:49 [PATCH v3 6/7] ARM: shmobile: sh73a0: disable legacy clock initialization Laurent Pinchart
-- strict thread matches above, loose matches on Subject: below --
2014-10-28 17:02 Ulrich Hecht
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox