[PATCH 2/4] arm: qcom: Split Qualcomm support into legacy and multiplatform
From: Rob Herring <hidden>
Date: 2014-01-31 20:11:43
Also in:
linux-arm-msm, lkml
On Thu, Jan 30, 2014 at 12:36 PM, Kumar Gala [off-list ref] wrote:
Introduce a new mach-qcom that will support SoCs that intend to be multiplatform compatiable while keeping mach-msm to legacy SoC/board support that will not transition over to multiplatform. As part of this, we move support for MSM8X60, MSM8960 and MSM8974 over to mach-qcom. Signed-off-by: Kumar Gala <redacted> ---
[snip]
quoted hunk ↗ jump to hunk
diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig new file mode 100644 index 0000000..8830431 --- /dev/null +++ b/arch/arm/mach-qcom/Kconfig@@ -0,0 +1,34 @@ +config ARCH_QCOM + bool "Qualcomm Support" if ARCH_MULTI_V7 + select ARCH_REQUIRE_GPIOLIB + select CLKSRC_OF + select GENERIC_CLOCKEVENTS + select ARM_GIC + select CPU_V7
CPU_V7 is already selected by MULTI_V7. [snip]
quoted hunk ↗ jump to hunk
diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-qcom/smp.c similarity index 97% rename from arch/arm/mach-msm/platsmp.c rename to arch/arm/mach-qcom/smp.c index 42eb6b7..28364cb 100644 --- a/arch/arm/mach-msm/platsmp.c +++ b/arch/arm/mach-qcom/smp.c@@ -2,6 +2,7 @@ * Copyright (C) 2002 ARM Ltd. * All Rights Reserved * Copyright (c) 2010, Code Aurora Forum. All rights reserved. + * Copyright (c) 2014 The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as@@ -20,7 +21,6 @@ #include <asm/smp_plat.h> #include "scm-boot.h" -#include "common.h" #define VDD_SC1_ARRAY_CLAMP_GFS_CTL 0x35a0 #define SCSS_CPU1CORE_RESET 0x2d80@@ -48,6 +48,15 @@ extern void secondary_startup(void); static DEFINE_SPINLOCK(boot_lock); +static void __ref msm_cpu_die(unsigned int cpu) +{ + + asm("wfi" + : + : + : "memory", "cc"); +}
I realize this is just a move, but there is a wfi() macro that can be used here instead. Rob