Merge branch 'boards-for-v3.18' into soc-init-delay-for-v3.18.base
This commit is contained in:
commit
93acbd2cd2
|
@ -59,7 +59,8 @@ static const char *ape6evm_boards_compat_dt[] __initdata = {
|
|||
};
|
||||
|
||||
DT_MACHINE_START(APE6EVM_DT, "ape6evm")
|
||||
.init_early = r8a73a4_init_early,
|
||||
.init_early = shmobile_init_delay,
|
||||
.init_machine = ape6evm_add_standard_devices,
|
||||
.init_late = shmobile_init_late,
|
||||
.dt_compat = ape6evm_boards_compat_dt,
|
||||
MACHINE_END
|
||||
|
|
|
@ -283,7 +283,8 @@ static const char *ape6evm_boards_compat_dt[] __initdata = {
|
|||
};
|
||||
|
||||
DT_MACHINE_START(APE6EVM_DT, "ape6evm")
|
||||
.init_early = r8a73a4_init_early,
|
||||
.init_early = shmobile_init_delay,
|
||||
.init_machine = ape6evm_add_standard_devices,
|
||||
.init_late = shmobile_init_late,
|
||||
.dt_compat = ape6evm_boards_compat_dt,
|
||||
MACHINE_END
|
||||
|
|
|
@ -83,5 +83,6 @@ DT_MACHINE_START(BOCKW_DT, "bockw")
|
|||
.init_early = r8a7778_init_delay,
|
||||
.init_irq = r8a7778_init_irq_dt,
|
||||
.init_machine = bockw_init,
|
||||
.init_late = shmobile_init_late,
|
||||
.dt_compat = bockw_boards_compat_dt,
|
||||
MACHINE_END
|
||||
|
|
|
@ -52,7 +52,7 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g-reference")
|
|||
.smp = smp_ops(sh73a0_smp_ops),
|
||||
.map_io = sh73a0_map_io,
|
||||
.init_early = sh73a0_init_delay,
|
||||
.nr_irqs = NR_IRQS_LEGACY,
|
||||
.init_machine = kzm_init,
|
||||
.init_late = shmobile_init_late,
|
||||
.dt_compat = kzm9g_boards_compat_dt,
|
||||
MACHINE_END
|
||||
|
|
|
@ -910,7 +910,6 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g")
|
|||
.smp = smp_ops(sh73a0_smp_ops),
|
||||
.map_io = sh73a0_map_io,
|
||||
.init_early = sh73a0_add_early_devices,
|
||||
.nr_irqs = NR_IRQS_LEGACY,
|
||||
.init_irq = sh73a0_init_irq,
|
||||
.init_machine = kzm_init,
|
||||
.init_late = shmobile_init_late,
|
||||
|
|
|
@ -64,8 +64,8 @@ DT_MACHINE_START(MARZEN, "marzen")
|
|||
.map_io = r8a7779_map_io,
|
||||
.init_early = shmobile_init_delay,
|
||||
.init_time = marzen_init_timer,
|
||||
.nr_irqs = NR_IRQS_LEGACY,
|
||||
.init_irq = r8a7779_init_irq_dt,
|
||||
.init_machine = marzen_init,
|
||||
.init_late = shmobile_init_late,
|
||||
.dt_compat = marzen_boards_compat_dt,
|
||||
MACHINE_END
|
||||
|
|
Loading…
Reference in a new issue