Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a179c1f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-cleanup-for-v3.15' of... 

Merge tag 'renesas-cleanup-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

Merge "Renesas ARM Based SoC Clean-Ups for v3.15" from Simon Horman:

* 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

* tag 'renesas-cleanup-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: emev2: Use __initconst for const init definition
  ARM: shmobile: r8a7779: Remove unused clock constants
  ARM: shmobile: Remove duplicate shmobile_invalidate_start() declaration

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 11d73c56 d24d1780

arch/arm/mach-shmobile/clock-r8a7779.c

+0 −7
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-shmobile/include/mach/common.h

+0 −1
Original line number Diff line number Diff line
@@ -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 *);

arch/arm/mach-shmobile/setup-emev2.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};