All of lore.kernel.org
 help / color / mirror / Atom feed
From: Geert Uytterhoeven <geert+renesas@glider.be>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/4] ARM: shmobile: sh73a0: Introduce generic setup callback
Date: Fri, 09 Jan 2015 13:08:49 +0000	[thread overview]
Message-ID: <1420808932-3899-2-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1420808932-3899-1-git-send-email-geert+renesas@glider.be>

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

Add a generic sh73a0 machine setup callback for the upcoming
sh73a0 multiplatform case. Cache needs to be configured, and
legacy clocks must be omitted.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm/mach-shmobile/setup-sh73a0.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index 613ce65184a6648c..ee86ca0a261c9d54 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -30,6 +30,7 @@
 #include <linux/platform_data/sh_ipmmu.h>
 #include <linux/platform_data/irq-renesas-intc-irqpin.h>
 
+#include <asm/hardware/cache-l2x0.h>
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 #include <asm/mach/arch.h>
@@ -782,8 +783,6 @@ void __init sh73a0_add_early_devices(void)
 	shmobile_setup_console();
 }
 
-#ifdef CONFIG_USE_OF
-
 void __init sh73a0_add_standard_devices_dt(void)
 {
 	/* clocks are setup late during boot in the case of DT */
@@ -800,6 +799,17 @@ static void sh73a0_restart(enum reboot_mode mode, const char *cmd)
 	writel((1 << 31), RESCNT2);
 }
 
+#ifdef CONFIG_USE_OF
+
+static void __init sh73a0_generic_init(void)
+{
+#ifdef CONFIG_CACHE_L2X0
+	/* Shared attribute override enable, 64K*8way */
+	l2x0_init(IOMEM(0xf0100000), 0x00400000, 0xc20f0fff);
+#endif
+	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
 static const char *sh73a0_boards_compat_dt[] __initdata = {
 	"renesas,sh73a0",
 	NULL,
@@ -809,7 +819,7 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
 	.smp		= smp_ops(sh73a0_smp_ops),
 	.map_io		= sh73a0_map_io,
 	.init_early	= shmobile_init_delay,
-	.init_machine	= sh73a0_add_standard_devices_dt,
+	.init_machine	= sh73a0_generic_init,
 	.init_late	= shmobile_init_late,
 	.restart	= sh73a0_restart,
 	.dt_compat	= sh73a0_boards_compat_dt,
-- 
1.9.1


WARNING: multiple messages have this Message-ID (diff)
From: geert+renesas@glider.be (Geert Uytterhoeven)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/4] ARM: shmobile: sh73a0: Introduce generic setup callback
Date: Fri,  9 Jan 2015 14:08:49 +0100	[thread overview]
Message-ID: <1420808932-3899-2-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1420808932-3899-1-git-send-email-geert+renesas@glider.be>

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

Add a generic sh73a0 machine setup callback for the upcoming
sh73a0 multiplatform case. Cache needs to be configured, and
legacy clocks must be omitted.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm/mach-shmobile/setup-sh73a0.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index 613ce65184a6648c..ee86ca0a261c9d54 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -30,6 +30,7 @@
 #include <linux/platform_data/sh_ipmmu.h>
 #include <linux/platform_data/irq-renesas-intc-irqpin.h>
 
+#include <asm/hardware/cache-l2x0.h>
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 #include <asm/mach/arch.h>
@@ -782,8 +783,6 @@ void __init sh73a0_add_early_devices(void)
 	shmobile_setup_console();
 }
 
-#ifdef CONFIG_USE_OF
-
 void __init sh73a0_add_standard_devices_dt(void)
 {
 	/* clocks are setup late during boot in the case of DT */
@@ -800,6 +799,17 @@ static void sh73a0_restart(enum reboot_mode mode, const char *cmd)
 	writel((1 << 31), RESCNT2);
 }
 
+#ifdef CONFIG_USE_OF
+
+static void __init sh73a0_generic_init(void)
+{
+#ifdef CONFIG_CACHE_L2X0
+	/* Shared attribute override enable, 64K*8way */
+	l2x0_init(IOMEM(0xf0100000), 0x00400000, 0xc20f0fff);
+#endif
+	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
 static const char *sh73a0_boards_compat_dt[] __initdata = {
 	"renesas,sh73a0",
 	NULL,
@@ -809,7 +819,7 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
 	.smp		= smp_ops(sh73a0_smp_ops),
 	.map_io		= sh73a0_map_io,
 	.init_early	= shmobile_init_delay,
-	.init_machine	= sh73a0_add_standard_devices_dt,
+	.init_machine	= sh73a0_generic_init,
 	.init_late	= shmobile_init_late,
 	.restart	= sh73a0_restart,
 	.dt_compat	= sh73a0_boards_compat_dt,
-- 
1.9.1

  reply	other threads:[~2015-01-09 13:08 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-09 13:08 [PATCH 0/4] ARM: shmobile: sh73a0/kzm9g: Introduce multiplatform support Geert Uytterhoeven
2015-01-09 13:08 ` Geert Uytterhoeven
2015-01-09 13:08 ` Geert Uytterhoeven [this message]
2015-01-09 13:08   ` [PATCH 1/4] ARM: shmobile: sh73a0: Introduce generic setup callback Geert Uytterhoeven
2015-01-09 13:08 ` [PATCH 2/4] ARM: shmobile: sh73a0: Add Multiplatform support Geert Uytterhoeven
2015-01-09 13:08   ` Geert Uytterhoeven
2015-01-09 13:08 ` [PATCH 3/4] ARM: shmobile: kzm9g dts: Sync with kzm9g-reference dts Geert Uytterhoeven
2015-01-09 13:08   ` Geert Uytterhoeven
2015-01-09 13:08 ` [PATCH 4/4] ARM: shmobile: kzm9g: Build DTS for Multiplatform Geert Uytterhoeven
2015-01-09 13:08   ` Geert Uytterhoeven
2015-01-09 13:24 ` [PATCH 0/4] ARM: shmobile: sh73a0/kzm9g: Complete multiplatform support Geert Uytterhoeven
2015-01-09 13:24   ` Geert Uytterhoeven
2015-01-13  2:08   ` Simon Horman
2015-01-13  2:08     ` Simon Horman
2015-01-13 10:08     ` Geert Uytterhoeven
2015-01-13 10:08       ` Geert Uytterhoeven
2015-01-14  4:08       ` Simon Horman
2015-01-14  4:08         ` Simon Horman
2015-01-14 10:03         ` Geert Uytterhoeven
2015-01-14 10:03           ` Geert Uytterhoeven
2015-01-14 23:34           ` Simon Horman
2015-01-14 23:34             ` Simon Horman
2015-01-13  2:08 ` [PATCH 0/4] ARM: shmobile: sh73a0/kzm9g: Introduce " Simon Horman
2015-01-13  2:08   ` Simon Horman
2015-01-22  2:48   ` Simon Horman
2015-01-22  2:48     ` Simon Horman
2015-01-22  2:50     ` Simon Horman
2015-01-22  2:50       ` Simon Horman
2015-01-23  4:22       ` Simon Horman
2015-01-23  4:22         ` Simon Horman
2015-01-23  9:56         ` Geert Uytterhoeven
2015-01-23  9:56           ` Geert Uytterhoeven

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=1420808932-3899-2-git-send-email-geert+renesas@glider.be \
    --to=geert+renesas@glider.be \
    --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.