All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Horman <horms+renesas@verge.net.au>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/6] ARM: shmobile: r8a7740: Multiplatform support
Date: Thu, 04 Sep 2014 01:12:46 +0000	[thread overview]
Message-ID: <c41215b781efbfa22ffc9dc474c2981c130c153d.1409792648.git.horms+renesas@verge.net.au> (raw)
In-Reply-To: <cover.1409792648.git.horms+renesas@verge.net.au>

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

Enable r8a7740 Multiplatform support for the generic r8a7740
machine vector. No board support is enabled, and the board
code for Armadillo 800 EVA DT Reference is left by itself.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/Kconfig         | 5 +++++
 arch/arm/mach-shmobile/pm-r8a7740.c    | 5 ++---
 arch/arm/mach-shmobile/r8a7740.h       | 4 ++--
 arch/arm/mach-shmobile/setup-r8a7740.c | 8 +++++++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index e15dff7..498162f 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -26,6 +26,11 @@ config ARCH_R7S72100
 	bool "RZ/A1H (R7S72100)"
 	select SYS_SUPPORTS_SH_MTU2
 
+config ARCH_R8A7740
+	bool "R-Mobile A1 (R8A77400)"
+	select ARCH_RMOBILE
+	select RENESAS_INTC_IRQPIN
+
 config ARCH_R8A7779
 	bool "R-Car H1 (R8A77790)"
 	select RENESAS_INTC_IRQPIN
diff --git a/arch/arm/mach-shmobile/pm-r8a7740.c b/arch/arm/mach-shmobile/pm-r8a7740.c
index a0d44d5..4d327de 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -13,7 +13,7 @@
 #include "common.h"
 #include "pm-rmobile.h"
 
