[GIT] Second Round of Renesas ARM based SoC fixes for v3.12

[GIT] Second Round of Renesas ARM based SoC fixes for v3.12

[Simon Horman]

Hi Olof, Hi Arnd,

please consider this second round of Renesas ARM based SoC fixes for v3.12.

It is based on the first round of Renesas ARM based SoC fixes for v3.12,
/renesas-fixes-for-v3.12, which I have already send a pull-request for.

The following changes since commit 93d8a6fbe69a629a7bb37bb546699a5c49963dc5:

  ARM: shmobile: r8a7740: Fix TPU clock name (2013-07-19 11:12:35 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes2-for-v3.12

for you to fetch changes up to ab40900b70dc31a64f23b1b4dbb0917afb039775:

  ARM: shmobile: armadillo800eva-reference: fix compiler warning (2013-07-23 10:35:33 +0900)

----------------------------------------------------------------
Second Round of Renesas ARM based SoC fixes for v3.12

* Fix compiler warning in armadillo800eva board code

----------------------------------------------------------------
Guennadi Liakhovetski (1):
      ARM: shmobile: armadillo800eva-reference: fix compiler warning

 arch/arm/mach-shmobile/board-armadillo800eva-reference.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[PATCH] ARM: shmobile: armadillo800eva-reference: fix compiler warning

[Simon Horman]

From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

Fix the compiler warning:

arch/arm/mach-shmobile/board-armadillo800eva-reference.c:196:2: warning: initialization from incompatible pointer type [enabled by default]
arch/arm/mach-shmobile/board-armadillo800eva-reference.c:196:2: warning: (near initialization for '__mach_desc_ARMADILLO800EVA_DT.restart') [enabled by default]

While at it also remove superfluous parenthesis.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/board-armadillo800eva-reference.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
index 03b85fe..8f677df 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
@@ -190,10 +190,10 @@ static void __init eva_init(void)
 }
 
 #define RESCNT2 IOMEM(0xe6188020)
-static void eva_restart(char mode, const char *cmd)
+static void eva_restart(enum reboot_mode mode, const char *cmd)
 {
 	/* Do soft power on reset */
-	writel((1 << 31), RESCNT2);
+	writel(1 << 31, RESCNT2);
 }
 
 static const char *eva_boards_compat_dt[] __initdata = {
-- 
1.8.3.2

[GIT] Second Round of Renesas ARM based SoC fixes for v3.12

[Olof Johansson]

On Thu, Aug 01, 2013 at 05:27:15PM +0900, Simon Horman wrote:
> Hi Olof, Hi Arnd,
> 
> please consider this second round of Renesas ARM based SoC fixes for v3.12.
> 
> It is based on the first round of Renesas ARM based SoC fixes for v3.12,
> /renesas-fixes-for-v3.12, which I have already send a pull-request for.
> 
> The following changes since commit 93d8a6fbe69a629a7bb37bb546699a5c49963dc5:
> 
>   ARM: shmobile: r8a7740: Fix TPU clock name (2013-07-19 11:12:35 +0900)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes2-for-v3.12
> 
> for you to fetch changes up to ab40900b70dc31a64f23b1b4dbb0917afb039775:
> 
>   ARM: shmobile: armadillo800eva-reference: fix compiler warning (2013-07-23 10:35:33 +0900)

Pulled.


-Olof