[GIT PULL 0/3] Renesas ARM Based SoC Clean-Ups for v3.15

[GIT PULL 0/3] Renesas ARM Based SoC Clean-Ups for v3.15

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

please consider these Renesas ARM Based SoC clean-ups for v3.15.


The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:

  Linus 3.14-rc1 (2014-02-02 16:42:13 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup-for-v3.15

for you to fetch changes up to d24d1780c340777942061ef3445edcf228e8d35b:

  ARM: shmobile: emev2: Use __initconst for const init definition (2014-02-04 10:24:28 +0900)

----------------------------------------------------------------
Renesas ARM Based SoC Clean-Ups for v3.15

* Renesas SoCs (Global)
  - Remove duplicate shmobile_invalidate_start() declaration

* emev2 SoC (Emma Mobile)
  - Use __initconst for const init definition

* r8a7779 SoC (R-Car H1)
  - Remove unused clock constants

----------------------------------------------------------------
Geert Uytterhoeven (1):
      ARM: shmobile: Remove duplicate shmobile_invalidate_start() declaration

Simon Horman (2):
      ARM: shmobile: r8a7779: Remove unused clock constants
      ARM: shmobile: emev2: Use __initconst for const init definition

 arch/arm/mach-shmobile/clock-r8a7779.c       | 7 -------
 arch/arm/mach-shmobile/include/mach/common.h | 1 -
 arch/arm/mach-shmobile/setup-emev2.c         | 2 +-
 3 files changed, 1 insertion(+), 9 deletions(-)

[PATCH 1/3] ARM: shmobile: Remove duplicate shmobile_invalidate_start() declaration

[Simon Horman]

From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/include/mach/common.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h
index e319805..cb8e32d 100644
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@ -25,7 +25,6 @@ extern int shmobile_smp_apmu_boot_secondary(unsigned int cpu,
 					    struct task_struct *idle);
 extern void shmobile_smp_apmu_cpu_die(unsigned int cpu);
 extern int shmobile_smp_apmu_cpu_kill(unsigned int cpu);
-extern void shmobile_invalidate_start(void);
 struct clk;
 extern int shmobile_clk_init(void);
 extern void shmobile_handle_irq_intc(struct pt_regs *);
-- 
1.8.5.2

[PATCH 2/3] ARM: shmobile: r8a7779: Remove unused clock constants

[Simon Horman]

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 arch/arm/mach-shmobile/clock-r8a7779.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
index f1fb89b..cabedeb 100644
--- a/arch/arm/mach-shmobile/clock-r8a7779.c
+++ b/arch/arm/mach-shmobile/clock-r8a7779.c
@@ -47,17 +47,10 @@
 
 #define MD(nr)	BIT(nr)
 
-#define FRQMR		IOMEM(0xffc80014)
 #define MSTPCR0		IOMEM(0xffc80030)
 #define MSTPCR1		IOMEM(0xffc80034)
 #define MSTPCR3		IOMEM(0xffc8003c)
 #define MSTPSR1		IOMEM(0xffc80044)
-#define MSTPSR4		IOMEM(0xffc80048)
-#define MSTPSR6		IOMEM(0xffc8004c)
-#define MSTPCR4		IOMEM(0xffc80050)
-#define MSTPCR5		IOMEM(0xffc80054)
-#define MSTPCR6		IOMEM(0xffc80058)
-#define MSTPCR7		IOMEM(0xffc80040)
 
 #define MODEMR		0xffcc0020
 
-- 
1.8.5.2

[PATCH 3/3] ARM: shmobile: emev2: Use __initconst for const init definition

[Simon Horman]

__initconst must be used instead of __initdata for
const init definitions.

This problem was introduced by 3d5de27174955702 ("mach-shmobile: Emma
Mobile EV2 DT support V3") in v3.4-rc7.

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/setup-emev2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c
index c8f2a1a..c71d667 100644
--- a/arch/arm/mach-shmobile/setup-emev2.c
+++ b/arch/arm/mach-shmobile/setup-emev2.c
@@ -58,7 +58,7 @@ static void __init emev2_add_standard_devices_dt(void)
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
-static const char *emev2_boards_compat_dt[] __initdata = {
+static const char *emev2_boards_compat_dt[] __initconst = {
 	"renesas,emev2",
 	NULL,
 };
-- 
1.8.5.2

[GIT PULL 0/3] Renesas ARM Based SoC Clean-Ups for v3.15

[Olof Johansson]

On Thu, Feb 06, 2014 at 03:20:06PM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
> 
> please consider these Renesas ARM Based SoC clean-ups for v3.15.
> 
> 
> The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:
> 
>   Linus 3.14-rc1 (2014-02-02 16:42:13 -0800)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup-for-v3.15
> 
> for you to fetch changes up to d24d1780c340777942061ef3445edcf228e8d35b:
> 
>   ARM: shmobile: emev2: Use __initconst for const init definition (2014-02-04 10:24:28 +0900)
> 
> ----------------------------------------------------------------
> Renesas ARM Based SoC Clean-Ups for v3.15
> 
> * Renesas SoCs (Global)
>   - Remove duplicate shmobile_invalidate_start() declaration
> 
> * emev2 SoC (Emma Mobile)
>   - Use __initconst for const init definition
> 
> * r8a7779 SoC (R-Car H1)
>   - Remove unused clock constants

Merged into next/cleanup.


Thanks,

-Olof