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

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

Merge tag 'renesas-soc-cleanup-for-v3.17' of... 

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

Merge "Renesas ARM Based SoC Cleanup for v3.17" from Simon Horman:

- Use shmobile_init_delay on r8a7790, r7s72100 and EMEV2 SoCs
- Remove unused redundant callbacks on EMEV2 SoC

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

:
  ARM: shmobile: Remove unused r8a7790_init_early()
  ARM: shmobile: Use r8a7790 DT CPU Frequency for Lager
  ARM: shmobile: Use r8a7790 DT CPU Frequency in common case
  ARM: shmobile: Use shmobile_init_delay() on r7s72100
  ARM: shmobile: Use shmobile_init_delay() on Genmai boards
  ARM: shmobile: Update r7s72100 DTS to include CPU frequency
  ARM: shmobile: Get rid of redundant EMEV2 mach callbacks
  ARM: shmobile: Use shmobile_init_delay() on EMEV2
  ARM: shmobile: Update EMEV2 DTS to include CPU frequency

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 64460c7e d83fa4c9

arch/arm/boot/dts/emev2.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -31,11 +31,13 @@ 
			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0>;

			clock-frequency = <533000000>;

		};

		cpu@1 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <1>;

			clock-frequency = <533000000>;

		};

	};

arch/arm/boot/dts/r7s72100.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ 
			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0>;

			clock-frequency = <400000000>;

		};

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static const char * const genmai_boards_compat_dt[] __initconst = { 
};



DT_MACHINE_START(GENMAI_DT, "genmai")

	.init_early	= r7s72100_init_early,

	.init_early	= shmobile_init_delay,

	.init_machine	= genmai_add_standard_devices,

	.dt_compat	= genmai_boards_compat_dt,

MACHINE_END

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

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static const char * const genmai_boards_compat_dt[] __initconst = { 
};



DT_MACHINE_START(GENMAI_DT, "genmai")

	.init_early	= r7s72100_init_early,

	.init_early	= shmobile_init_delay,

	.init_machine	= genmai_add_standard_devices,

	.dt_compat	= genmai_boards_compat_dt,

MACHINE_END

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

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,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_early	= shmobile_init_delay,

	.init_time	= rcar_gen2_timer_init,

	.init_machine	= lager_add_standard_devices,

	.init_late	= shmobile_init_late,