Commit be2109e1 authored by David Brown's avatar David Brown Committed by Olof Johansson

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: default avatarDavid Brown <davidb@codeaurora.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 25468fe8
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <mach/board.h> #include <mach/board.h>
#include "common.h" #include "common.h"
#include "core.h"
static const struct of_device_id msm_dt_gic_match[] __initconst = { static const struct of_device_id msm_dt_gic_match[] __initconst = {
{ .compatible = "qcom,msm-8660-qgic", .data = gic_of_init }, { .compatible = "qcom,msm-8660-qgic", .data = gic_of_init },
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include "common.h" #include "common.h"
#include "core.h"
static const struct of_device_id msm_dt_gic_match[] __initconst = { static const struct of_device_id msm_dt_gic_match[] __initconst = {
{ .compatible = "qcom,msm-qgic2", .data = gic_of_init }, { .compatible = "qcom,msm-qgic2", .data = gic_of_init },
......
...@@ -26,5 +26,7 @@ extern void msm_map_qsd8x50_io(void); ...@@ -26,5 +26,7 @@ extern void msm_map_qsd8x50_io(void);
extern void __iomem *__msm_ioremap_caller(unsigned long phys_addr, size_t size, extern void __iomem *__msm_ioremap_caller(unsigned long phys_addr, size_t size,
unsigned int mtype, void *caller); unsigned int mtype, void *caller);
extern struct smp_operations msm_smp_ops;
extern void msm_cpu_die(unsigned int cpu);
#endif #endif
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/smp_plat.h> #include <asm/smp_plat.h>
#include "core.h" #include "common.h"
static inline void cpu_enter_lowpower(void) static inline void cpu_enter_lowpower(void)
{ {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <asm/smp_plat.h> #include <asm/smp_plat.h>
#include "scm-boot.h" #include "scm-boot.h"
#include "core.h" #include "common.h"
#define VDD_SC1_ARRAY_CLAMP_GFS_CTL 0x15A0 #define VDD_SC1_ARRAY_CLAMP_GFS_CTL 0x15A0
#define SCSS_CPU1CORE_RESET 0xD80 #define SCSS_CPU1CORE_RESET 0xD80
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment