Split mach-msm into legacy and mach-qcom (multiplatform)
Subsystems (7)
v3 cover Split mach-msm into legacy and mach-qcom (multiplatform)
This is the splits the Qualcomm MSM platform into legacy support that we will not try and convert to multiplatform and multiplatform support.
- k
Changes from v2:
* Dropped ARCH_MSM depends from CLKSRC_QCOM, since we select it
* Fixed some grammar/typo's in commit messages
* kept smp ops code in platsmp.c to match what other mach's do
* Kept mach-qcom/Kconfig sorted alphabetically
Changes from v1:
* Added patch to remove hotplug.c
* Added patch to rename msm_ to qcom_
* Changes the Kconfig to drop CPU_V7
* used wfi() in cpu_die function
* Added git tree to MAINTAINERS file
Kumar Gala (5):
ARM: msm: kill off hotplug.c
clocksource: qcom: Move clocksource code out of mach-msm
ARM: qcom: Split Qualcomm support into legacy and multiplatform
clocksource: qcom: split building of legacy vs multiplatform support
ARM: qcom: Rename various msm prefixed functions to qcom
arch/arm/mach-msm/board-dt.c | 41 ---- arch/arm/mach-msm/hotplug.c | 51 ----- arch/arm/mach-msm/platsmp.c | 130 -------------- arch/arm/mach-msm/scm-boot.c | 39 ---- arch/arm/mach-msm/scm-boot.h | 22 -- arch/arm/mach-msm/scm.c | 299 --------------------------------- arch/arm/mach-msm/scm.h | 25 -- arch/arm/mach-msm/timer.c | 333 ------------------------------------- b/MAINTAINERS | 8 b/arch/arm/Kconfig | 7 b/arch/arm/Kconfig.debug | 2 b/arch/arm/Makefile | 1 b/arch/arm/boot/dts/Makefile | 6 b/arch/arm/mach-msm/Kconfig | 54 ------ b/arch/arm/mach-msm/Makefile | 8 b/arch/arm/mach-msm/common.h | 1 b/arch/arm/mach-qcom/Kconfig | 33 +++ b/arch/arm/mach-qcom/Makefile | 5 b/arch/arm/mach-qcom/board.c | 40 ++++ b/arch/arm/mach-qcom/platsmp.c | 137 +++++++++++++++ b/arch/arm/mach-qcom/scm-boot.c | 39 ++++ b/arch/arm/mach-qcom/scm-boot.h | 22 ++ b/arch/arm/mach-qcom/scm.c | 299 +++++++++++++++++++++++++++++++++ b/arch/arm/mach-qcom/scm.h | 25 ++ b/drivers/clocksource/Kconfig | 3 b/drivers/clocksource/Makefile | 1 b/drivers/clocksource/qcom-timer.c | 330 ++++++++++++++++++++++++++++++++++++ 27 files changed, 956 insertions(+), 1005 deletions(-)
PATCH v3 1/5 ARM: msm: kill off hotplug.c
Right now hotplug.c only really implements msm_cpu_die as a wfi. Just move that implementation into platsmp.c. At the same time we use the existing wfi() instead of inline asm.
--- arch/arm/mach-msm/Makefile | 1 - arch/arm/mach-msm/common.h | 1 - arch/arm/mach-msm/hotplug.c | 51 --------------------------------------------- arch/arm/mach-msm/platsmp.c | 7 +++++++ 4 files changed, 7 insertions(+), 53 deletions(-) delete mode 100644 arch/arm/mach-msm/hotplug.c
arch/arm/mach-msm/Makefile +0 -1
@@ -18,7 +18,6 @@ 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
arch/arm/mach-msm/common.h +0 -1
@@ -24,7 +24,6 @@ extern void __iomem *__msm_ioremap_caller(phys_addr_t 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);struct msm_mmc_platform_data ;
arch/arm/mach-msm/hotplug.c deleted +0 -51
51 lines not on this page · raw message
arch/arm/mach-msm/platsmp.c +7 -0
@@ -29,6 +29,13 @@ extern void secondary_startup(void);static DEFINE_SPINLOCK (boot_lock); +#ifdef CONFIG_HOTPLUG_CPU +static void __ref msm_cpu_die (unsigned int cpu) +{ +wfi (); +} +#endif +static inline int get_core_count (void ) {/* 1 + the PART[1:0] field of MIDR */
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 2/5 clocksource: qcom: Move clocksource code out of mach-msm
In reply to Kumar GalaWe intend to share the clocksource code for MSM platforms between legacy and multiplatform supported qcom SoCs.
--- arch/arm/mach-msm/Kconfig | 13 +++++-------- arch/arm/mach-msm/Makefile | 1 - drivers/clocksource/Kconfig | 3 +++ drivers/clocksource/Makefile | 1 + .../mach-msm/timer.c => drivers/clocksource/qcom-timer.c | 6 +----- 5 files changed, 10 insertions(+), 14 deletions(-) rename arch/arm/mach-msm/timer.c => drivers/clocksource/qcom-timer.c (98%)
arch/arm/mach-msm/Kconfig +5 -8
@@ -21,7 +21,7 @@ config ARCH_MSM8X60 select CPU_V7 select HAVE_SMP select MSM_SCM if SMP - select MSM_TIMER + select CLKSRC_QCOM config ARCH_MSM8960 bool "Enable support for MSM8960"
@@ -29,7 +29,7 @@ config ARCH_MSM8960 select CPU_V7 select HAVE_SMP select MSM_SCM if SMP - select MSM_TIMER + select CLKSRC_QCOM config ARCH_MSM8974 bool "Enable support for MSM8974"
@@ -54,7 +54,7 @@ config ARCH_MSM7X00A select MACH_TROUT if !MACH_HALIBUT select MSM_PROC_COMM select MSM_SMD - select MSM_TIMER + select CLKSRC_QCOM select MSM_SMD_PKG3 config ARCH_MSM7X30
@@ -66,7 +66,7 @@ config ARCH_MSM7X30 select MSM_GPIOMUX select MSM_PROC_COMM select MSM_SMD - select MSM_TIMER + select CLKSRC_QCOM select MSM_VIC config ARCH_QSD8X50
@@ -78,7 +78,7 @@ config ARCH_QSD8X50 select MSM_GPIOMUX select MSM_PROC_COMM select MSM_SMD - select MSM_TIMER + select CLKSRC_QCOM select MSM_VIC endchoice
@@ -153,7 +153,4 @@ config MSM_GPIOMUX config MSM_SCM bool -config MSM_TIMER - bool - endif
arch/arm/mach-msm/Makefile +0 -1
@@ -1,4 +1,3 @@ -obj-$(CONFIG_MSM_TIMER) += timer.o obj-$(CONFIG_MSM_PROC_COMM) += clock.o obj-$(CONFIG_MSM_VIC) += irq-vic.o
drivers/clocksource/Kconfig +3 -0
@@ -140,3 +140,6 @@ config VF_PIT_TIMER bool help Support for Period Interrupt Timer on Freescale Vybrid Family SoCs. + +config CLKSRC_QCOM + bool
drivers/clocksource/Makefile +1 -0
@@ -32,6 +32,7 @@ obj-$(CONFIG_CLKSRC_EFM32) += time-efm32.o obj-$(CONFIG_CLKSRC_EXYNOS_MCT) += exynos_mct.o obj-$(CONFIG_CLKSRC_SAMSUNG_PWM) += samsung_pwm_timer.o obj-$(CONFIG_VF_PIT_TIMER) += vf_pit_timer.o +obj-$(CONFIG_CLKSRC_QCOM) += qcom-timer.o obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o obj-$(CONFIG_ARM_GLOBAL_TIMER) += arm_global_timer.o
drivers/clocksource/qcom-timer.c renamed from arch/arm/mach-msm/timer.c +1 -5
@@ -1,7 +1,7 @@/* * * Copyright (C) 2007 Google, Inc. -* Copyright (c) 2009-2012, The Linux Foundation. All rights reserved. +* Copyright (c) 2009-2012,2014, The Linux Foundation. All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and
@@ -26,10 +26,6 @@#include <linux/of_irq.h> #include <linux/sched_clock.h> -#include <asm/mach/time.h> - -#include "common.h" -#define TIMER_MATCH_VAL 0x0000#define TIMER_COUNT_VAL 0x0004#define TIMER_ENABLE 0x0008
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 2/5] clocksource: qcom: Move clocksource code out of mach-msm
Quoted 17 lines · Kumar Gala
drivers/clocksource/qcom-timer.c renamed from arch/arm/mach-msm/timer.c +1
-1@@ -1,7 +1,7 @@/* * * Copyright (C) 2007 Google, Inc. -* Copyright (c) 2009-2012, The Linux Foundation. All rights reserved. +* Copyright (c) 2009-2012,2014, The Linux Foundation. All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and
drivers/clocksource/qcom-timer.c line 32
Quoted 7 lines
drivers/clocksource/qcom-timer.c renamed from arch/arm/mach-msm/timer.c +0
-4@@ -26,10 +26,6 @@#include <linux/of_irq.h> #include <linux/sched_clock.h> -#include <asm/mach/time.h> - -#include "common.h" -
This will cause sparse warnings because we no longer have the header included.
CHECK drivers/clocksource/qcom-timer.cdrivers/clocksource/qcom-timer.c:304:13: warning: symbol 'msm7x01_timer_init' was not declared. Should it be static? drivers/clocksource/qcom-timer.c:317:13: warning: symbol 'msm7x30_timer_init' was not declared. Should it be static? drivers/clocksource/qcom-timer.c:324:13: warning: symbol 'qsd8x50_timer_init' was not declared. Should it be static?
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 3/5 ARM: qcom: Split Qualcomm support into legacy and multiplatform
In reply to Kumar GalaIntroduce a new mach-qcom that will support SoCs that intend to be multiplatform compatible 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.
---
MAINTAINERS | 8 ++++
arch/arm/Kconfig | 7 ++--
arch/arm/Kconfig.debug | 2 +-
arch/arm/Makefile | 1 +
arch/arm/boot/dts/Makefile | 6 +--
arch/arm/mach-msm/Kconfig | 45 +---------------------
arch/arm/mach-msm/Makefile | 6 ---
arch/arm/mach-qcom/Kconfig | 33 ++++++++++++++++
arch/arm/mach-qcom/Makefile | 5 +++
.../arm/{mach-msm/board-dt.c => mach-qcom/board.c} | 13 +++----
arch/arm/{mach-msm => mach-qcom}/platsmp.c | 2 +-
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
15 files changed, 64 insertions(+), 64 deletions(-)
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}/platsmp.c (98%)
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%)MAINTAINERS +8 -0
@@ -1167,6 +1167,14 @@ L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers) W: http://www.arm.linux.org.uk/ S: Maintained +ARM/QUALCOMM SUPPORT +M: Kumar Gala <[email protected]> +M: David Brown <[email protected]> +L: linux-arm-msm at vger.kernel.org +S: Maintained +F: arch/arm/mach-qcom/ +T: git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git + ARM/RADISYS ENP2611 MACHINE SUPPORT M: Lennert Buytenhek <[email protected]> L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
arch/arm/Kconfig +4 -3
@@ -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"
arch/arm/Kconfig.debug +1 -1
@@ -956,7 +956,7 @@ config DEBUG_STI_UART config DEBUG_MSM_UART bool - depends on ARCH_MSM + depends on ARCH_MSM || ARCH_QCOM config DEBUG_LL_INCLUDE string
arch/arm/Makefile +1 -0
@@ -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
arch/arm/boot/dts/Makefile +3 -3
@@ -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 \
arch/arm/mach-msm/Kconfig +2 -43
59 lines not on this page · raw message
arch/arm/mach-msm/Makefile +0 -6
@@ -13,17 +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_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
arch/arm/mach-qcom/Kconfig new file +33 -0
@@ -0,0 +1,33 @@ +config ARCH_QCOM + bool "Qualcomm Support" if ARCH_MULTI_V7 + select ARCH_REQUIRE_GPIOLIB + select ARM_GIC + select CLKSRC_OF + select GENERIC_CLOCKEVENTS + 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
arch/arm/mach-qcom/Makefile new file +5 -0
@@ -0,0 +1,5 @@ +obj-y := board.o +obj-$(CONFIG_SMP) += platsmp.o +obj-$(CONFIG_QCOM_SCM) += scm.o scm-boot.o + +CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)
arch/arm/mach-qcom/board.c renamed from arch/arm/mach-msm/board-dt.c +6 -7
@@ -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
@@ -17,10 +17,9 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include "common.h" +extern struct smp_operations msm_smp_ops; -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" ,NULL
@@ -31,11 +30,11 @@ static const char * const apq8074_dt_match[] __initconst = {NULL }; -DT_MACHINE_START (MSM_DT ,"Qualcomm MSM (Flattened Device Tree)" ) +DT_MACHINE_START (QCOM_DT ,"Qualcomm (Flattened Device Tree)" ) .smp =smp_ops (msm_smp_ops), - .dt_compat = msm_dt_match, + .dt_compat = qcom_dt_match, MACHINE_END -DT_MACHINE_START (APQ_DT ,"Qualcomm MSM (Flattened Device Tree)" ) +DT_MACHINE_START (APQ_DT ,"Qualcomm (Flattened Device Tree)" ) .dt_compat = apq8074_dt_match,MACHINE_END
arch/arm/mach-qcom/platsmp.c renamed from arch/arm/mach-msm/platsmp.c +1 -1
@@ -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
@@ -19,7 +20,6 @@#include <asm/smp_plat.h> #include "scm-boot.h" -#include "common.h" #define VDD_SC1_ARRAY_CLAMP_GFS_CTL 0x15A0#define SCSS_CPU1CORE_RESET 0xD80
arch/arm/mach-qcom/scm-boot.c renamed from arch/arm/mach-msm/scm-boot.c +0 -0
arch/arm/mach-qcom/scm-boot.h renamed from arch/arm/mach-msm/scm-boot.h +0 -0
arch/arm/mach-qcom/scm.c renamed from arch/arm/mach-msm/scm.c +0 -0
arch/arm/mach-qcom/scm.h renamed from arch/arm/mach-msm/scm.h +0 -0
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 3/5] ARM: qcom: Split Qualcomm support into legacy and multiplatform
arch/arm/mach-qcom/platsmp.c line 5
Quoted 12 lines · Kumar Gala
arch/arm/mach-qcom/platsmp.c renamed from arch/arm/mach-msm/platsmp.c +1
-0@@ -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.
We should replace the Code Aurora Forum copyright with Linux Foundation here.
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 3/5] ARM: qcom: Split Qualcomm support into legacy and multiplatform
Quoted 16 lines · Stephen Boyd
arch/arm/mach-qcom/platsmp.c line 5
Quoted 12 lines · Kumar Gala
arch/arm/mach-qcom/platsmp.c renamed from arch/arm/mach-msm/platsmp.c +1
-0@@ -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. We should replace the Code Aurora Forum copyright with Linux Foundation here.
Is this something we?ve been doing? Its normally bad form to make such changes, but I don?t know what the details re when LF took over CAF w/regards to something like Copyright.
- k
Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 3/5] ARM: qcom: Split Qualcomm support into legacy and multiplatform
Quoted 8 lines · Kumar Gala
Quoted 5 lines
Quoted 5 lines
* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
Quoted 1 line
Quoted 1 line
+ * Copyright (c) 2014 The Linux Foundation. All rights reserved.
We should replace the Code Aurora Forum copyright with Linux Foundation here.
Is this something we?ve been doing? Its normally bad form to make such changes, but I don?t know what the details re when LF took over CAF w/regards to something like Copyright.
- k
Yes, the line should read:
- * Copyright (c) 2010, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2010,2014 The Linux Foundation. All rights reserved.
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 4/5 clocksource: qcom: split building of legacy vs multiplatform support
In reply to Kumar GalaThe majority of the clocksource code for the Qualcomm platform is shared between newer (multiplatform) and older platforms. However there is a bit of code that isn't, so only build it for the appropriate config.
--- drivers/clocksource/qcom-timer.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
drivers/clocksource/qcom-timer.c +12 -11
@@ -106,15 +106,6 @@ static notrace cycle_t msm_read_timer_count(struct clocksource *cs)return readl_relaxed (source_base +TIMER_COUNT_VAL ); } -static notrace cycle_t msm_read_timer_count_shift(struct clocksource *cs) -{ -/* -* Shift timer count down by a constant due to unreliable lower bits -* on some targets. -*/ -return msm_read_timer_count (cs) >>MSM_DGT_SHIFT ; -} -static struct clocksource msm_clocksource = { .name ="dg_timer" , .rating =300 ,
@@ -228,7 +219,7 @@ err:sched_clock_register (msm_sched_clock_read, sched_bits, dgt_hz); } -#ifdef CONFIG_OF +#ifdef CONFIG_ARCH_QCOM static void __init msm_dt_timer_init (struct device_node *np) {u32 freq;
@@ -281,7 +272,7 @@ static void __init msm_dt_timer_init(struct device_node *np) }CLOCKSOURCE_OF_DECLARE (kpss_timer,"qcom,kpss-timer" , msm_dt_timer_init);CLOCKSOURCE_OF_DECLARE (scss_timer,"qcom,scss-timer" , msm_dt_timer_init); -#endif +#else static int __init msm_timer_map (phys_addr_t addr,u32 event,u32 source,u32 sts)
@@ -301,6 +292,15 @@ static int __init msm_timer_map(phys_addr_t addr, u32 event, u32 source,return 0 ; } +static notrace cycle_t msm_read_timer_count_shift(struct clocksource *cs) +{ +/* +* Shift timer count down by a constant due to unreliable lower bits +* on some targets. +*/ +return msm_read_timer_count (cs) >>MSM_DGT_SHIFT ; +} +void __init msm7x01_timer_init (void ) {struct clocksource *cs = &msm_clocksource;
@@ -327,3 +327,4 @@ void __init qsd8x50_timer_init(void)return ; msm_timer_init(19200000 / 4, 32, 7, false); } +#endif
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 5/5 ARM: qcom: Rename various msm prefixed functions to qcom
In reply to Kumar GalaAs mach-qcom will support a number of different Qualcomm SoC platforms we replace the msm prefix on function names with qcom to be a bit more generic.
--- arch/arm/mach-qcom/board.c | 4 ++-- arch/arm/mach-qcom/platsmp.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-)
arch/arm/mach-qcom/board.c +2 -2
@@ -17,7 +17,7 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -extern struct smp_operations msm_smp_ops; +extern struct smp_operations qcom_smp_ops;static const char *const qcom_dt_match[]__initconst = {"qcom,msm8660-surf" ,
@@ -31,7 +31,7 @@ static const char * const apq8074_dt_match[] __initconst = { };DT_MACHINE_START (QCOM_DT ,"Qualcomm (Flattened Device Tree)" ) - .smp = smp_ops(msm_smp_ops), + .smp = smp_ops(qcom_smp_ops), .dt_compat = qcom_dt_match,MACHINE_END
arch/arm/mach-qcom/platsmp.c +11 -11
@@ -30,7 +30,7 @@ extern void secondary_startup(void);static DEFINE_SPINLOCK (boot_lock);#ifdef CONFIG_HOTPLUG_CPU -static void __ref msm_cpu_die (unsigned int cpu) +static void __ref qcom_cpu_die (unsigned int cpu) {wfi (); }
@@ -42,7 +42,7 @@ static inline int get_core_count(void)return ((read_cpuid_id () >>4 ) &3 ) +1 ; } -static void msm_secondary_init (unsigned int cpu) +static void qcom_secondary_init (unsigned int cpu) {/* * Synchronise with the boot thread.
@@ -70,7 +70,7 @@ static void prepare_cold_cpu(unsigned int cpu) "address\n"); } -static int msm_boot_secondary (unsigned int cpu,struct task_struct *idle) +static int qcom_boot_secondary (unsigned int cpu,struct task_struct *idle) {static int cold_boot_done;
@@ -108,7 +108,7 @@ static int msm_boot_secondary(unsigned int cpu, struct task_struct *idle)* does not support the ARM SCU, so just set the possible cpu mask to * NR_CPUS. */ -static void __init msm_smp_init_cpus (void ) +static void __init qcom_smp_init_cpus (void ) {unsigned int i, ncores =get_core_count ();
@@ -122,16 +122,16 @@ static void __init msm_smp_init_cpus(void)set_cpu_possible (i, true); } -static void __init msm_smp_prepare_cpus (unsigned int max_cpus) +static void __init qcom_smp_prepare_cpus (unsigned int max_cpus) { } -struct smp_operations msm_smp_ops__initdata = { - .smp_init_cpus = msm_smp_init_cpus, - .smp_prepare_cpus = msm_smp_prepare_cpus, - .smp_secondary_init = msm_secondary_init, - .smp_boot_secondary = msm_boot_secondary, +struct smp_operations qcom_smp_ops__initdata = { + .smp_init_cpus = qcom_smp_init_cpus, + .smp_prepare_cpus = qcom_smp_prepare_cpus, + .smp_secondary_init = qcom_secondary_init, + .smp_boot_secondary = qcom_boot_secondary, #ifdef CONFIG_HOTPLUG_CPU - .cpu_die = msm_cpu_die, + .cpu_die = qcom_cpu_die, #endif };
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation