| Message ID | 1391107002-21470-3-git-send-email-galak@codeaurora.org (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Thu, Jan 30, 2014 at 12:36:40PM -0600, Kumar Gala 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 <galak@codeaurora.org> > --- > MAINTAINERS | 7 +++ > arch/arm/Kconfig | 7 +-- > arch/arm/Makefile | 1 + > arch/arm/boot/dts/Makefile | 6 +-- > arch/arm/mach-msm/Kconfig | 45 +------------------ > arch/arm/mach-msm/Makefile | 7 --- > arch/arm/mach-msm/hotplug.c | 51 ---------------------- > arch/arm/mach-qcom/Kconfig | 34 +++++++++++++++ > arch/arm/mach-qcom/Makefile | 5 +++ > .../arm/{mach-msm/board-dt.c => mach-qcom/board.c} | 9 ++-- > arch/arm/{mach-msm => mach-qcom}/scm-boot.c | 0 > arch/arm/{mach-msm => mach-qcom}/scm-boot.h | 0 > arch/arm/{mach-msm => mach-qcom}/scm.c | 0 > arch/arm/{mach-msm => mach-qcom}/scm.h | 0 > arch/arm/{mach-msm/platsmp.c => mach-qcom/smp.c} | 11 ++++- > 15 files changed, 70 insertions(+), 113 deletions(-) > delete mode 100644 arch/arm/mach-msm/hotplug.c > create mode 100644 arch/arm/mach-qcom/Kconfig > create mode 100644 arch/arm/mach-qcom/Makefile > rename arch/arm/{mach-msm/board-dt.c => mach-qcom/board.c} (71%) > rename arch/arm/{mach-msm => mach-qcom}/scm-boot.c (100%) > rename arch/arm/{mach-msm => mach-qcom}/scm-boot.h (100%) > rename arch/arm/{mach-msm => mach-qcom}/scm.c (100%) > rename arch/arm/{mach-msm => mach-qcom}/scm.h (100%) > rename arch/arm/{mach-msm/platsmp.c => mach-qcom/smp.c} (97%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index a31a6e3..1817078 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1174,6 +1174,13 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) > W: http://www.arm.linux.org.uk/ > S: Maintained > > +ARM/QUALCOMM SUPPORT > +M: David Brown <davidb@codeaurora.org> > +M: Kumar Gala <galak@codeaurora.org> > +L: linux-arm-msm@vger.kernel.org > +S: Maintained > +F: arch/arm/mach-qcom/ Git repo? If you want us to apply patches for us we can do that, but if you prefer to run a tree and do pull requests then you should have an URL to it here. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thursday 30 January 2014, Kumar Gala 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 <galak@codeaurora.org> > --- > MAINTAINERS | 7 +++ > arch/arm/Kconfig | 7 +-- > arch/arm/Makefile | 1 + > arch/arm/boot/dts/Makefile | 6 +-- > arch/arm/mach-msm/Kconfig | 45 +------------------ > arch/arm/mach-msm/Makefile | 7 --- > arch/arm/mach-msm/hotplug.c | 51 ---------------------- > arch/arm/mach-qcom/Kconfig | 34 +++++++++++++++ > arch/arm/mach-qcom/Makefile | 5 +++ > .../arm/{mach-msm/board-dt.c => mach-qcom/board.c} | 9 ++-- > arch/arm/{mach-msm => mach-qcom}/scm-boot.c | 0 > arch/arm/{mach-msm => mach-qcom}/scm-boot.h | 0 > arch/arm/{mach-msm => mach-qcom}/scm.c | 0 > arch/arm/{mach-msm => mach-qcom}/scm.h | 0 > arch/arm/{mach-msm/platsmp.c => mach-qcom/smp.c} | 11 ++++- The hotplug.c change sticks out as something that isn't just a move of code to another place, but deletion of unused code. It would be nice to split that out into a separate change, possibly together with the trivial board.c and smp.c changes. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Jan 31, 2014, at 1:20 PM, Arnd Bergmann <arnd@arndb.de> wrote: > On Thursday 30 January 2014, Kumar Gala 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 <galak@codeaurora.org> >> --- >> MAINTAINERS | 7 +++ >> arch/arm/Kconfig | 7 +-- >> arch/arm/Makefile | 1 + >> arch/arm/boot/dts/Makefile | 6 +-- >> arch/arm/mach-msm/Kconfig | 45 +------------------ >> arch/arm/mach-msm/Makefile | 7 --- >> arch/arm/mach-msm/hotplug.c | 51 ---------------------- >> arch/arm/mach-qcom/Kconfig | 34 +++++++++++++++ >> arch/arm/mach-qcom/Makefile | 5 +++ >> .../arm/{mach-msm/board-dt.c => mach-qcom/board.c} | 9 ++-- >> arch/arm/{mach-msm => mach-qcom}/scm-boot.c | 0 >> arch/arm/{mach-msm => mach-qcom}/scm-boot.h | 0 >> arch/arm/{mach-msm => mach-qcom}/scm.c | 0 >> arch/arm/{mach-msm => mach-qcom}/scm.h | 0 >> arch/arm/{mach-msm/platsmp.c => mach-qcom/smp.c} | 11 ++++- > > The hotplug.c change sticks out as something that isn't just a move > of code to another place, but deletion of unused code. It would > be nice to split that out into a separate change, possibly together > with the trivial board.c and smp.c changes. That’s not 100% true, the hotplug.c code implemented msm_cpu_die, which moved into smp.c I can split out scm*/smp* into a patch to enable smp if that is really desired, but not exactly sure what it gets us. - k
On Friday 31 January 2014 13:25:25 Kumar Gala wrote: > > The hotplug.c change sticks out as something that isn't just a move > > of code to another place, but deletion of unused code. It would > > be nice to split that out into a separate change, possibly together > > with the trivial board.c and smp.c changes. > > That’s not 100% true, the hotplug.c code implemented msm_cpu_die, which moved into smp.c > > I can split out scm*/smp* into a patch to enable smp if that is really desired, but not exactly sure what it gets us. > It's not extremely important, I just prefer splitting patches that have any kind of functional change from trivial moves. If something happens to break for an unforseen reason, it's easier to bisect to the patch that does the change. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Jan 31, 2014, at 1:34 PM, Arnd Bergmann <arnd@arndb.de> wrote: > On Friday 31 January 2014 13:25:25 Kumar Gala wrote: >>> The hotplug.c change sticks out as something that isn't just a move >>> of code to another place, but deletion of unused code. It would >>> be nice to split that out into a separate change, possibly together >>> with the trivial board.c and smp.c changes. >> >> That’s not 100% true, the hotplug.c code implemented msm_cpu_die, which moved into smp.c >> >> I can split out scm*/smp* into a patch to enable smp if that is really desired, but not exactly sure what it gets us. >> > > It's not extremely important, I just prefer splitting patches > that have any kind of functional change from trivial moves. > > If something happens to break for an unforseen reason, it's > easier to bisect to the patch that does the change. > > Arnd I’ll push my change to hotplug.c into the SMP patch set that Stephen started. - k
On Thu, Jan 30, 2014 at 12:36 PM, Kumar Gala <galak@codeaurora.org> 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 <galak@codeaurora.org> > --- [snip] > 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] > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Kumar Gala <galak@codeaurora.org> writes: > 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 <galak@codeaurora.org> Having a closer look at this after seeing the multi_v7_defconfig change, I have a minor nit on the new ARCH_QCOM name. For new additions, we've been trying to move towards using SOC_foo instead of ARCH_foo. Any reason not to do that here also? Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Feb 26, 2014, at 8:22 AM, Kevin Hilman <khilman@linaro.org> wrote: > Kumar Gala <galak@codeaurora.org> writes: > >> 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 <galak@codeaurora.org> > > Having a closer look at this after seeing the multi_v7_defconfig change, > I have a minor nit on the new ARCH_QCOM name. > > For new additions, we've been trying to move towards using SOC_foo > instead of ARCH_foo. Any reason not to do that here also? > > Kevin No reason, just wasn’t aware and no one said anything til now. Hmm, how to handle this now, can we do this as a 3.16 cleanup? - k
Kumar Gala <galak@codeaurora.org> writes: > On Feb 26, 2014, at 8:22 AM, Kevin Hilman <khilman@linaro.org> wrote: > >> Kumar Gala <galak@codeaurora.org> writes: >> >>> 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 <galak@codeaurora.org> >> >> Having a closer look at this after seeing the multi_v7_defconfig change, >> I have a minor nit on the new ARCH_QCOM name. >> >> For new additions, we've been trying to move towards using SOC_foo >> instead of ARCH_foo. Any reason not to do that here also? >> >> Kevin > > No reason, just wasn’t aware and no one said anything til now. Yeah, sorry for not reviewiing sooner. > Hmm, how to handle this now, can we do this as a 3.16 cleanup? Yes, we've already merged it, so doing it as a cleanup should be fine. Thanks, Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/MAINTAINERS b/MAINTAINERS index a31a6e3..1817078 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1174,6 +1174,13 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.arm.linux.org.uk/ S: Maintained +ARM/QUALCOMM SUPPORT +M: David Brown <davidb@codeaurora.org> +M: Kumar Gala <galak@codeaurora.org> +L: linux-arm-msm@vger.kernel.org +S: Maintained +F: arch/arm/mach-qcom/ + ARM/RADISYS ENP2611 MACHINE SUPPORT M: Lennert Buytenhek <kernel@wantstofly.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index dc6ef9a..9be7483 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -657,9 +657,8 @@ config ARCH_PXA help Support for Intel/Marvell's PXA2xx/PXA3xx processor line. -config ARCH_MSM_NODT - bool "Qualcomm MSM" - select ARCH_MSM +config ARCH_MSM + bool "Qualcomm MSM (non-multiplatform)" select ARCH_REQUIRE_GPIOLIB select COMMON_CLK select GENERIC_CLOCKEVENTS @@ -1005,6 +1004,8 @@ source "arch/arm/plat-pxa/Kconfig" source "arch/arm/mach-mmp/Kconfig" +source "arch/arm/mach-qcom/Kconfig" + source "arch/arm/mach-realview/Kconfig" source "arch/arm/mach-rockchip/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 08a9ef5..51e5bed 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -180,6 +180,7 @@ machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2 machine-$(CONFIG_ARCH_ORION5X) += orion5x machine-$(CONFIG_ARCH_PICOXCELL) += picoxcell machine-$(CONFIG_ARCH_PXA) += pxa +machine-$(CONFIG_ARCH_QCOM) += qcom machine-$(CONFIG_ARCH_REALVIEW) += realview machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip machine-$(CONFIG_ARCH_RPC) += rpc diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index b9d6a8b..c9eaf1f 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -118,9 +118,6 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ kirkwood-ts219-6282.dtb dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb -dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \ - qcom-msm8960-cdp.dtb \ - qcom-apq8074-dragonboard.dtb dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ armada-370-mirabox.dtb \ armada-370-netgear-rn102.dtb \ @@ -232,6 +229,9 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ dra7-evm.dtb dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb +dtb-$(CONFIG_ARCH_QCOM) += qcom-msm8660-surf.dtb \ + qcom-msm8960-cdp.dtb \ + qcom-apq8074-dragonboard.dtb dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ ste-hrefprev60-stuib.dtb \ ste-hrefprev60-tvk.dtb \ diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index 3c4eca7..a7f959e 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -1,50 +1,9 @@ -config ARCH_MSM - bool - -config ARCH_MSM_DT - bool "Qualcomm MSM DT Support" if ARCH_MULTI_V7 - select ARCH_MSM - select ARCH_REQUIRE_GPIOLIB - select CLKSRC_OF - select GENERIC_CLOCKEVENTS - help - Support for Qualcomm's devicetree based MSM systems. - if ARCH_MSM -menu "Qualcomm MSM SoC Selection" - depends on ARCH_MSM_DT - -config ARCH_MSM8X60 - bool "Enable support for MSM8X60" - select ARM_GIC - select CPU_V7 - select HAVE_SMP - select MSM_SCM if SMP - select CLKSRC_QCOM - -config ARCH_MSM8960 - bool "Enable support for MSM8960" - select ARM_GIC - select CPU_V7 - select HAVE_SMP - select MSM_SCM if SMP - select CLKSRC_QCOM - -config ARCH_MSM8974 - bool "Enable support for MSM8974" - select ARM_GIC - select CPU_V7 - select HAVE_ARM_ARCH_TIMER - select HAVE_SMP - select MSM_SCM if SMP - -endmenu - choice prompt "Qualcomm MSM SoC Type" default ARCH_MSM7X00A - depends on ARCH_MSM_NODT + depends on ARCH_MSM config ARCH_MSM7X00A bool "MSM7x00A / MSM7x01A" @@ -99,7 +58,7 @@ config MSM_VIC bool menu "Qualcomm MSM Board Type" - depends on ARCH_MSM_NODT + depends on ARCH_MSM config MACH_HALIBUT depends on ARCH_MSM diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index 4baff13..27c078a 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -13,18 +13,11 @@ obj-$(CONFIG_ARCH_QSD8X50) += dma.o io.o obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o obj-$(CONFIG_MSM_SMD) += last_radio_log.o -obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o - -CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) - -obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o -obj-$(CONFIG_SMP) += platsmp.o obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o board-trout-panel.o devices-msm7x00.o obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o -obj-$(CONFIG_ARCH_MSM_DT) += board-dt.o obj-$(CONFIG_MSM_GPIOMUX) += gpiomux.o obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c deleted file mode 100644 index cea80fc..0000000 --- a/arch/arm/mach-msm/hotplug.c +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2002 ARM Ltd. - * 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 - * published by the Free Software Foundation. - */ -#include <linux/kernel.h> -#include <linux/errno.h> -#include <linux/smp.h> - -#include <asm/smp_plat.h> - -#include "common.h" - -static inline void cpu_enter_lowpower(void) -{ -} - -static inline void cpu_leave_lowpower(void) -{ -} - -static inline void platform_do_lowpower(unsigned int cpu) -{ - asm("wfi" - : - : - : "memory", "cc"); -} - -/* - * platform-specific code to shutdown a CPU - * - * Called with IRQs disabled - */ -void __ref msm_cpu_die(unsigned int cpu) -{ - /* - * we're ready for shutdown now, so do it - */ - cpu_enter_lowpower(); - platform_do_lowpower(cpu); - - /* - * bring this CPU back into the world of cache - * coherency, and then restore interrupts - */ - cpu_leave_lowpower(); -} 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 + select HAVE_SMP + select QCOM_SCM if SMP + help + Support for Qualcomm's devicetree based systems. + +if ARCH_QCOM + +menu "Qualcomm SoC Selection" + +config ARCH_MSM8X60 + bool "Enable support for MSM8X60" + select CLKSRC_QCOM + +config ARCH_MSM8960 + bool "Enable support for MSM8960" + select CLKSRC_QCOM + +config ARCH_MSM8974 + bool "Enable support for MSM8974" + select HAVE_ARM_ARCH_TIMER + +endmenu + +config QCOM_SCM + bool + +endif diff --git a/arch/arm/mach-qcom/Makefile b/arch/arm/mach-qcom/Makefile new file mode 100644 index 0000000..c0ba0ef --- /dev/null +++ b/arch/arm/mach-qcom/Makefile @@ -0,0 +1,5 @@ +obj-y := board.o +obj-$(CONFIG_SMP) += smp.o +obj-$(CONFIG_QCOM_SCM) += scm.o scm-boot.o + +CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) diff --git a/arch/arm/mach-msm/board-dt.c b/arch/arm/mach-qcom/board.c similarity index 71% rename from arch/arm/mach-msm/board-dt.c rename to arch/arm/mach-qcom/board.c index 1e3af2b..bae617e 100644 --- a/arch/arm/mach-msm/board-dt.c +++ b/arch/arm/mach-qcom/board.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2012,2013 The Linux Foundation. All rights reserved. +/* Copyright (c) 2010-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 and @@ -14,14 +14,13 @@ #include <asm/mach/arch.h> -static const char * const msm_dt_match[] __initconst = { - "qcom,msm8660-fluid", +static const char * const qcom_dt_match[] __initconst = { "qcom,msm8660-surf", "qcom,msm8960-cdp", "qcom,apq8074-dragonboard", NULL }; -DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)") - .dt_compat = msm_dt_match, +DT_MACHINE_START(QCOM_DT, "Qualcomm (Flattened Device Tree)") + .dt_compat = qcom_dt_match, MACHINE_END diff --git a/arch/arm/mach-msm/scm-boot.c b/arch/arm/mach-qcom/scm-boot.c similarity index 100% rename from arch/arm/mach-msm/scm-boot.c rename to arch/arm/mach-qcom/scm-boot.c diff --git a/arch/arm/mach-msm/scm-boot.h b/arch/arm/mach-qcom/scm-boot.h similarity index 100% rename from arch/arm/mach-msm/scm-boot.h rename to arch/arm/mach-qcom/scm-boot.h diff --git a/arch/arm/mach-msm/scm.c b/arch/arm/mach-qcom/scm.c similarity index 100% rename from arch/arm/mach-msm/scm.c rename to arch/arm/mach-qcom/scm.c diff --git a/arch/arm/mach-msm/scm.h b/arch/arm/mach-qcom/scm.h similarity index 100% rename from arch/arm/mach-msm/scm.h rename to arch/arm/mach-qcom/scm.h 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"); +} + static void msm_secondary_init(unsigned int cpu) { /*
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 <galak@codeaurora.org> --- MAINTAINERS | 7 +++ arch/arm/Kconfig | 7 +-- arch/arm/Makefile | 1 + arch/arm/boot/dts/Makefile | 6 +-- arch/arm/mach-msm/Kconfig | 45 +------------------ arch/arm/mach-msm/Makefile | 7 --- arch/arm/mach-msm/hotplug.c | 51 ---------------------- arch/arm/mach-qcom/Kconfig | 34 +++++++++++++++ arch/arm/mach-qcom/Makefile | 5 +++ .../arm/{mach-msm/board-dt.c => mach-qcom/board.c} | 9 ++-- arch/arm/{mach-msm => mach-qcom}/scm-boot.c | 0 arch/arm/{mach-msm => mach-qcom}/scm-boot.h | 0 arch/arm/{mach-msm => mach-qcom}/scm.c | 0 arch/arm/{mach-msm => mach-qcom}/scm.h | 0 arch/arm/{mach-msm/platsmp.c => mach-qcom/smp.c} | 11 ++++- 15 files changed, 70 insertions(+), 113 deletions(-) delete mode 100644 arch/arm/mach-msm/hotplug.c create mode 100644 arch/arm/mach-qcom/Kconfig create mode 100644 arch/arm/mach-qcom/Makefile rename arch/arm/{mach-msm/board-dt.c => mach-qcom/board.c} (71%) rename arch/arm/{mach-msm => mach-qcom}/scm-boot.c (100%) rename arch/arm/{mach-msm => mach-qcom}/scm-boot.h (100%) rename arch/arm/{mach-msm => mach-qcom}/scm.c (100%) rename arch/arm/{mach-msm => mach-qcom}/scm.h (100%) rename arch/arm/{mach-msm/platsmp.c => mach-qcom/smp.c} (97%)