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

Commit 138310e1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-soc3-for-v3.18' of... 

Merge tag 'renesas-soc3-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

 into next/soc

Pull "Third Round of Renesas ARM Based SoC Soc Updates for v3.18" from Simon Horman:

* Initial r8a7794 SoC support
* Support Cortex-A7 in shmobile_init_delay()

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>

* tag 'renesas-soc3-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Initial r8a7794 SoC support
  ARM: shmobile: support Cortex-A7 in shmobile_init_delay()
parents eb492df9 5923abb2

arch/arm/mach-shmobile/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ config ARCH_R8A7791 
	select RENESAS_IRQC

	select SYS_SUPPORTS_SH_CMT



config ARCH_R8A7794

	bool "R-Car E2 (R8A77940)"

	select ARCH_RCAR_GEN2



comment "Renesas ARM SoCs Board Type"



config MACH_KOELSCH

arch/arm/mach-shmobile/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o 
obj-$(CONFIG_ARCH_R8A7790)	+= setup-r8a7790.o

obj-$(CONFIG_ARCH_R8A7790)	+= setup-r8a7790.o setup-rcar-gen2.o

obj-$(CONFIG_ARCH_R8A7791)	+= setup-r8a7791.o setup-rcar-gen2.o

obj-$(CONFIG_ARCH_R8A7794)	+= setup-r8a7794.o

obj-$(CONFIG_ARCH_EMEV2)	+= setup-emev2.o

obj-$(CONFIG_ARCH_R7S72100)	+= setup-r7s72100.o

arch/arm/mach-shmobile/setup-r8a7794.c

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * r8a7794 processor support

 *

 * Copyright (C) 2014  Renesas Electronics Corporation

 * Copyright (C) 2014  Ulrich Hecht

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; version 2 of the License.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/of_platform.h>

#include "common.h"

#include "rcar-gen2.h"

#include <asm/mach/arch.h>



#ifdef CONFIG_USE_OF



static const char * const r8a7794_boards_compat_dt[] __initconst = {

	"renesas,r8a7794",

	NULL,

};



DT_MACHINE_START(R8A7794_DT, "Generic R8A7794 (Flattened Device Tree)")

	.init_early	= shmobile_init_delay,

	.init_late	= shmobile_init_late,

	.init_time	= rcar_gen2_timer_init,

	.dt_compat	= r8a7794_boards_compat_dt,

MACHINE_END

#endif /* CONFIG_USE_OF */

arch/arm/mach-shmobile/timer.c

+5 −4
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static void __init shmobile_setup_delay_hz(unsigned int max_cpu_core_hz, 
void __init shmobile_init_delay(void)

{

	struct device_node *np, *cpus;

	bool is_a8_a9 = false;

	bool is_a7_a8_a9 = false;

	bool is_a15 = false;

	u32 max_freq = 0;
@@ -57,9 +57,10 @@ void __init shmobile_init_delay(void) 
		if (!of_property_read_u32(np, "clock-frequency", &freq))

			max_freq = max(max_freq, freq);



		if (of_device_is_compatible(np, "arm,cortex-a8") ||

		if (of_device_is_compatible(np, "arm,cortex-a7") ||

		    of_device_is_compatible(np, "arm,cortex-a8") ||

		    of_device_is_compatible(np, "arm,cortex-a9"))

			is_a8_a9 = true;

			is_a7_a8_a9 = true;

		else if (of_device_is_compatible(np, "arm,cortex-a15"))

			is_a15 = true;

	}
@@ -69,7 +70,7 @@ void __init shmobile_init_delay(void) 
	if (!max_freq)

		return;



	if (is_a8_a9)

	if (is_a7_a8_a9)

		shmobile_setup_delay_hz(max_freq, 1, 3);

	else if (is_a15 && !IS_ENABLED(CONFIG_ARM_ARCH_TIMER))

		shmobile_setup_delay_hz(max_freq, 2, 4);