Commit af839cb0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm-soc-for-v5.7-tag1' of... 

Merge tag 'renesas-arm-soc-for-v5.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/soc

Renesas ARM SoC updates for v5.7

  - Enable ARM global timer on Cortex-A9 MPCore SoCs,
  - A minor cleanup.

* tag 'renesas-arm-soc-for-v5.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  ARM: shmobile: Replace <linux/clk-provider.h> by <linux/of_clk.h>
  ARM: shmobile: Enable ARM_GLOBAL_TIMER on Cortex-A9 MPCore SoCs

Link: https://lore.kernel.org/r/20200226110221.19288-3-geert+renesas@glider.be


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 98d54f81 92d8495c

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

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ static const char *const r8a7779_compat_dt[] __initconst = { 
DT_MACHINE_START(R8A7779_DT, "Generic R8A7779 (Flattened Device Tree)")

	.smp		= smp_ops(r8a7779_smp_ops),

	.map_io		= r8a7779_map_io,

	.init_early	= shmobile_init_delay,

	.init_irq	= r8a7779_init_irq_dt,

	.init_late	= shmobile_init_late,

	.dt_compat	= r8a7779_compat_dt,

arch/arm/mach-shmobile/setup-rcar-gen2.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
 * Copyright (C) 2014  Ulrich Hecht

 */



#include <linux/clk-provider.h>

#include <linux/clocksource.h>

#include <linux/device.h>

#include <linux/dma-contiguous.h>
@@ -15,6 +14,7 @@ 
#include <linux/kernel.h>

#include <linux/memblock.h>

#include <linux/of.h>

#include <linux/of_clk.h>

#include <linux/of_fdt.h>

#include <linux/of_platform.h>

#include <linux/psci.h>

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

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ static const char *const sh73a0_boards_compat_dt[] __initconst = { 
DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")

	.smp		= smp_ops(sh73a0_smp_ops),

	.map_io		= sh73a0_map_io,

	.init_early	= shmobile_init_delay,

	.init_machine	= sh73a0_generic_init,

	.init_late	= shmobile_init_late,

	.dt_compat	= sh73a0_boards_compat_dt,

drivers/soc/renesas/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ config ARCH_R8A7779 
	bool "R-Car H1 (R8A77790)"

	select ARCH_RCAR_GEN1

	select ARM_ERRATA_754322

	select ARM_GLOBAL_TIMER

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select SYSC_R8A7779
@@ -163,6 +164,7 @@ config ARCH_SH73A0 
	bool "SH-Mobile AG5 (R8A73A00)"

	select ARCH_RMOBILE

	select ARM_ERRATA_754322

	select ARM_GLOBAL_TIMER

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select RENESAS_INTC_IRQPIN

CRA Git | Maintained and supported by SUSTech CRA and CCSE