From 433306747791845677ba662435a9bbbafaa21df3 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Tue, 12 Aug 2014 09:04:42 +0900 Subject: ARM: shmobile: r8a7740: Remove r8a7740_add_standard_devices_dt Now that r8a7740_add_standard_devices_dt() is simply a wrapper for a call to of_platform_populate() remove it and call of_platform_populate() directly. Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/r8a7740.h | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-shmobile/r8a7740.h') diff --git a/arch/arm/mach-shmobile/r8a7740.h b/arch/arm/mach-shmobile/r8a7740.h index 1d1a5fd78b6b..3352fb8650ba 100644 --- a/arch/arm/mach-shmobile/r8a7740.h +++ b/arch/arm/mach-shmobile/r8a7740.h @@ -49,7 +49,6 @@ extern void r8a7740_init_irq_of(void); extern void r8a7740_map_io(void); extern void r8a7740_add_early_devices(void); extern void r8a7740_add_standard_devices(void); -extern void r8a7740_add_standard_devices_dt(void); extern void r8a7740_clock_init(u8 md_ck); extern void r8a7740_pinmux_init(void); extern void r8a7740_pm_init(void); -- cgit From c41215b781efbfa22ffc9dc474c2981c130c153d Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Mon, 25 Aug 2014 12:36:53 +0900 Subject: 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: Magnus Damm Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/r8a7740.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-shmobile/r8a7740.h') diff --git a/arch/arm/mach-shmobile/r8a7740.h b/arch/arm/mach-shmobile/r8a7740.h index 3352fb8650ba..f369b4b0863d 100644 --- a/arch/arm/mach-shmobile/r8a7740.h +++ b/arch/arm/mach-shmobile/r8a7740.h @@ -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__ */ -- cgit