diff options
author | Olof Johansson <olof@lixom.net> | 2014-02-20 03:52:24 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-02-20 03:52:39 -0500 |
commit | a671d255afb47bd2f83b94355b2848a0d46a1a92 (patch) | |
tree | deab7c0c89c8f9070a6d3e436d95dbe07d038687 /arch/arm/mach-qcom/scm-boot.h | |
parent | 4a179c1f3784ac3fad626a4a2e67a559bcba3ad3 (diff) | |
parent | cf1e8f0cd665e2a9966d2bee4e11ecc0938ff166 (diff) |
Merge tag 'qcom-cleanup-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/cleanup
Merge "General cleanups for MSM/QCOM for 3.15" from Kumar Gala:
Split of the multiplatform support for the Qualcomm SoCs into a mach-qcom
while we leave mach-msm as legacy support. Also, some smp and device tree
related cleanups.
* tag 'qcom-cleanup-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
ARM: qcom: Rename various msm prefixed functions to qcom
clocksource: qcom: split building of legacy vs multiplatform support
ARM: qcom: Split Qualcomm support into legacy and multiplatform
clocksource: qcom: Move clocksource code out of mach-msm
ARM: msm: kill off hotplug.c
ARM: msm: Remove pen_release usage
ARM: dts: msm: split out msm8660 and msm8960 soc into dts include
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-qcom/scm-boot.h')
-rw-r--r-- | arch/arm/mach-qcom/scm-boot.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/mach-qcom/scm-boot.h b/arch/arm/mach-qcom/scm-boot.h new file mode 100644 index 000000000000..7be32ff5d687 --- /dev/null +++ b/arch/arm/mach-qcom/scm-boot.h | |||
@@ -0,0 +1,22 @@ | |||
1 | /* Copyright (c) 2010, Code Aurora Forum. All rights reserved. | ||
2 | * | ||
3 | * This program is free software; you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License version 2 and | ||
5 | * only version 2 as published by the Free Software Foundation. | ||
6 | * | ||
7 | * This program is distributed in the hope that it will be useful, | ||
8 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
9 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
10 | * GNU General Public License for more details. | ||
11 | */ | ||
12 | #ifndef __MACH_SCM_BOOT_H | ||
13 | #define __MACH_SCM_BOOT_H | ||
14 | |||
15 | #define SCM_BOOT_ADDR 0x1 | ||
16 | #define SCM_FLAG_COLDBOOT_CPU1 0x1 | ||
17 | #define SCM_FLAG_WARMBOOT_CPU1 0x2 | ||
18 | #define SCM_FLAG_WARMBOOT_CPU0 0x4 | ||
19 | |||
20 | int scm_set_boot_addr(phys_addr_t addr, int flags); | ||
21 | |||
22 | #endif | ||