linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/9] ARM: shmobile: Update EMEV2 DTS to include CPU frequency
  2014-06-23  2:26 [GIT PULL] Renesas ARM Based SoC Cleanup for v3.17 Simon Horman
@ 2014-06-23  2:26 ` Simon Horman
  2014-06-23  2:26 ` [PATCH 2/9] ARM: shmobile: Use shmobile_init_delay() on EMEV2 Simon Horman
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Simon Horman @ 2014-06-23  2:26 UTC (permalink / raw)
  To: linux-arm-kernel

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

Add CPU Frequency information to the EMEV2 DTS file. This
will allow us to use the shared C code to on EMEV2 which
reads out the clock frequency from DT and calculates the
delay settings from there.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/emev2.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/emev2.dtsi b/arch/arm/boot/dts/emev2.dtsi
index e37985f..00eeed3 100644
--- a/arch/arm/boot/dts/emev2.dtsi
+++ b/arch/arm/boot/dts/emev2.dtsi
@@ -31,11 +31,13 @@
 			device_type = "cpu";
 			compatible = "arm,cortex-a9";
 			reg = <0>;
+			clock-frequency = <533000000>;
 		};
 		cpu at 1 {
 			device_type = "cpu";
 			compatible = "arm,cortex-a9";
 			reg = <1>;
+			clock-frequency = <533000000>;
 		};
 	};
 
