[GIT PULL] Renesas ARM-based SoC: KZM-9A-GT for 3.7

Hi Olaf, Hi Arnd,

please consider the following enhancement for the KZM-9A-GT board
from Tetsuyuki Kobayashi for inclusion in 3.7.

----------------------------------------------------------------
The following changes since commit fea7a08acb13524b47711625eebea40a0ede69a0:

  Linux 3.6-rc3 (2012-08-22 13:29:06 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git kzm9g

for you to fetch changes up to 7952717adb69efc1d2443a1858f96d23c2fb93e0:

  ARM: shmobile: kzm9g: enable restarting (2012-08-25 14:39:44 +0900)

----------------------------------------------------------------
Tetsuyuki Kobayashi (1):
      ARM: shmobile: kzm9g: enable restarting

 arch/arm/mach-shmobile/board-kzm9g.c | 8 ++++++++
 1 file changed, 8 insertions(+)

From: Tetsuyuki Kobayashi <redacted>

Do soft-power-on-reset in sys_reboot system call.

How to test this patch
  Execute "sudo reboot" from command line. The system will start shutdown
  sequence and finally reboot and U-Boot restarts.

Cc: Nobuhiro Iwamatsu <redacted>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Tetsuyuki Kobayashi <redacted>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 arch/arm/mach-shmobile/board-kzm9g.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index 53b7ea9..fd21fb6 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c

@@ -763,6 +763,13 @@ static void __init kzm_init(void)
 	platform_add_devices(kzm_devices, ARRAY_SIZE(kzm_devices));
 }
 
+static void kzm9g_restart(char mode, const char *cmd)
+{
+#define RESCNT2 0xe6188020
+	/* Do soft power on reset */
+	writel((1 << 31), RESCNT2);
+}
+
 static const char *kzm9g_boards_compat_dt[] __initdata = {
 	"renesas,kzm9g",
 	NULL,

@@ -777,5 +784,6 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g")
 	.init_machine	= kzm_init,
 	.init_late	= shmobile_init_late,
 	.timer		= &shmobile_timer,
+	.restart	= kzm9g_restart,
 	.dt_compat	= kzm9g_boards_compat_dt,
 MACHINE_END

-- 
1.7.10.2.484.gcd07cc5

(2012/08/28 9:18), Simon Horman wrote:

Hi Olaf, Hi Arnd,

please consider the following enhancement for the KZM-9A-GT board

Just a minor correction :)
The board name is KZM-A9-GT.

from Tetsuyuki Kobayashi for inclusion in 3.7.

----------------------------------------------------------------
The following changes since commit fea7a08acb13524b47711625eebea40a0ede69a0:

   Linux 3.6-rc3 (2012-08-22 13:29:06 -0700)

are available in the git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git kzm9g

for you to fetch changes up to 7952717adb69efc1d2443a1858f96d23c2fb93e0:

   ARM: shmobile: kzm9g: enable restarting (2012-08-25 14:39:44 +0900)

----------------------------------------------------------------
Tetsuyuki Kobayashi (1):
       ARM: shmobile: kzm9g: enable restarting

  arch/arm/mach-shmobile/board-kzm9g.c | 8 ++++++++
  1 file changed, 8 insertions(+)
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

On Tue, Aug 28, 2012 at 10:15:03AM +0900, Tetsuyuki Kobayashi wrote:

(2012/08/28 9:18), Simon Horman wrote:

quoted

Hi Olaf, Hi Arnd,

please consider the following enhancement for the KZM-9A-GT board

Just a minor correction :)
The board name is KZM-A9-GT.

Thanks, sorry about that.

On Tue, Aug 28, 2012 at 09:18:35AM +0900, Simon Horman wrote:

Hi Olaf, Hi Arnd,

please consider the following enhancement for the KZM-9A-GT board
from Tetsuyuki Kobayashi for inclusion in 3.7.

----------------------------------------------------------------
The following changes since commit fea7a08acb13524b47711625eebea40a0ede69a0:

  Linux 3.6-rc3 (2012-08-22 13:29:06 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git kzm9g

Thanks, pulled into next/soc.


-Olof

On Tuesday 28 August 2012, Simon Horman wrote:

----------------------------------------------------------------
Tetsuyuki Kobayashi (1):
      ARM: shmobile: kzm9g: enable restarting

 arch/arm/mach-shmobile/board-kzm9g.c | 8 ++++++++
 1 file changed, 8 insertions(+)

This patch ended up causing a new build warning in combination
with the io.h changes in Russell's tree.

I've just applied this patch on top, which is the same thing we
did to all the other open-coded mmio locations.

	Arnd

commit 28901c1fed11dfeab65f640878e85a9b61d311ed
Author: Arnd Bergmann [off-list ref]
Date:   Sun Sep 23 22:41:21 2012 +0000

    ARM: shmobile: add new __iomem annotation for new code
    
    While we fixed up all instances that were already present in v3.6,
    this one came in through new code.
    
    Without this patch, building kzm9g_defconfig results in:
    
    arch/arm/mach-shmobile/board-kzm9g.c: In function 'kzm9g_restart':
    arch/arm/mach-shmobile/board-kzm9g.c:781:2: warning: passing argument 2 of '__raw_writel' makes pointer from integer without a cast [enabled by default]
    
    Signed-off-by: Arnd Bergmann [off-list ref]
    Cc: Nobuhiro Iwamatsu [off-list ref]
    Cc: Kuninori Morimoto [off-list ref]
    Cc: Tetsuyuki Kobayashi [off-list ref]
    Cc: Simon Horman [off-list ref]

diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index fd21fb6..5d792e4 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c

@@ -765,7 +765,7 @@ static void __init kzm_init(void)
 
 static void kzm9g_restart(char mode, const char *cmd)
 {
-#define RESCNT2 0xe6188020
+#define RESCNT2 IOMEM(0xe6188020)
 	/* Do soft power on reset */
 	writel((1 << 31), RESCNT2);
 }

On Fri, Sep 28, 2012 at 08:02:28PM +0000, Arnd Bergmann wrote:

On Tuesday 28 August 2012, Simon Horman wrote:

quoted

----------------------------------------------------------------
Tetsuyuki Kobayashi (1):
      ARM: shmobile: kzm9g: enable restarting

 arch/arm/mach-shmobile/board-kzm9g.c | 8 ++++++++
 1 file changed, 8 insertions(+)

This patch ended up causing a new build warning in combination
with the io.h changes in Russell's tree.

I've just applied this patch on top, which is the same thing we
did to all the other open-coded mmio locations.

Thanks, sorry for missing that.