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

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

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

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

Merge "Renesas ARM Based SoC soc-cleanup Updates for v3.16" from Simon Horman:

r8a7791 (R-Car H2) SoC and its Koelsch board and,
r8a7740 (R-Mobile A1) SoC and its Armadillo800eva board
* Set CPU clock frequency from OF nodes

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

:
  ARM: shmobile: Set clock frequency in HZ from OF nodes
  ARM: shmobile: Use shmobile_init_late() on r8a7740
  ARM: shmobile: Remove unused r8a7791_init_early()
  ARM: shmobile: Use r8a7791 DT CPU Frequency for Koelsch
  ARM: shmobile: Use r8a7791 DT CPU Frequency in common case
  ARM: shmobile: Remove unused r8a7740_init_delay()
  ARM: shmobile: Use r8a7740 DT CPU Frequency for Armadillo DT Ref
  ARM: shmobile: Use r8a7740 DT CPU Frequency in common case
  ARM: shmobile: Add r8a7740 Maximum CPU Frequency to DTS

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fd46edb9 f492b817

arch/arm/boot/dts/r8a7740.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
			compatible = "arm,cortex-a9";

			device_type = "cpu";

			reg = <0x0>;

			clock-frequency = <800000000>;

		};

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static const char *eva_boards_compat_dt[] __initdata = { 


DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva-reference")

	.map_io		= r8a7740_map_io,

	.init_early	= r8a7740_init_delay,

	.init_early	= shmobile_init_delay,

	.init_irq	= r8a7740_init_irq_of,

	.init_machine	= eva_init,

	.init_late	= shmobile_init_late,

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

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static const char * const koelsch_boards_compat_dt[] __initconst = { 


DT_MACHINE_START(KOELSCH_DT, "koelsch")

	.smp		= smp_ops(r8a7791_smp_ops),

	.init_early	= r8a7791_init_early,

	.init_early	= shmobile_init_delay,

	.init_time	= rcar_gen2_timer_init,

	.init_machine	= koelsch_add_standard_devices,

	.init_late	= shmobile_init_late,

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

+1 −1
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ static const char * const koelsch_boards_compat_dt[] __initconst = { 


DT_MACHINE_START(KOELSCH_DT, "koelsch")

	.smp		= smp_ops(r8a7791_smp_ops),

	.init_early	= r8a7791_init_early,

	.init_early	= shmobile_init_delay,

	.init_time	= rcar_gen2_timer_init,

	.init_machine	= koelsch_init,

	.init_late	= shmobile_init_late,

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

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ enum { 
};



extern void r8a7740_meram_workaround(void);

extern void r8a7740_init_delay(void);

extern void r8a7740_init_irq_of(void);

extern void r8a7740_map_io(void);

extern void r8a7740_add_early_devices(void);