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

Commit 93acbd2c authored Aug 22, 2014 by Simon Horman

Merge branch 'boards-for-v3.18' into soc-init-delay-for-v3.18.base

parents 5ac9e7f3 3969d649

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

+2 −1

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

	DT_MACHINE_START(APE6EVM_DT, "ape6evm")		DT_MACHINE_START(APE6EVM_DT, "ape6evm")
	.init_early = r8a73a4_init_early,		.init_early = shmobile_init_delay,
	.init_machine = ape6evm_add_standard_devices,		.init_machine = ape6evm_add_standard_devices,
			.init_late = shmobile_init_late,
	.dt_compat = ape6evm_boards_compat_dt,		.dt_compat = ape6evm_boards_compat_dt,
	MACHINE_END		MACHINE_END

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

+2 −1

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

	DT_MACHINE_START(APE6EVM_DT, "ape6evm")		DT_MACHINE_START(APE6EVM_DT, "ape6evm")
	.init_early = r8a73a4_init_early,		.init_early = shmobile_init_delay,
	.init_machine = ape6evm_add_standard_devices,		.init_machine = ape6evm_add_standard_devices,
			.init_late = shmobile_init_late,
	.dt_compat = ape6evm_boards_compat_dt,		.dt_compat = ape6evm_boards_compat_dt,
	MACHINE_END		MACHINE_END

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -83,5 +83,6 @@ DT_MACHINE_START(BOCKW_DT, "bockw")
	.init_early = r8a7778_init_delay,		.init_early = r8a7778_init_delay,
	.init_irq = r8a7778_init_irq_dt,		.init_irq = r8a7778_init_irq_dt,
	.init_machine = bockw_init,		.init_machine = bockw_init,
			.init_late = shmobile_init_late,
	.dt_compat = bockw_boards_compat_dt,		.dt_compat = bockw_boards_compat_dt,
	MACHINE_END		MACHINE_END

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -52,7 +52,7 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g-reference")
	.smp = smp_ops(sh73a0_smp_ops),		.smp = smp_ops(sh73a0_smp_ops),
	.map_io = sh73a0_map_io,		.map_io = sh73a0_map_io,
	.init_early = sh73a0_init_delay,		.init_early = sh73a0_init_delay,
	.nr_irqs = NR_IRQS_LEGACY,
	.init_machine = kzm_init,		.init_machine = kzm_init,
			.init_late = shmobile_init_late,
	.dt_compat = kzm9g_boards_compat_dt,		.dt_compat = kzm9g_boards_compat_dt,
	MACHINE_END		MACHINE_END

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

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -910,7 +910,6 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g")
	.smp = smp_ops(sh73a0_smp_ops),		.smp = smp_ops(sh73a0_smp_ops),
	.map_io = sh73a0_map_io,		.map_io = sh73a0_map_io,
	.init_early = sh73a0_add_early_devices,		.init_early = sh73a0_add_early_devices,
	.nr_irqs = NR_IRQS_LEGACY,
	.init_irq = sh73a0_init_irq,		.init_irq = sh73a0_init_irq,
	.init_machine = kzm_init,		.init_machine = kzm_init,
	.init_late = shmobile_init_late,		.init_late = shmobile_init_late,