[GIT PULL] Third Round of Renesas ARM Based SoC Soc Updates for v3.18

linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed

* [GIT PULL] Third Round of Renesas ARM Based SoC Soc Updates for v3.18
@ 2014-09-09  4:22 Simon Horman
  2014-09-09  4:22 ` [PATCH 1/2] ARM: shmobile: support Cortex-A7 in shmobile_init_delay() Simon Horman
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Simon Horman @ 2014-09-09  4:22 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these third round of Renesas ARM based SoC soc updates for v3.18.

This pull request is based on the previous round of
such requests, tagged as renesas-soc2-for-v3.18,
which you have already pulled.

This pull-request has a minor conflict with
"[GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18",
tagged as renesas-kconfig-cleanups-for-v3.18, which you
have previously pulled.


The solution is to take both and the conflicting area of
arch/arm/mach-shmobile/Kconfig should look like this:

config ARCH_R8A7791
        bool "R-Car M2-W (R8A77910)"
        select ARCH_RCAR_GEN2

config ARCH_R8A7794
        bool "R-Car E2 (R8A77940)"
        select ARCH_RCAR_GEN2

comment "Renesas ARM SoCs Board Type"

This resolution can be found in the renesas-next-20140905-v3.17-rc2 tag
of my renesas tree on kernel.org.


The following changes since commit 86155b35d173317518458c6f9c0a3ea8c5324bed:

  ARM: shmobile: Move legacy INTC definitions from irqs.h to intc.h (2014-08-22 12:23:32 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc3-for-v3.18

for you to fetch changes up to 5923abb205e05773e0bb16c7ca4c0b41dbeec40e:

  ARM: shmobile: Initial r8a7794 SoC support (2014-09-05 17:23:49 +0900)

----------------------------------------------------------------
Third Round of Renesas ARM Based SoC Soc Updates for v3.18

* Initial r8a7794 SoC support
* Support Cortex-A7 in shmobile_init_delay()

----------------------------------------------------------------
Ulrich Hecht (2):
      ARM: shmobile: support Cortex-A7 in shmobile_init_delay()
      ARM: shmobile: Initial r8a7794 SoC support

 arch/arm/mach-shmobile/Kconfig         |  4 ++++
 arch/arm/mach-shmobile/Makefile        |  1 +
 arch/arm/mach-shmobile/setup-r8a7794.c | 35 ++++++++++++++++++++++++++++++++++
 arch/arm/mach-shmobile/timer.c         |  9 +++++----
 4 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm/mach-shmobile/setup-r8a7794.c

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

* [PATCH 1/2] ARM: shmobile: support Cortex-A7 in shmobile_init_delay()
  2014-09-09  4:22 [GIT PULL] Third Round of Renesas ARM Based SoC Soc Updates for v3.18 Simon Horman
@ 2014-09-09  4:22 ` Simon Horman
  2014-09-09  4:22 ` [PATCH 2/2] ARM: shmobile: Initial r8a7794 SoC support Simon Horman
  2014-09-09 15:20 ` [GIT PULL] Third Round of Renesas ARM Based SoC Soc Updates for v3.18 Arnd Bergmann
  2 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2014-09-09  4:22 UTC (permalink / raw)
  To: linux-arm-kernel