-#ifdef CONFIG_PM
+#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM)
 static int r8a7740_pd_a4s_suspend(void)
 {
 	/*
@@ -58,8 +58,7 @@ void __init r8a7740_init_pm_domains(void)
 	rmobile_init_domains(r8a7740_pm_domains, ARRAY_SIZE(r8a7740_pm_domains));
 	pm_genpd_add_subdomain_names("A4S", "A3SP");
 }
-
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */
 
 #ifdef CONFIG_SUSPEND
 static int r8a7740_enter_suspend(suspend_state_t suspend_state)
diff --git a/arch/arm/mach-shmobile/r8a7740.h b/arch/arm/mach-shmobile/r8a7740.h
index 3352fb8..f369b4b 100644
--- a/arch/arm/mach-shmobile/r8a7740.h
+++ b/arch/arm/mach-shmobile/r8a7740.h
@@ -53,10 +53,10 @@ extern void r8a7740_clock_init(u8 md_ck);
 extern void r8a7740_pinmux_init(void);
 extern void r8a7740_pm_init(void);
 
-#ifdef CONFIG_PM
+#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM)
 extern void __init r8a7740_init_pm_domains(void);
 #else
 static inline void r8a7740_init_pm_domains(void) {}
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */
 
 #endif /* __ASM_R8A7740_H__ */
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 8fe270d..1e55c50 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -36,6 +36,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
+#include <asm/hardware/cache-l2x0.h>
 
 #include "common.h"
 #include "dma-register.h"
@@ -813,7 +814,12 @@ void __init r8a7740_init_irq_of(void)
 
 static void __init r8a7740_generic_init(void)
 {
-	r8a7740_clock_init(0);
+	r8a7740_meram_workaround();
+
+#ifdef CONFIG_CACHE_L2X0
+	/* Shared attribute override enable, 32K*8way */
+	l2x0_init(IOMEM(0xf0002000), 0x00400000, 0xc20f0fff);
+#endif
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
-- 
2.0.1


WARNING: multiple messages have this Message-ID (diff)
From: horms+renesas@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/6] ARM: shmobile: r8a7740: Multiplatform support
Date: Thu,  4 Sep 2014 10:12:46 +0900	[thread overview]
Message-ID: <c41215b781efbfa22ffc9dc474c2981c130c153d.1409792648.git.horms+renesas@verge.net.au> (raw)
In-Reply-To: <cover.1409792648.git.horms+renesas@verge.net.au>

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

Enable r8a7740 Multiplatform support for the generic r8a7740
machine vector. No board support is enabled, and the board
code for Armadillo 800 EVA DT Reference is left by itself.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/Kconfig         | 5 +++++
 arch/arm/mach-shmobile/pm-r8a7740.c    | 5 ++---
 arch/arm/mach-shmobile/r8a7740.h       | 4 ++--
 arch/arm/mach-shmobile/setup-r8a7740.c | 8 +++++++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index e15dff7..498162f 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -26,6 +26,11 @@ config ARCH_R7S72100
 	bool "RZ/A1H (R7S72100)"
 	select SYS_SUPPORTS_SH_MTU2
 
+config ARCH_R8A7740
+	bool "R-Mobile A1 (R8A77400)"
+	select ARCH_RMOBILE
+	select RENESAS_INTC_IRQPIN
+
 config ARCH_R8A7779
 	bool "R-Car H1 (R8A77790)"
 	select RENESAS_INTC_IRQPIN
diff --git a/arch/arm/mach-shmobile/pm-r8a7740.c b/arch/arm/mach-shmobile/pm-r8a7740.c
index a0d44d5..4d327de 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -13,7 +13,7 @@
 #include "common.h"
 #include "pm-rmobile.h"
 
-#ifdef CONFIG_PM
+#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM)
 static int r8a7740_pd_a4s_suspend(void)
 {
 	/*
@@ -58,8 +58,7 @@ void __init r8a7740_init_pm_domains(void)
 	rmobile_init_domains(r8a7740_pm_domains, ARRAY_SIZE(r8a7740_pm_domains));
 	pm_genpd_add_subdomain_names("A4S", "A3SP");
 }
-
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */
 
 #ifdef CONFIG_SUSPEND
 static int r8a7740_enter_suspend(suspend_state_t suspend_state)
diff --git a/arch/arm/mach-shmobile/r8a7740.h b/arch/arm/mach-shmobile/r8a7740.h
index 3352fb8..f369b4b 100644
--- a/arch/arm/mach-shmobile/r8a7740.h
+++ b/arch/arm/mach-shmobile/r8a7740.h
@@ -53,10 +53,10 @@ extern void r8a7740_clock_init(u8 md_ck);
 extern void r8a7740_pinmux_init(void);
 extern void r8a7740_pm_init(void);
 
-#ifdef CONFIG_PM
+#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM)
 extern void __init r8a7740_init_pm_domains(void);
 #else
 static inline void r8a7740_init_pm_domains(void) {}
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */
 
 #endif /* __ASM_R8A7740_H__ */
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 8fe270d..1e55c50 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -36,6 +36,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
+#include <asm/hardware/cache-l2x0.h>
 
 #include "common.h"
 #include "dma-register.h"
@@ -813,7 +814,12 @@ void __init r8a7740_init_irq_of(void)
 
 static void __init r8a7740_generic_init(void)
 {
-	r8a7740_clock_init(0);
+	r8a7740_meram_workaround();
+
+#ifdef CONFIG_CACHE_L2X0
+	/* Shared attribute override enable, 32K*8way */
+	l2x0_init(IOMEM(0xf0002000), 0x00400000, 0xc20f0fff);
+#endif
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
-- 
2.0.1

  reply	other threads:[~2014-09-04  1:12 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-26  5:23 [GIT PULL] Renesas ARM Based SoC r8a7740 CCF and Timers Updates for v3.18 Simon Horman
2014-08-26  5:23 ` Simon Horman
2014-08-26  5:23 ` [PATCH 1/8] ARM: shmobile: r8a7740: clock register bits Simon Horman
2014-08-26  5:23   ` Simon Horman
2014-08-26  5:23 ` [PATCH 2/8] ARM: shmobile: r8a7740: add SoC clocks to DTS Simon Horman
2014-08-26  5:23   ` Simon Horman
2014-08-26  5:23 ` [PATCH 3/8] ARM: shmobile: r8a7740: add MSTP clock assignments to DT Simon Horman
2014-08-26  5:23   ` Simon Horman
2014-08-26  5:23 ` [PATCH 4/8] ARM: shmobile: armadillo800eva-reference: add clock overrides to DTS Simon Horman
2014-08-26  5:23   ` Simon Horman
2014-08-26  5:23 ` [PATCH 5/8] ARM: shmobile: r8a7740: Add CMT1 device to DT Simon Horman
2014-08-26  5:23   ` Simon Horman
2014-08-26  5:24 ` [PATCH 6/8] ARM: shmobile: armadillo800eva-reference: Enable CMT1 in device tree Simon Horman
2014-08-26  5:24   ` Simon Horman
2014-08-26  5:24 ` [PATCH 7/8] ARM: shmobile: armadillo800eva-reference: Do not use r8a7740_add_standard_devices_dt() Simon Horman
2014-08-26  5:24   ` Simon Horman
2014-08-26  5:24 ` [PATCH 8/8] ARM: shmobile: r8a7740: Remove r8a7740_add_standard_devices_dt Simon Horman
2014-08-26  5:24   ` Simon Horman
2014-08-26  9:17 ` [GIT PULL] Renesas ARM Based SoC r8a7740 CCF and Timers Updates for v3.18 Simon Horman
2014-08-26  9:17   ` Simon Horman
2014-09-02  1:08   ` Simon Horman
2014-09-02  1:08     ` Simon Horman
2014-09-04  1:12 ` [GIT PULL] Renesas ARM Based SoC r8a7740 Multiplatform " Simon Horman
2014-09-04  1:12   ` Simon Horman
2014-09-04  1:12   ` Simon Horman [this message]
2014-09-04  1:12     ` [PATCH 1/6] ARM: shmobile: r8a7740: Multiplatform support Simon Horman
2014-09-04  1:12   ` [PATCH 2/6] ARM: shmobile: armadillo800eva: Sync DTS Simon Horman
2014-09-04  1:12     ` Simon Horman
2014-09-04  1:12   ` [PATCH 3/6] ARM: shmobile: armadillo800eva: Build DTS for multiplatform Simon Horman
2014-09-04  1:12     ` Simon Horman
2014-09-04  1:12   ` [PATCH 4/6] ARM: shmobile: r8a7740: Add restart callback Simon Horman
2014-09-04  1:12     ` Simon Horman
2014-09-04  1:12   ` [PATCH 5/6] ARM: shmobile: armadillo800eva reference: Remove C board code Simon Horman
2014-09-04  1:12     ` Simon Horman
2014-09-04  1:12   ` [PATCH 6/6] ARM: shmobile: armadillo800eva reference: Remove DTS Simon Horman
2014-09-04  1:12     ` Simon Horman
2014-09-04  4:01   ` [GIT PULL] Renesas ARM Based SoC r8a7740 Multiplatform Updates for v3.18 Simon Horman
2014-09-04  4:01     ` Simon Horman
2014-09-05 16:17 ` [GIT PULL] Renesas ARM Based SoC r8a7740 CCF and Timers " Arnd Bergmann
2014-09-05 16:17   ` Arnd Bergmann
2014-09-09  4:22 [GIT PULL v2] Renesas ARM Based SoC r8a7740 Multiplatform " Simon Horman
2014-09-09  4:22 ` [PATCH 1/6] ARM: shmobile: r8a7740: Multiplatform support Simon Horman
2014-09-09  4:22   ` Simon Horman

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=c41215b781efbfa22ffc9dc474c2981c130c153d.1409792648.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.