Commit 50c517d9 authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

ARM: shmobile: Break out R-Car Gen2 setup code 



Move arch timer workaround code and boot mode pin
handling from setup-r8a7790.c to setup-rcar-gen2.c.

With this in place the same code can be used on
other R-Car Generation 2 devices such as r8a7791.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
[horms+renesas@verge.net.au trivial rebase of board-lager.c
 for introduction of lager_add_standard_devices()]
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent b9b28f52

arch/arm/mach-shmobile/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o 
obj-$(CONFIG_ARCH_R8A7778)	+= setup-r8a7778.o

obj-$(CONFIG_ARCH_R8A7779)	+= setup-r8a7779.o

obj-$(CONFIG_ARCH_R8A7790)	+= setup-r8a7790.o

obj-$(CONFIG_ARCH_R8A7790)	+= setup-r8a7790.o setup-rcar-gen2.o

obj-$(CONFIG_ARCH_R8A7791)	+= setup-r8a7791.o

obj-$(CONFIG_ARCH_EMEV2)	+= setup-emev2.o

arch/arm/mach-shmobile/board-lager-reference.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static const char *lager_boards_compat_dt[] __initdata = { 
DT_MACHINE_START(LAGER_DT, "lager")

	.smp		= smp_ops(r8a7790_smp_ops),

	.init_early	= r8a7790_init_early,

	.init_time	= rcar_gen2_timer_init,

	.init_machine	= lager_add_standard_devices,

	.init_time	= r8a7790_timer_init,

	.dt_compat	= lager_boards_compat_dt,

MACHINE_END

arch/arm/mach-shmobile/board-lager.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static const char *lager_boards_compat_dt[] __initdata = { 
DT_MACHINE_START(LAGER_DT, "lager")

	.smp		= smp_ops(r8a7790_smp_ops),

	.init_early	= r8a7790_init_early,

	.init_time	= r8a7790_timer_init,

	.init_time	= rcar_gen2_timer_init,

	.init_machine	= lager_init,

	.dt_compat	= lager_boards_compat_dt,

MACHINE_END

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

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static struct clk_lookup lookups[] = { 


void __init r8a7790_clock_init(void)

{

	u32 mode = r8a7790_read_mode_pins();

	u32 mode = rcar_gen2_read_mode_pins();

	int k, ret = 0;



	switch (mode & (MD(14) | MD(13))) {

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

+2 −4
Original line number Diff line number Diff line 
#ifndef __ASM_R8A7790_H__

#define __ASM_R8A7790_H__



#include <mach/rcar-gen2.h>



void r8a7790_add_standard_devices(void);

void r8a7790_add_dt_devices(void);

void r8a7790_clock_init(void);

void r8a7790_pinmux_init(void);

void r8a7790_init_early(void);

void r8a7790_timer_init(void);

extern struct smp_operations r8a7790_smp_ops;



#define MD(nr) BIT(nr)

u32 r8a7790_read_mode_pins(void);



#endif /* __ASM_R8A7790_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE