Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit be2109e13fc6f017040c57615acfe1065723687b

Authored by David Brown
Committed by Olof Johansson
1 parent 25468fe89f
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

ARM: msm: Move core.h contents into common.h 

No real need to have a separate core.h from the common.h file.  Fold
these two prototypes into the common header file.

Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

Showing 5 changed files with 4 additions and 4 deletions Side-by-side Diff

arch/arm/mach-msm/board-dt-8660.c
Diff comments   View file @ be2109e
... ... @@ -20,7 +20,6 @@
20 20  
21 21 #include <mach/board.h>
22 22 #include "common.h"
23   -#include "core.h"
24 23  
25 24 static const struct of_device_id msm_dt_gic_match[] __initconst = {
26 25 { .compatible = "qcom,msm-8660-qgic", .data = gic_of_init },
arch/arm/mach-msm/board-dt-8960.c
Diff comments   View file @ be2109e
... ... @@ -18,7 +18,6 @@
18 18 #include <asm/mach/arch.h>
19 19  
20 20 #include "common.h"
21   -#include "core.h"
22 21  
23 22 static const struct of_device_id msm_dt_gic_match[] __initconst = {
24 23 { .compatible = "qcom,msm-qgic2", .data = gic_of_init },
arch/arm/mach-msm/common.h
Diff comments   View file @ be2109e
... ... @@ -26,6 +26,8 @@
26 26 extern void __iomem *__msm_ioremap_caller(unsigned long phys_addr, size_t size,
27 27 unsigned int mtype, void *caller);
28 28  
  29 +extern struct smp_operations msm_smp_ops;
  30 +extern void msm_cpu_die(unsigned int cpu);
29 31  
30 32 #endif
arch/arm/mach-msm/hotplug.c
Diff comments   View file @ be2109e
... ... @@ -13,7 +13,7 @@
13 13 #include <asm/cacheflush.h>
14 14 #include <asm/smp_plat.h>
15 15  
16   -#include "core.h"
  16 +#include "common.h"
17 17  
18 18 static inline void cpu_enter_lowpower(void)
19 19 {
arch/arm/mach-msm/platsmp.c
Diff comments   View file @ be2109e
... ... @@ -23,7 +23,7 @@
23 23 #include <asm/smp_plat.h>
24 24  
25 25 #include "scm-boot.h"
26   -#include "core.h"
  26 +#include "common.h"
27 27  
28 28 #define VDD_SC1_ARRAY_CLAMP_GFS_CTL 0x15A0
29 29 #define SCSS_CPU1CORE_RESET 0xD80