linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: horms+renesas@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/10] ARM: shmobile: r8a73a4: Use shmobile_init_delay()
Date: Mon, 25 Aug 2014 10:10:10 +0900	[thread overview]
Message-ID: <f5720080b51d61c33dc559fedab9a601930e95c1.1408927601.git.horms+renesas@verge.net.au> (raw)
In-Reply-To: <cover.1408927601.git.horms+renesas@verge.net.au>

From: Magnus Damm <damm+renesas@opensource.se>

Adjust the r8a73a4 SoC support code to use shmobile_init_delay()
together with CPU Frequency settings from the DTS. Get rid of the
C code version and r8a73a4_init_early() that now are unused.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/r8a73a4.h       | 1 -
 arch/arm/mach-shmobile/setup-r8a73a4.c | 9 +--------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/arch/arm/mach-shmobile/r8a73a4.h b/arch/arm/mach-shmobile/r8a73a4.h
index ce8bdd1..5fafd6f 100644
--- a/arch/arm/mach-shmobile/r8a73a4.h
+++ b/arch/arm/mach-shmobile/r8a73a4.h
@@ -14,6 +14,5 @@ void r8a73a4_add_standard_devices(void);
 void r8a73a4_add_dt_devices(void);
 void r8a73a4_clock_init(void);
 void r8a73a4_pinmux_init(void);
-void r8a73a4_init_early(void);
 
 #endif /* __ASM_R8A73A4_H__ */
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
index 6fbcdcc..53f40b7 100644
--- a/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
@@ -295,13 +295,6 @@ void __init r8a73a4_add_standard_devices(void)
 	r8a73a4_register_dmac();
 }
 
-void __init r8a73a4_init_early(void)
-{
-#ifndef CONFIG_ARM_ARCH_TIMER
-	shmobile_setup_delay(1500, 2, 4); /* Cortex-A15 @ 1500MHz */
-#endif
-}
-
 #ifdef CONFIG_USE_OF
 
 static const char *r8a73a4_boards_compat_dt[] __initdata = {
@@ -310,7 +303,7 @@ static const char *r8a73a4_boards_compat_dt[] __initdata = {
 };
 
 DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")
-	.init_early	= r8a73a4_init_early,
+	.init_early	= shmobile_init_delay,
 	.init_late	= shmobile_init_late,
 	.dt_compat	= r8a73a4_boards_compat_dt,
 MACHINE_END
-- 
2.0.1

  parent reply	other threads:[~2014-08-25  1:10 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-25  1:10 [GIT PULL] Renesas ARM Based SoC Init Delay Updates For v3.18 Simon Horman
2014-08-25  1:10 ` [PATCH 01/10] ARM: shmobile: sh7372: Update DTS to include CPU frequency Simon Horman
2014-08-25  1:10 ` [PATCH 02/10] ARM: shmobile: sh73a0: " Simon Horman
2014-08-25  1:10 ` [PATCH 03/10] ARM: shmobile: r8a7778: " Simon Horman
2014-08-25  1:10 ` [PATCH 04/10] ARM: shmobile: sh7372: Use shmobile_init_delay() Simon Horman
2014-08-25  1:10 ` Simon Horman [this message]
2014-08-25  1:10 ` [PATCH 06/10] ARM: shmobile: Remove shmobile_setup_delay() Simon Horman
2014-08-25  1:10 ` [PATCH 07/10] ARM: shmobile: sh73a0: Use shmobile_init_delay() Simon Horman
2014-08-25  1:10 ` [PATCH 08/10] ARM: shmobile: r8a7778: " Simon Horman
2014-08-25  1:10 ` [PATCH 09/10] ARM: shmobile: bockw: " Simon Horman
2014-08-25  1:10 ` [PATCH 10/10] ARM: shmobile: kzm9g: " Simon Horman
2014-09-05 15:27 ` [GIT PULL] Renesas ARM Based SoC Init Delay Updates For v3.18 Arnd Bergmann
2014-09-09  2:02   ` Simon Horman
2014-09-09  8:50     ` Arnd Bergmann
2014-09-05 16:13 ` Arnd Bergmann

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=f5720080b51d61c33dc559fedab9a601930e95c1.1408927601.git.horms+renesas@verge.net.au \
    --to=horms+renesas@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).