From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/timer.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c
index 942efdc..0b01770 100644
--- a/arch/arm/mach-shmobile/timer.c
+++ b/arch/arm/mach-shmobile/timer.c
@@ -60,7 +60,7 @@ void __init shmobile_setup_delay(unsigned int max_cpu_core_mhz,
 void __init shmobile_init_delay(void)
 {
 	struct device_node *np, *cpus;
-	bool is_a8_a9 = false;
+	bool is_a7_a8_a9 = false;
 	bool is_a15 = false;
 	u32 max_freq = 0;
 
@@ -74,9 +74,10 @@ void __init shmobile_init_delay(void)
 		if (!of_property_read_u32(np, "clock-frequency", &freq))
 			max_freq = max(max_freq, freq);
 
-		if (of_device_is_compatible(np, "arm,cortex-a8") ||
+		if (of_device_is_compatible(np, "arm,cortex-a7") ||
+		    of_device_is_compatible(np, "arm,cortex-a8") ||
 		    of_device_is_compatible(np, "arm,cortex-a9"))
-			is_a8_a9 = true;
+			is_a7_a8_a9 = true;
 		else if (of_device_is_compatible(np, "arm,cortex-a15"))
 			is_a15 = true;
 	}
@@ -86,7 +87,7 @@ void __init shmobile_init_delay(void)
 	if (!max_freq)
 		return;
 
-	if (is_a8_a9)
+	if (is_a7_a8_a9)
 		shmobile_setup_delay_hz(max_freq, 1, 3);
 	else if (is_a15 && !IS_ENABLED(CONFIG_ARM_ARCH_TIMER))
 		shmobile_setup_delay_hz(max_freq, 2, 4);
-- 
2.0.1

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

* [PATCH 2/2] ARM: shmobile: Initial r8a7794 SoC support
  2014-09-09  4:22 [GIT PULL] Third Round of Renesas ARM Based SoC Soc Updates for v3.18 Simon Horman
  2014-09-09  4:22 ` [PATCH 1/2] ARM: shmobile: support Cortex-A7 in shmobile_init_delay() Simon Horman
@ 2014-09-09  4:22 ` Simon Horman
  2014-09-09 15:20 ` [GIT PULL] Third Round of Renesas ARM Based SoC Soc Updates for v3.18 Arnd Bergmann
  2 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2014-09-09  4:22 UTC (permalink / raw)
  To: linux-arm-kernel

From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>

Initial support for the r8a7794 SoC, based on work by Hisashi Nakamura.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/Kconfig         |  4 ++++
 arch/arm/mach-shmobile/Makefile        |  1 +
 arch/arm/mach-shmobile/setup-r8a7794.c | 35 ++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 arch/arm/mach-shmobile/setup-r8a7794.c

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index e15dff7..05f4cc0 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -41,6 +41,10 @@ config ARCH_R8A7791
 	select RENESAS_IRQC
 	select SYS_SUPPORTS_SH_CMT
 
+config ARCH_R8A7794
+	bool "R-Car E2 (R8A77940)"
+	select ARCH_RCAR_GEN2
+
 comment "Renesas ARM SoCs Board Type"
 
 config MACH_GENMAI
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index a6a1dc0..6b61d69 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -15,6 +15,7 @@ obj-$(CONFIG_ARCH_R8A7779)	+= setup-r8a7779.o
 obj-$(CONFIG_ARCH_R8A7790)	+= setup-r8a7790.o
 obj-$(CONFIG_ARCH_R8A7790)	+= setup-r8a7790.o setup-rcar-gen2.o
 obj-$(CONFIG_ARCH_R8A7791)	+= setup-r8a7791.o setup-rcar-gen2.o
+obj-$(CONFIG_ARCH_R8A7794)	+= setup-r8a7794.o
 obj-$(CONFIG_ARCH_EMEV2)	+= setup-emev2.o
 obj-$(CONFIG_ARCH_R7S72100)	+= setup-r7s72100.o
 
diff --git a/arch/arm/mach-shmobile/setup-r8a7794.c b/arch/arm/mach-shmobile/setup-r8a7794.c
new file mode 100644
index 0000000..05e970c
--- /dev/null
+++ b/arch/arm/mach-shmobile/setup-r8a7794.c
@@ -0,0 +1,35 @@
+/*
+ * r8a7794 processor support
+ *
+ * Copyright (C) 2014  Renesas Electronics Corporation
+ * Copyright (C) 2014  Ulrich Hecht
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/of_platform.h>
+#include "common.h"
+#include "rcar-gen2.h"
+#include <asm/mach/arch.h>
+
+#ifdef CONFIG_USE_OF
+
+static const char * const r8a7794_boards_compat_dt[] __initconst = {
+	"renesas,r8a7794",
+	NULL,
+};
+
+DT_MACHINE_START(R8A7794_DT, "Generic R8A7794 (Flattened Device Tree)")
+	.init_early	= shmobile_init_delay,
+	.init_late	= shmobile_init_late,
+	.init_time	= rcar_gen2_timer_init,
+	.dt_compat	= r8a7794_boards_compat_dt,
+MACHINE_END
+#endif /* CONFIG_USE_OF */
-- 
2.0.1

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

* [GIT PULL] Third Round of Renesas ARM Based SoC Soc Updates for v3.18
  2014-09-09  4:22 [GIT PULL] Third Round of Renesas ARM Based SoC Soc Updates for v3.18 Simon Horman
  2014-09-09  4:22 ` [PATCH 1/2] ARM: shmobile: support Cortex-A7 in shmobile_init_delay() Simon Horman
  2014-09-09  4:22 ` [PATCH 2/2] ARM: shmobile: Initial r8a7794 SoC support Simon Horman
@ 2014-09-09 15:20 ` Arnd Bergmann
  2014-09-09 23:52   ` Simon Horman
  2 siblings, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2014-09-09 15:20 UTC (permalink / raw)
  To: linux-arm-kernel

On Tuesday 09 September 2014 13:22:17 Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
> 
> Please consider these third round of Renesas ARM based SoC soc updates for v3.18.
> 
> This pull request is based on the previous round of
> such requests, tagged as renesas-soc2-for-v3.18,
> which you have already pulled.
> 
> This pull-request has a minor conflict with
> "[GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18",
> tagged as renesas-kconfig-cleanups-for-v3.18, which you
> have previously pulled.

Pulled into next/soc as well. One detail I noticed for the first time is
that the setup-*.c file hides the machine descriptor inside of #ifdef
CONFIG_USE_OF, which makes no sense since the file is only compiled
when ARCH_MULTIPLATFORM is set, and that does 'select USE_OF'.
It would be better not to add that #ifdef for new files, and you
could perhaps remove the existing ones after the conversion to
multiplatform is complete.

Thanks,

	Arnd

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

* [GIT PULL] Third Round of Renesas ARM Based SoC Soc Updates for v3.18
  2014-09-09 15:20 ` [GIT PULL] Third Round of Renesas ARM Based SoC Soc Updates for v3.18 Arnd Bergmann
@ 2014-09-09 23:52   ` Simon Horman
  0 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2014-09-09 23:52 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Sep 09, 2014 at 05:20:11PM +0200, Arnd Bergmann wrote:
> On Tuesday 09 September 2014 13:22:17 Simon Horman wrote:
> > Hi Olof, Hi Kevin, Hi Arnd,
> > 
> > Please consider these third round of Renesas ARM based SoC soc updates for v3.18.
> > 
> > This pull request is based on the previous round of
> > such requests, tagged as renesas-soc2-for-v3.18,
> > which you have already pulled.
> > 
> > This pull-request has a minor conflict with
> > "[GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18",
> > tagged as renesas-kconfig-cleanups-for-v3.18, which you
> > have previously pulled.
> 
> Pulled into next/soc as well. One detail I noticed for the first time is
> that the setup-*.c file hides the machine descriptor inside of #ifdef
> CONFIG_USE_OF, which makes no sense since the file is only compiled
> when ARCH_MULTIPLATFORM is set, and that does 'select USE_OF'.
> It would be better not to add that #ifdef for new files, and you
> could perhaps remove the existing ones after the conversion to
> multiplatform is complete.

Thanks Arnd, you make a good point.
I'll see about cleaning that up.

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

end of thread, other threads:[~2014-09-09 23:52 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-09  4:22 [GIT PULL] Third Round of Renesas ARM Based SoC Soc Updates for v3.18 Simon Horman
2014-09-09  4:22 ` [PATCH 1/2] ARM: shmobile: support Cortex-A7 in shmobile_init_delay() Simon Horman
2014-09-09  4:22 ` [PATCH 2/2] ARM: shmobile: Initial r8a7794 SoC support Simon Horman
2014-09-09 15:20 ` [GIT PULL] Third Round of Renesas ARM Based SoC Soc Updates for v3.18 Arnd Bergmann
2014-09-09 23:52   ` Simon Horman

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