projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'backport/v3.14.24-ltsi-rc1/phy-rcar-gen2-usb-to-v3.15' into backport/v3...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
mach-shmobile
/
board-bockw-reference.c
diff --git
a/arch/arm/mach-shmobile/board-bockw-reference.c
b/arch/arm/mach-shmobile/board-bockw-reference.c
index
027373f
..
79c4784
100644
(file)
--- a/
arch/arm/mach-shmobile/board-bockw-reference.c
+++ b/
arch/arm/mach-shmobile/board-bockw-reference.c
@@
-19,10
+19,12
@@
*/
#include <linux/of_platform.h>
*/
#include <linux/of_platform.h>
-#include <mach/common.h>
-#include <mach/r8a7778.h>
+
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
+#include "common.h"
+#include "r8a7778.h"
+
/*
* see board-bock.c for checking detail of dip-switch
*/
/*
* see board-bock.c for checking detail of dip-switch
*/
@@
-78,8
+80,9
@@
static const char *bockw_boards_compat_dt[] __initdata = {
};
DT_MACHINE_START(BOCKW_DT, "bockw")
};
DT_MACHINE_START(BOCKW_DT, "bockw")
- .init_early =
r8a7778
_init_delay,
+ .init_early =
shmobile
_init_delay,
.init_irq = r8a7778_init_irq_dt,
.init_machine = bockw_init,
.init_irq = r8a7778_init_irq_dt,
.init_machine = bockw_init,
+ .init_late = shmobile_init_late,
.dt_compat = bockw_boards_compat_dt,
MACHINE_END
.dt_compat = bockw_boards_compat_dt,
MACHINE_END