Commit b4e086f6 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

From Simon Horman:
Renesas ARM based SoC cleanups for v3.13

* Constify platform data and resources of r8a7790 SoC
* Rename to r8a7790_init_delay() as r8a7790_init_early()
  - This is in preparation for doing more than just initialising the delay
* Rename r8a73a4_init_delay() as r8a73a4_init_early()
  - This is in preparation for doing more than just initialising the delay

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

:
  ARM: shmobile: r8a7790: Constify platform data and resources
  ARM: shmobile: Rename to r8a7790_init_early()
  ARM: shmobile: Rename to r8a73a4_init_early()

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 933b4f0f cde214a8

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static const char *ape6evm_boards_compat_dt[] __initdata = { 
};



DT_MACHINE_START(APE6EVM_DT, "ape6evm")

	.init_early	= r8a73a4_init_delay,

	.init_early	= r8a73a4_init_early,

	.init_machine	= ape6evm_add_standard_devices,

	.dt_compat	= ape6evm_boards_compat_dt,

MACHINE_END

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

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static const char *ape6evm_boards_compat_dt[] __initdata = { 
};



DT_MACHINE_START(APE6EVM_DT, "ape6evm")

	.init_early	= r8a73a4_init_delay,

	.init_early	= r8a73a4_init_early,

	.init_machine	= ape6evm_add_standard_devices,

	.dt_compat	= ape6evm_boards_compat_dt,

MACHINE_END

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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static const char *lager_boards_compat_dt[] __initdata = { 
};



DT_MACHINE_START(LAGER_DT, "lager")

	.init_early	= r8a7790_init_delay,

	.init_early	= r8a7790_init_early,

	.init_machine	= lager_add_standard_devices,

	.init_time	= r8a7790_timer_init,

	.dt_compat	= lager_boards_compat_dt,

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

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static const char *lager_boards_compat_dt[] __initdata = { 
};



DT_MACHINE_START(LAGER_DT, "lager")

	.init_early	= r8a7790_init_delay,

	.init_early	= r8a7790_init_early,

	.init_time	= r8a7790_timer_init,

	.init_machine	= lager_init,

	.dt_compat	= lager_boards_compat_dt,

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

+1 −1
Original line number Diff line number Diff line
@@ -5,6 +5,6 @@ void r8a73a4_add_standard_devices(void); 
void r8a73a4_add_dt_devices(void);

void r8a73a4_clock_init(void);

void r8a73a4_pinmux_init(void);

void r8a73a4_init_delay(void);

void r8a73a4_init_early(void);



#endif /* __ASM_R8A73A4_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE