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>
This commit is contained in:
David Brown 2012-09-12 16:01:40 -07:00 committed by Olof Johansson
parent 25468fe89f
commit be2109e13f
5 changed files with 4 additions and 4 deletions

View File

@ -20,7 +20,6 @@
#include <mach/board.h>
#include "common.h"
#include "core.h"
static const struct of_device_id msm_dt_gic_match[] __initconst = {
{ .compatible = "qcom,msm-8660-qgic", .data = gic_of_init },

View File

@ -18,7 +18,6 @@
#include <asm/mach/arch.h>
#include "common.h"
#include "core.h"
static const struct of_device_id msm_dt_gic_match[] __initconst = {
{ .compatible = "qcom,msm-qgic2", .data = gic_of_init },

View File

@ -26,5 +26,7 @@ extern void msm_map_qsd8x50_io(void);
extern void __iomem *__msm_ioremap_caller(unsigned long phys_addr, size_t size,
unsigned int mtype, void *caller);
extern struct smp_operations msm_smp_ops;
extern void msm_cpu_die(unsigned int cpu);
#endif

View File

@ -13,7 +13,7 @@
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include "core.h"
#include "common.h"
static inline void cpu_enter_lowpower(void)
{

View File

@ -23,7 +23,7 @@
#include <asm/smp_plat.h>
#include "scm-boot.h"
#include "core.h"
#include "common.h"
#define VDD_SC1_ARRAY_CLAMP_GFS_CTL 0x15A0
#define SCSS_CPU1CORE_RESET 0xD80