-- 
2.0.0.rc2

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 2/9] ARM: shmobile: Use shmobile_init_delay() on EMEV2
  2014-06-23  2:26 [GIT PULL] Renesas ARM Based SoC Cleanup for v3.17 Simon Horman
  2014-06-23  2:26 ` [PATCH 1/9] ARM: shmobile: Update EMEV2 DTS to include CPU frequency Simon Horman
@ 2014-06-23  2:26 ` Simon Horman
  2014-06-23  2:26 ` [PATCH 3/9] ARM: shmobile: Get rid of redundant EMEV2 mach callbacks Simon Horman
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Simon Horman @ 2014-06-23  2:26 UTC (permalink / raw)
  To: linux-arm-kernel

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

Adjust EMEV2 to use shmobile_init_delay() together with
CPU Frequency settings from the DTS.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/setup-emev2.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c
index 6e4ffa7..e10d34e 100644
--- a/arch/arm/mach-shmobile/setup-emev2.c
+++ b/arch/arm/mach-shmobile/setup-emev2.c
@@ -42,11 +42,6 @@ static void __init emev2_map_io(void)
 	iotable_init(emev2_io_desc, ARRAY_SIZE(emev2_io_desc));
 }
 
-static void __init emev2_init_delay(void)
-{
-	shmobile_setup_delay(533, 1, 3); /* Cortex-A9 @ 533MHz */
-}
-
 static void __init emev2_add_standard_devices_dt(void)
 {
 	of_clk_init(NULL);
@@ -63,7 +58,7 @@ extern struct smp_operations emev2_smp_ops;
 DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
 	.smp		= smp_ops(emev2_smp_ops),
 	.map_io		= emev2_map_io,
-	.init_early	= emev2_init_delay,
+	.init_early	= shmobile_init_delay,
 	.init_machine	= emev2_add_standard_devices_dt,
 	.init_late	= shmobile_init_late,
 	.dt_compat	= emev2_boards_compat_dt,
-- 
2.0.0.rc2

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 3/9] ARM: shmobile: Get rid of redundant EMEV2 mach callbacks
  2014-06-23  2:26 [GIT PULL] Renesas ARM Based SoC Cleanup for v3.17 Simon Horman
  2014-06-23  2:26 ` [PATCH 1/9] ARM: shmobile: Update EMEV2 DTS to include CPU frequency Simon Horman
  2014-06-23  2:26 ` [PATCH 2/9] ARM: shmobile: Use shmobile_init_delay() on EMEV2 Simon Horman
@ 2014-06-23  2:26 ` Simon Horman
  2014-06-23  2:26 ` [PATCH 4/9] ARM: shmobile: Update r7s72100 DTS to include CPU frequency Simon Horman
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Simon Horman @ 2014-06-23  2:26 UTC (permalink / raw)
  To: linux-arm-kernel

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

Update the EMEV2 specific SoC callbacks to get rid
of the calls to of_clk_init() and of_platform_populate().
Those calls are by default executed by the functions in
the shared ARM code in case the SoC specific mach
callbacks are NULL.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/setup-emev2.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c
index e10d34e..b06a9e8 100644
--- a/arch/arm/mach-shmobile/setup-emev2.c
+++ b/arch/arm/mach-shmobile/setup-emev2.c
@@ -16,10 +16,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include <linux/clk-provider.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/of_platform.h>
+#include <linux/mm.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -42,12 +41,6 @@ static void __init emev2_map_io(void)
 	iotable_init(emev2_io_desc, ARRAY_SIZE(emev2_io_desc));
 }
 
-static void __init emev2_add_standard_devices_dt(void)
-{
-	of_clk_init(NULL);
-	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-}
-
 static const char *emev2_boards_compat_dt[] __initconst = {
 	"renesas,emev2",
 	NULL,
@@ -59,7 +52,6 @@ DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
 	.smp		= smp_ops(emev2_smp_ops),
 	.map_io		= emev2_map_io,
 	.init_early	= shmobile_init_delay,
-	.init_machine	= emev2_add_standard_devices_dt,
 	.init_late	= shmobile_init_late,
 	.dt_compat	= emev2_boards_compat_dt,
 MACHINE_END
-- 
2.0.0.rc2

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 4/9] ARM: shmobile: Update r7s72100 DTS to include CPU frequency
  2014-06-23  2:26 [GIT PULL] Renesas ARM Based SoC Cleanup for v3.17 Simon Horman
                   ` (2 preceding siblings ...)
  2014-06-23  2:26 ` [PATCH 3/9] ARM: shmobile: Get rid of redundant EMEV2 mach callbacks Simon Horman
@ 2014-06-23  2:26 ` Simon Horman
  2014-06-23  2:26 ` [PATCH 5/9] ARM: shmobile: Use shmobile_init_delay() on Genmai boards Simon Horman
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Simon Horman @ 2014-06-23  2:26 UTC (permalink / raw)
  To: linux-arm-kernel

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

Add CPU Frequency information to the r7s72100 DTS file. This
will allow us to use the shared C code on r7s72100 and Genmai
which reads out the clock frequency from DT and calculates the
delay settings from there.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r7s72100.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index f50fbc8..bdee225 100644
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -144,6 +144,7 @@
 			device_type = "cpu";
 			compatible = "arm,cortex-a9";
 			reg = <0>;
+			clock-frequency = <400000000>;
 		};
 	};
 
-- 
2.0.0.rc2

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 5/9] ARM: shmobile: Use shmobile_init_delay() on Genmai boards
  2014-06-23  2:26 [GIT PULL] Renesas ARM Based SoC Cleanup for v3.17 Simon Horman
                   ` (3 preceding siblings ...)
  2014-06-23  2:26 ` [PATCH 4/9] ARM: shmobile: Update r7s72100 DTS to include CPU frequency Simon Horman
@ 2014-06-23  2:26 ` Simon Horman
  2014-06-23  2:26 ` [PATCH 6/9] ARM: shmobile: Use shmobile_init_delay() on r7s72100 Simon Horman
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Simon Horman @ 2014-06-23  2:26 UTC (permalink / raw)
  To: linux-arm-kernel

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

Adjust Genmai board support to use shmobile_init_delay() together
with r7s72100 CPU Frequency settings from the DTS.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/board-genmai-reference.c | 2 +-
 arch/arm/mach-shmobile/board-genmai.c           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c
index d341ef0..c06dc5c 100644
--- a/arch/arm/mach-shmobile/board-genmai-reference.c
+++ b/arch/arm/mach-shmobile/board-genmai-reference.c
@@ -47,7 +47,7 @@ static const char * const genmai_boards_compat_dt[] __initconst = {
 };
 
 DT_MACHINE_START(GENMAI_DT, "genmai")
-	.init_early	= r7s72100_init_early,
+	.init_early	= shmobile_init_delay,
 	.init_machine	= genmai_add_standard_devices,
 	.dt_compat	= genmai_boards_compat_dt,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-genmai.c b/arch/arm/mach-shmobile/board-genmai.c
index f0a8eca..a0994f3 100644
--- a/arch/arm/mach-shmobile/board-genmai.c
+++ b/arch/arm/mach-shmobile/board-genmai.c
@@ -154,7 +154,7 @@ static const char * const genmai_boards_compat_dt[] __initconst = {
 };
 
 DT_MACHINE_START(GENMAI_DT, "genmai")
-	.init_early	= r7s72100_init_early,
+	.init_early	= shmobile_init_delay,
 	.init_machine	= genmai_add_standard_devices,
 	.dt_compat	= genmai_boards_compat_dt,
 MACHINE_END
-- 
2.0.0.rc2

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 6/9] ARM: shmobile: Use shmobile_init_delay() on r7s72100
  2014-06-23  2:26 [GIT PULL] Renesas ARM Based SoC Cleanup for v3.17 Simon Horman
                   ` (4 preceding siblings ...)
  2014-06-23  2:26 ` [PATCH 5/9] ARM: shmobile: Use shmobile_init_delay() on Genmai boards Simon Horman
@ 2014-06-23  2:26 ` Simon Horman
  2014-06-23  2:26 ` [PATCH 7/9] ARM: shmobile: Use r8a7790 DT CPU Frequency in common case Simon Horman
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Simon Horman @ 2014-06-23  2:26 UTC (permalink / raw)
  To: linux-arm-kernel

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

Adjust the r7s72100 SoC support code to use shmobile_init_delay()
together with CPU Frequency settings from the DTS. Get rid of the
C code version.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/include/mach/r7s72100.h | 1 -
 arch/arm/mach-shmobile/setup-r7s72100.c        | 7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/arch/arm/mach-shmobile/include/mach/r7s72100.h b/arch/arm/mach-shmobile/include/mach/r7s72100.h
index 5f34b20..efb723c 100644
--- a/arch/arm/mach-shmobile/include/mach/r7s72100.h
+++ b/arch/arm/mach-shmobile/include/mach/r7s72100.h
@@ -3,6 +3,5 @@
 
 void r7s72100_add_dt_devices(void);
 void r7s72100_clock_init(void);
-void r7s72100_init_early(void);
 
 #endif /* __ASM_R7S72100_H__ */
diff --git a/arch/arm/mach-shmobile/setup-r7s72100.c b/arch/arm/mach-shmobile/setup-r7s72100.c
index 17a74d3..a55d68d 100644
--- a/arch/arm/mach-shmobile/setup-r7s72100.c
+++ b/arch/arm/mach-shmobile/setup-r7s72100.c
@@ -43,11 +43,6 @@ void __init r7s72100_add_dt_devices(void)
 	r7s72100_register_mtu2();
 }
 
-void __init r7s72100_init_early(void)
-{
-	shmobile_setup_delay(400, 1, 3); /* Cortex-A9 @ 400MHz */
-}
-
 #ifdef CONFIG_USE_OF
 static const char *r7s72100_boards_compat_dt[] __initdata = {
 	"renesas,r7s72100",
@@ -55,7 +50,7 @@ static const char *r7s72100_boards_compat_dt[] __initdata = {
 };
 
 DT_MACHINE_START(R7S72100_DT, "Generic R7S72100 (Flattened Device Tree)")
-	.init_early	= r7s72100_init_early,
+	.init_early	= shmobile_init_delay,
 	.dt_compat	= r7s72100_boards_compat_dt,
 MACHINE_END
 #endif /* CONFIG_USE_OF */
-- 
2.0.0.rc2

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [GIT PULL] Renesas ARM Based SoC Cleanup for v3.17
@ 2014-06-23  2:26 Simon Horman
  2014-06-23  2:26 ` [PATCH 1/9] ARM: shmobile: Update EMEV2 DTS to include CPU frequency Simon Horman
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: Simon Horman @ 2014-06-23  2:26 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these Renesas ARM based SoC Cleanup for v3.17.


This pull request is based on 'Renesas ARM Based SoC Header Cleanup for v3.17',
tagged as header-cleanup-for-v3.17, which I have already sent a
pull-request for.


The following changes since commit 62872989bdbf1245d7239b9f4c05a8ee7c775ed5:

  ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case (2014-06-17 17:09:40 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-soc-cleanup-for-v3.17

for you to fetch changes up to d83fa4c9c27c4d8612e39e99506b5420fa05b58b:

  ARM: shmobile: Remove unused r8a7790_init_early() (2014-06-17 19:50:35 +0900)

----------------------------------------------------------------
Renesas ARM Based SoC Cleanup for v3.17

* Use shmobile_init_delay on r8a7790, r7s72100 and EMEV2 SoCs
* Remove unused redundant callbacks on EMEV2 SoC

----------------------------------------------------------------
Magnus Damm (9):
      ARM: shmobile: Update EMEV2 DTS to include CPU frequency
      ARM: shmobile: Use shmobile_init_delay() on EMEV2
      ARM: shmobile: Get rid of redundant EMEV2 mach callbacks
      ARM: shmobile: Update r7s72100 DTS to include CPU frequency
      ARM: shmobile: Use shmobile_init_delay() on Genmai boards
      ARM: shmobile: Use shmobile_init_delay() on r7s72100
      ARM: shmobile: Use r8a7790 DT CPU Frequency in common case
      ARM: shmobile: Use r8a7790 DT CPU Frequency for Lager
      ARM: shmobile: Remove unused r8a7790_init_early()

 arch/arm/boot/dts/emev2.dtsi                    |  2 ++
 arch/arm/boot/dts/r7s72100.dtsi                 |  1 +
 arch/arm/mach-shmobile/board-genmai-reference.c |  2 +-
 arch/arm/mach-shmobile/board-genmai.c           |  2 +-
 arch/arm/mach-shmobile/board-lager-reference.c  |  2 +-
 arch/arm/mach-shmobile/board-lager.c            |  2 +-
 arch/arm/mach-shmobile/include/mach/r7s72100.h  |  1 -
 arch/arm/mach-shmobile/include/mach/r8a7790.h   |  1 -
 arch/arm/mach-shmobile/setup-emev2.c            | 17 ++---------------
 arch/arm/mach-shmobile/setup-r7s72100.c         |  7 +------
 arch/arm/mach-shmobile/setup-r8a7790.c          |  9 +--------
 11 files changed, 11 insertions(+), 35 deletions(-)

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH 7/9] ARM: shmobile: Use r8a7790 DT CPU Frequency in common case
  2014-06-23  2:26 [GIT PULL] Renesas ARM Based SoC Cleanup for v3.17 Simon Horman
                   ` (5 preceding siblings ...)
  2014-06-23  2:26 ` [PATCH 6/9] ARM: shmobile: Use shmobile_init_delay() on r7s72100 Simon Horman
@ 2014-06-23  2:26 ` Simon Horman
  2014-06-23  2:26 ` [PATCH 8/9] ARM: shmobile: Use r8a7790 DT CPU Frequency for Lager Simon Horman
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Simon Horman @ 2014-06-23  2:26 UTC (permalink / raw)
  To: linux-arm-kernel

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

Convert the common C-code-less r8a7790 DT board support
to use shmobile_init_delay() to be able to migrate away
from per-SoC delay setup functions.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/setup-r8a7790.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 4212c8d..9c2bc16 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -324,7 +324,7 @@ static const char * const r8a7790_boards_compat_dt[] __initconst = {
 
 DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
 	.smp		= smp_ops(r8a7790_smp_ops),
-	.init_early	= r8a7790_init_early,
+	.init_early	= shmobile_init_delay,
 	.init_time	= rcar_gen2_timer_init,
 	.dt_compat	= r8a7790_boards_compat_dt,
 MACHINE_END
-- 
2.0.0.rc2

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 8/9] ARM: shmobile: Use r8a7790 DT CPU Frequency for Lager
  2014-06-23  2:26 [GIT PULL] Renesas ARM Based SoC Cleanup for v3.17 Simon Horman
                   ` (6 preceding siblings ...)
  2014-06-23  2:26 ` [PATCH 7/9] ARM: shmobile: Use r8a7790 DT CPU Frequency in common case Simon Horman
@ 2014-06-23  2:26 ` Simon Horman
  2014-06-23  2:26 ` [PATCH 9/9] ARM: shmobile: Remove unused r8a7790_init_early() Simon Horman
  2014-07-07  0:21 ` [GIT PULL] Renesas ARM Based SoC Cleanup for v3.17 Olof Johansson
  9 siblings, 0 replies; 11+ messages in thread
From: Simon Horman @ 2014-06-23  2:26 UTC (permalink / raw)
  To: linux-arm-kernel

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

Convert the Lager board support to use shmobile_init_delay()
to be able to migrate away from per-SoC delay setup functions.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/board-lager-reference.c | 2 +-
 arch/arm/mach-shmobile/board-lager.c           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
index 4f0af91..e30017b 100644
--- a/arch/arm/mach-shmobile/board-lager-reference.c
+++ b/arch/arm/mach-shmobile/board-lager-reference.c
@@ -129,7 +129,7 @@ static const char *lager_boards_compat_dt[] __initdata = {
 
 DT_MACHINE_START(LAGER_DT, "lager")
 	.smp		= smp_ops(r8a7790_smp_ops),
-	.init_early	= r8a7790_init_early,
+	.init_early	= shmobile_init_delay,
 	.init_time	= rcar_gen2_timer_init,
 	.init_machine	= lager_add_standard_devices,
 	.init_late	= shmobile_init_late,
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index 83bbb5c..72785cc 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -887,7 +887,7 @@ static const char * const lager_boards_compat_dt[] __initconst = {
 
 DT_MACHINE_START(LAGER_DT, "lager")
 	.smp		= smp_ops(r8a7790_smp_ops),
-	.init_early	= r8a7790_init_early,
+	.init_early	= shmobile_init_delay,
 	.init_time	= rcar_gen2_timer_init,
 	.init_machine	= lager_init,
 	.init_late	= shmobile_init_late,
-- 
2.0.0.rc2

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 9/9] ARM: shmobile: Remove unused r8a7790_init_early()
  2014-06-23  2:26 [GIT PULL] Renesas ARM Based SoC Cleanup for v3.17 Simon Horman
                   ` (7 preceding siblings ...)
  2014-06-23  2:26 ` [PATCH 8/9] ARM: shmobile: Use r8a7790 DT CPU Frequency for Lager Simon Horman
@ 2014-06-23  2:26 ` Simon Horman
  2014-07-07  0:21 ` [GIT PULL] Renesas ARM Based SoC Cleanup for v3.17 Olof Johansson
  9 siblings, 0 replies; 11+ messages in thread
From: Simon Horman @ 2014-06-23  2:26 UTC (permalink / raw)
  To: linux-arm-kernel

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

Remove the now unused r8a7790_init_early() function.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/include/mach/r8a7790.h | 1 -
 arch/arm/mach-shmobile/setup-r8a7790.c        | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/arch/arm/mach-shmobile/include/mach/r8a7790.h b/arch/arm/mach-shmobile/include/mach/r8a7790.h
index d755544..459827f 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7790.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7790.h
@@ -31,7 +31,6 @@ void r8a7790_add_dt_devices(void);
 void r8a7790_clock_init(void);
 void r8a7790_pinmux_init(void);
 void r8a7790_pm_init(void);
-void r8a7790_init_early(void);
 extern struct smp_operations r8a7790_smp_ops;
 
 #endif /* __ASM_R8A7790_H__ */
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 9c2bc16..ee5daccf3 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -308,13 +308,6 @@ void __init r8a7790_add_standard_devices(void)
 	r8a7790_register_audio_dmac(1);
 }
 
-void __init r8a7790_init_early(void)
-{
-#ifndef CONFIG_ARM_ARCH_TIMER
-	shmobile_setup_delay(1300, 2, 4); /* Cortex-A15 @ 1300MHz */
-#endif
-}
-
 #ifdef CONFIG_USE_OF
 
 static const char * const r8a7790_boards_compat_dt[] __initconst = {
-- 
2.0.0.rc2

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [GIT PULL] Renesas ARM Based SoC Cleanup for v3.17
  2014-06-23  2:26 [GIT PULL] Renesas ARM Based SoC Cleanup for v3.17 Simon Horman
                   ` (8 preceding siblings ...)
  2014-06-23  2:26 ` [PATCH 9/9] ARM: shmobile: Remove unused r8a7790_init_early() Simon Horman
@ 2014-07-07  0:21 ` Olof Johansson
  9 siblings, 0 replies; 11+ messages in thread
From: Olof Johansson @ 2014-07-07  0:21 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Jun 23, 2014 at 11:26:54AM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
> 
> Please consider these Renesas ARM based SoC Cleanup for v3.17.
> 
> 
> This pull request is based on 'Renesas ARM Based SoC Header Cleanup for v3.17',
> tagged as header-cleanup-for-v3.17, which I have already sent a
> pull-request for.
> 
> 
> The following changes since commit 62872989bdbf1245d7239b9f4c05a8ee7c775ed5:
> 
>   ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case (2014-06-17 17:09:40 +0900)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-soc-cleanup-for-v3.17

Merged, thanks.

-Olof

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2014-07-07  0:21 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-23  2:26 [GIT PULL] Renesas ARM Based SoC Cleanup for v3.17 Simon Horman
2014-06-23  2:26 ` [PATCH 1/9] ARM: shmobile: Update EMEV2 DTS to include CPU frequency Simon Horman
2014-06-23  2:26 ` [PATCH 2/9] ARM: shmobile: Use shmobile_init_delay() on EMEV2 Simon Horman
2014-06-23  2:26 ` [PATCH 3/9] ARM: shmobile: Get rid of redundant EMEV2 mach callbacks Simon Horman
2014-06-23  2:26 ` [PATCH 4/9] ARM: shmobile: Update r7s72100 DTS to include CPU frequency Simon Horman
2014-06-23  2:26 ` [PATCH 5/9] ARM: shmobile: Use shmobile_init_delay() on Genmai boards Simon Horman
2014-06-23  2:26 ` [PATCH 6/9] ARM: shmobile: Use shmobile_init_delay() on r7s72100 Simon Horman
2014-06-23  2:26 ` [PATCH 7/9] ARM: shmobile: Use r8a7790 DT CPU Frequency in common case Simon Horman
2014-06-23  2:26 ` [PATCH 8/9] ARM: shmobile: Use r8a7790 DT CPU Frequency for Lager Simon Horman
2014-06-23  2:26 ` [PATCH 9/9] ARM: shmobile: Remove unused r8a7790_init_early() Simon Horman
2014-07-07  0:21 ` [GIT PULL] Renesas ARM Based SoC Cleanup for v3.17 Olof Johansson

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).