linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Magnus Damm <magnus.damm@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/06] ARM: shmobile: Marzen memory size fixup
Date: Wed, 05 Jun 2013 07:34:59 +0000	[thread overview]
Message-ID: <20130605073459.15758.14086.sendpatchset@w520> (raw)
In-Reply-To: <20130605073410.15758.37563.sendpatchset@w520>

From: Magnus Damm <damm@opensource.se>

Specify the Marzen memory configuration via
a board specific fixup callback, and also
select ATAGS to make sure the callback is
executed as expected.

Signed-off-by: Magnus Damm <damm@opensource.se>
---

 arch/arm/mach-shmobile/Kconfig        |    1 +
 arch/arm/mach-shmobile/board-marzen.c |    4 ++++
 2 files changed, 5 insertions(+)

--- 0008/arch/arm/mach-shmobile/Kconfig
+++ work/arch/arm/mach-shmobile/Kconfig	2013-06-04 15:30:05.000000000 +0900
@@ -143,6 +143,7 @@ config MACH_BOCKW
 config MACH_MARZEN
 	bool "MARZEN board"
 	depends on ARCH_R8A7779
+	select ATAGS
 	select ARCH_REQUIRE_GPIOLIB
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
--- 0001/arch/arm/mach-shmobile/board-marzen.c
+++ work/arch/arm/mach-shmobile/board-marzen.c	2013-06-04 15:34:21.000000000 +0900
@@ -46,6 +46,7 @@
 #include <mach/irqs.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
+#include <asm/setup.h>
 #include <asm/traps.h>
 
 /* Fixed 3.3V regulator to be used by SDHI0 */
@@ -409,7 +410,10 @@ static void __init marzen_init(void)
 	platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
 }
 
+SHMOBILE_FIXUP(marzen, 0x60000000, 0x10000000)
+
 MACHINE_START(MARZEN, "marzen")
+	.fixup		= marzen_fixup,
 	.smp		= smp_ops(r8a7779_smp_ops),
 	.map_io		= r8a7779_map_io,
 	.init_early	= r8a7779_add_early_devices,

      parent reply	other threads:[~2013-06-05  7:34 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-05  7:34 [PATCH 00/06] ARM: shmobile: Per-board memory size fixups Magnus Damm
2013-06-05  7:31 ` Magnus Damm
2013-06-05  7:34 ` [PATCH 01/06] ARM: shmobile: Introduce SHMOBILE_FIXUP() helper Magnus Damm
2013-06-05 19:20   ` Russell King - ARM Linux
2013-06-05 23:47     ` Magnus Damm
2013-06-06 17:17       ` Arnd Bergmann
2013-06-10  7:22         ` Magnus Damm
2013-06-10 15:27           ` Arnd Bergmann
2013-06-06 16:53     ` Arnd Bergmann
2013-06-05  7:34 ` [PATCH 02/06] ARM: shmobile: AG5EVM memory size fixup Magnus Damm
2013-06-05  7:34 ` [PATCH 03/06] ARM: shmobile: AP4EVB " Magnus Damm
2013-06-05  7:34 ` [PATCH 04/06] ARM: shmobile: Bonito " Magnus Damm
2013-06-05  7:34 ` [PATCH 05/06] ARM: shmobile: Kota2 " Magnus Damm
2013-06-05  7:34 ` Magnus Damm [this message]

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=20130605073459.15758.14086.sendpatchset@w520 \
    --to=magnus.damm@gmail.com \
    --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).