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

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

Merge tag 'renesas-soc-for-v4.6' of... 

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

Merge "Renesas ARM Based SoC Updates for v4.6" from Simon Horman:

* Enable PM and PM_GENERIC_DOMAINS for SoCs with PM Domains
* Move emev2_smp_ops to emev2
* Remove legacy map_io callbacks on r8a7740 and emev2 SoCs
* Migrate to generic l2c OF initialization on r8a7740

* tag 'renesas-soc-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Enable PM and PM_GENERIC_DOMAINS for SoCs with PM Domains
  ARM: shmobile: emev2: Move declaration of emev2_smp_ops to emev2.h
  ARM: shmobile: emev2: Remove legacy machine_desc.map_io() callback
  ARM: shmobile: r8a7740: Remove legacy machine_desc.map_io() callback
  ARM: shmobile: r8a7740: Remove mapping of L2 cache controller registers
  ARM: shmobile: r8a7740: Migrate to generic l2c OF initialization
parents b43aa5c0 71d076ce

arch/arm/mach-shmobile/Kconfig

+8 −5
Original line number Diff line number Diff line
@@ -6,28 +6,30 @@ config ARCH_SHMOBILE_MULTI 


config PM_RCAR

	bool

	select PM_GENERIC_DOMAINS if PM

	select PM

	select PM_GENERIC_DOMAINS



config PM_RMOBILE

	bool

	select PM

	select PM_GENERIC_DOMAINS



config ARCH_RCAR_GEN1

	bool

	select PM_RCAR if PM || SMP

	select PM_RCAR

	select RENESAS_INTC_IRQPIN

	select SYS_SUPPORTS_SH_TMU



config ARCH_RCAR_GEN2

	bool

	select PM_RCAR if PM || SMP

	select PM_RCAR

	select RENESAS_IRQC

	select SYS_SUPPORTS_SH_CMT

	select PCI_DOMAINS if PCI



config ARCH_RMOBILE

	bool

	select PM_RMOBILE if PM

	select PM_RMOBILE

	select SYS_SUPPORTS_SH_CMT

	select SYS_SUPPORTS_SH_TMU
@@ -55,7 +57,8 @@ config ARCH_EMEV2 


config ARCH_R7S72100

	bool "RZ/A1H (R7S72100)"

	select PM_GENERIC_DOMAINS if PM

	select PM

	select PM_GENERIC_DOMAINS

	select SYS_SUPPORTS_SH_MTU2



config ARCH_R8A73A4

arch/arm/mach-shmobile/emev2.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#ifndef __ASM_EMEV2_H__

#define __ASM_EMEV2_H__



extern const struct smp_operations emev2_smp_ops;



#endif /* __ASM_EMEV2_H__ */

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

+2 −20
Original line number Diff line number Diff line
@@ -18,35 +18,17 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include "common.h"



static struct map_desc emev2_io_desc[] __initdata = {

#ifdef CONFIG_SMP

	/* 2M mapping for SCU + L2 controller */

	{

		.virtual	= 0xf0000000,

		.pfn		= __phys_to_pfn(0x1e000000),

		.length		= SZ_2M,

		.type		= MT_DEVICE

	},

#endif

};



static void __init emev2_map_io(void)

{

	iotable_init(emev2_io_desc, ARRAY_SIZE(emev2_io_desc));

}

#include "common.h"

#include "emev2.h"



static const char *const emev2_boards_compat_dt[] __initconst = {

	"renesas,emev2",

	NULL,

};



extern const struct smp_operations emev2_smp_ops;



DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")

	.smp		= smp_ops(emev2_smp_ops),

	.map_io		= emev2_map_io,

	.init_early	= shmobile_init_delay,

	.init_late	= shmobile_init_late,

	.dt_compat	= emev2_boards_compat_dt,

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

+2 −37
Original line number Diff line number Diff line
@@ -23,41 +23,9 @@ 
#include <asm/mach/map.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <asm/hardware/cache-l2x0.h>



#include "common.h"



static struct map_desc r8a7740_io_desc[] __initdata = {

	 /*

	  * for CPGA/INTC/PFC

	  * 0xe6000000-0xefffffff -> 0xe6000000-0xefffffff

	  */

	{

		.virtual	= 0xe6000000,

		.pfn		= __phys_to_pfn(0xe6000000),

		.length		= 160 << 20,

		.type		= MT_DEVICE_NONSHARED

	},

#ifdef CONFIG_CACHE_L2X0

	/*

	 * for l2x0_init()

	 * 0xf0100000-0xf0101000 -> 0xf0002000-0xf0003000

	 */

	{

		.virtual	= 0xf0002000,

		.pfn		= __phys_to_pfn(0xf0100000),

		.length		= PAGE_SIZE,

		.type		= MT_DEVICE_NONSHARED

	},

#endif

};



static void __init r8a7740_map_io(void)

{

	debug_ll_io_init();

	iotable_init(r8a7740_io_desc, ARRAY_SIZE(r8a7740_io_desc));

}



/*

 * r8a7740 chip has lasting errata on MERAM buffer.

 * this is work-around for it.
@@ -110,10 +78,6 @@ static void __init r8a7740_generic_init(void) 
{

	r8a7740_meram_workaround();



#ifdef CONFIG_CACHE_L2X0

	/* Shared attribute override enable, 32K*8way */

	l2x0_init(IOMEM(0xf0002000), 0x00400000, 0xc20f0fff);

#endif

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}
@@ -123,7 +87,8 @@ static const char *const r8a7740_boards_compat_dt[] __initconst = { 
};



DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)")

	.map_io		= r8a7740_map_io,

	.l2c_aux_val	= 0,

	.l2c_aux_mask	= ~0,

	.init_early	= shmobile_init_delay,

	.init_irq	= r8a7740_init_irq_of,

	.init_machine	= r8a7740_generic_init,

arch/arm/mach-shmobile/smp-emev2.c

+2 −0
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ 
#include <linux/delay.h>

#include <asm/smp_plat.h>

#include <asm/smp_scu.h>



#include "common.h"

#include "emev2.h"



#define EMEV2_SCU_BASE 0x1e000000

#define EMEV2_SMU_BASE 0xe0110000