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

Commit c41215b7 authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

ARM: shmobile: r8a7740: Multiplatform support 



Enable r8a7740 Multiplatform support for the generic r8a7740
machine vector. No board support is enabled, and the board
code for Armadillo 800 EVA DT Reference is left by itself.

Signed-off-by: default avatarMagnus Damm <damm+renesas@opensource.se>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 43330674

arch/arm/mach-shmobile/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,11 @@ config ARCH_R7S72100 
	bool "RZ/A1H (R7S72100)"

	select SYS_SUPPORTS_SH_MTU2



config ARCH_R8A7740

	bool "R-Mobile A1 (R8A77400)"

	select ARCH_RMOBILE

	select RENESAS_INTC_IRQPIN



config ARCH_R8A7779

	bool "R-Car H1 (R8A77790)"

	select RENESAS_INTC_IRQPIN

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

+2 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include "common.h"

#include "pm-rmobile.h"



#ifdef CONFIG_PM

#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM)

static int r8a7740_pd_a4s_suspend(void)

{

	/*
@@ -58,8 +58,7 @@ void __init r8a7740_init_pm_domains(void) 
	rmobile_init_domains(r8a7740_pm_domains, ARRAY_SIZE(r8a7740_pm_domains));

	pm_genpd_add_subdomain_names("A4S", "A3SP");

}



#endif /* CONFIG_PM */

#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */



#ifdef CONFIG_SUSPEND

static int r8a7740_enter_suspend(suspend_state_t suspend_state)

arch/arm/mach-shmobile/r8a7740.h

+2 −2
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ extern void r8a7740_clock_init(u8 md_ck); 
extern void r8a7740_pinmux_init(void);

extern void r8a7740_pm_init(void);



#ifdef CONFIG_PM

#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM)

extern void __init r8a7740_init_pm_domains(void);

#else

static inline void r8a7740_init_pm_domains(void) {}

#endif /* CONFIG_PM */

#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */



#endif /* __ASM_R8A7740_H__ */

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

+7 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <asm/mach/map.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

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



#include "common.h"

#include "dma-register.h"
@@ -813,7 +814,12 @@ void __init r8a7740_init_irq_of(void) 


static void __init r8a7740_generic_init(void)

{

	r8a7740_clock_init(0);

	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);

}