Re: [PATCH 2/2] ARM: dts: MSM8974: Add pinctrl node
On Feb 24, 2014, at 3:57 AM, Linus Walleij linus.wall...@linaro.org wrote: On Thu, Feb 6, 2014 at 4:28 PM, Ivan T. Ivanov iiva...@mm-sol.com wrote: From: Ivan T. Ivanov iiva...@mm-sol.com Add the pin control node and pin definitions of SPI8. Signed-off-by: Ivan T. Ivanov iiva...@mm-sol.com Acked-by: Linus Walleij linus.wall...@linaro.org Kumar, please take this through your qcom tree. applied to qcom/dt - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL] qcom driver changes for v3.15
On Feb 25, 2014, at 11:14 AM, Arnd Bergmann a...@arndb.de wrote: On Tuesday 25 February 2014, Kumar Gala wrote: The following changes since commit cf1e8f0cd665e2a9966d2bee4e11ecc0938ff166: ARM: qcom: Rename various msm prefixed functions to qcom (2014-02-06 16:20:41 -0600) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git tags/qcom-drivers-for-3.15 for you to fetch changes up to add798a40aec3a768165055477ba8bfee21e06fc: gpio: msm: switch Kconfig to ARCH_QCOM depends (2014-02-25 09:22:10 -0600) Applied to the next/drivers branch now, and added a merge description that I adapted from your patch changelogs: Merge qcom driver changes for v3.15 from Kumar Gala: We've split Qualcomm MSM support into legacy and multiplatform. These drivers are only relevant on the multiplatform supported SoCs so switch the Kconfig depends to ARCH_QCOM. It would be helpful if you can in the future always add a description yourself when creating the tag. Arnd Oops, I think when I updated the tag before sending I lost the message in the tag - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] ARM: qcom: Enable basic support for Qualcomm platforms in multi_v7_defconfig
Enable support for the MSM8x60, MSM8960, and MSM8974 SoCs, clocks and serial console as part of the standard multi_v7_defconfig. Signed-off-by: Kumar Gala ga...@codeaurora.org --- I leave this to the arm-soc guys to apply because of possible conflicts with other updates to multi_v7_defconfig. - k arch/arm/configs/multi_v7_defconfig | 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 56549f1..145bf97 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -9,8 +9,6 @@ CONFIG_MODULE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_ARCH_MVEBU=y CONFIG_MACH_ARMADA_370=y -CONFIG_MACH_ARMADA_375=y -CONFIG_MACH_ARMADA_38X=y CONFIG_MACH_ARMADA_XP=y CONFIG_ARCH_BCM=y CONFIG_ARCH_BCM_MOBILE=y @@ -31,8 +29,12 @@ CONFIG_ARCH_OMAP3=y CONFIG_ARCH_OMAP4=y CONFIG_SOC_OMAP5=y CONFIG_SOC_AM33XX=y -CONFIG_SOC_DRA7XX=y CONFIG_SOC_AM43XX=y +CONFIG_SOC_DRA7XX=y +CONFIG_ARCH_QCOM=y +CONFIG_ARCH_MSM8X60=y +CONFIG_ARCH_MSM8960=y +CONFIG_ARCH_MSM8974=y CONFIG_ARCH_ROCKCHIP=y CONFIG_ARCH_SOCFPGA=y CONFIG_PLAT_SPEAR=y @@ -148,6 +150,8 @@ CONFIG_SERIAL_SIRFSOC_CONSOLE=y CONFIG_SERIAL_TEGRA=y CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y +CONFIG_SERIAL_MSM=y +CONFIG_SERIAL_MSM_CONSOLE=y CONFIG_SERIAL_VT8500=y CONFIG_SERIAL_VT8500_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y @@ -160,7 +164,6 @@ CONFIG_SERIAL_FSL_LPUART_CONSOLE=y CONFIG_SERIAL_ST_ASC=y CONFIG_SERIAL_ST_ASC_CONSOLE=y CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PINCTRL=y CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_I2C_MV64XXX=y @@ -191,7 +194,6 @@ CONFIG_SENSORS_LM90=y CONFIG_THERMAL=y CONFIG_ARMADA_THERMAL=y CONFIG_WATCHDOG=y -CONFIG_ORION_WATCHDOG=y CONFIG_MFD_AS3722=y CONFIG_MFD_CROS_EC=y CONFIG_MFD_CROS_EC_SPI=y @@ -298,6 +300,10 @@ CONFIG_MFD_NVEC=y CONFIG_KEYBOARD_NVEC=y CONFIG_SERIO_NVEC_PS2=y CONFIG_NVEC_POWER=y +CONFIG_COMMON_CLK_QCOM=y +CONFIG_MSM_GCC_8660=y +CONFIG_MSM_MMCC_8960=y +CONFIG_MSM_MMCC_8974=y CONFIG_TEGRA_IOMMU_GART=y CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_MEMORY=y -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v5 2/4] devicetree: bindings: Document Krait CPU/L1 EDAC
On Feb 25, 2014, at 5:16 AM, Lorenzo Pieralisi lorenzo.pieral...@arm.com wrote: Hi Stephen, On Wed, Feb 19, 2014 at 12:20:43AM +, Stephen Boyd wrote: (Sorry, this discussion stalled due to merge window + life events) Sorry for the delay in replying on my side too. On 01/17, Lorenzo Pieralisi wrote: On Thu, Jan 16, 2014 at 07:26:17PM +, Stephen Boyd wrote: On 01/16, Lorenzo Pieralisi wrote: On Thu, Jan 16, 2014 at 06:05:05PM +, Stephen Boyd wrote: On 01/16, Lorenzo Pieralisi wrote: Do we really want to do that ? I am not sure. A cpus node is supposed to be a container node, we should not define this binding just because we know the kernel creates a platform device for it then. This is just copying more of the ePAPR spec into this document. It just so happens that having a compatible field here allows a platform device to be created. I don't see why that's a problem. I do not see why you cannot define a node like pmu or arch-timer and stick a compatible property in there. cpus node does not represent a device, and must not be created as a platform device, that's my opinion. I had what you're suggesting before in the original revision of this patch. Please take a look at the original patch series[1]. I suppose it could be tweaked slightly to still have a cache node for the L2 interrupt and the next-level-cache pointer from the CPUs. Ok, sorry, we are running around in circles here, basically you moved the node to cpus according to reviews. I still think that treating cpus as a device is not a great idea, even though I am in the same position with C-states and probably will add C-state tables in the cpus node. http://comments.gmane.org/gmane.linux.power-management.general/41012 I just would like to see under cpus nodes and properties that apply to all ARM systems, and avoid defining properties (eg interrupts) that have different meanings for different ARM cores. The question related to why the kernel should create a platform device out of cpus is still open. I really do not want to block your series for these simple issues but we have to make a decision and stick to that, I am fine either way if we have a plan. Do you just want a backup plan in case we don't make a platform device out of the cpus node? I believe we can always add code somewhere to create a platform device at runtime if we detect the cpus node has a compatible string equal to qcom,krait. We could probably change this driver's module_init() to scan the DT for such a compatible string and create the platform device right there. If we get more than one interrupt in the cpus node we can add interrupt-names and then have software look for interrupts by name instead of number. As I mentioned, I do not like the idea of adding compatible properties just to force the kernel to create platform devices out of device tree nodes. On top of that I would avoid adding a compatible property to the cpus node (after all properties like enable-method are common for all cpus but still duplicated), my only concern being backward compatibility here (ie if we do that for interrupts, we should do that also for other common cpu nodes properties, otherwise we have different rules for different properties). I think you can then add interrupts to cpu nodes (qcom,krait specific), and as you mentioned create a platform device for that. Thanks, Lorenzo So I agree with the statement about adding compatibles just to create platform devices is wrong. However its seems perfectly reasonable for a cpu node to have a compatible property. I don’t see why a CPU is any different from any other device described in a DT. - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v3 2/2] i2c: New bus driver for the Qualcomm QUP I2C controller
On Feb 20, 2014, at 6:38 PM, Bjorn Andersson wrote: > This bus driver supports the QUP i2c hardware controller in the Qualcomm SOCs. > The Qualcomm Universal Peripheral Engine (QUP) is a general purpose data path > engine with input/output FIFOs and an embedded i2c mini-core. The driver > supports FIFO mode (for low bandwidth applications) and block mode (interrupt > generated for each block-size data transfer). > > Cc: Andy Gross > Cc: Stephen Boyd > Signed-off-by: Ivan T. Ivanov > Signed-off-by: Bjorn Andersson > --- > drivers/i2c/busses/Kconfig | 10 + > drivers/i2c/busses/Makefile |1 + > drivers/i2c/busses/i2c-qup.c | 772 ++ > 3 files changed, 783 insertions(+) > create mode 100644 drivers/i2c/busses/i2c-qup.c > > diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig > index f5ed031..403e196 100644 > --- a/drivers/i2c/busses/Kconfig > +++ b/drivers/i2c/busses/Kconfig > @@ -648,6 +648,16 @@ config I2C_PXA_SLAVE > is necessary for systems where the PXA may be a target on the > I2C bus. > > +config I2C_QUP > + tristate "Qualcomm QUP based I2C controller" > + depends on ARCH_MSM ARCH_QCOM > + help > + If you say yes to this option, support will be included for the > + built-in I2C interface on the Qualcomm SoCs. > + > + This driver can also be built as a module. If so, the module > + will be called i2c-qup. > + > config I2C_RIIC > tristate "Renesas RIIC adapter" > depends on ARCH_SHMOBILE || COMPILE_TEST - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] gpio: msm: switch Kconfig to ARCH_QCOM depends
On Feb 11, 2014, at 2:22 PM, Kumar Gala wrote: > We've split Qualcomm MSM support into legacy and multiplatform. The gpio > msm-v2 driver is only relevant on the multiplatform supported SoCs so > switch the Kconfig depends to ARCH_QCOM. > > CC: Linus Walleij > Signed-off-by: Kumar Gala > --- > Linus, > > If you can ack this I'll send it via linux-qcom/arm-soc tree's > > thanks > > - k ping. - k > > drivers/gpio/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig > index 6973387..aa74949 100644 > --- a/drivers/gpio/Kconfig > +++ b/drivers/gpio/Kconfig > @@ -192,7 +192,7 @@ config GPIO_MSM_V1 > > config GPIO_MSM_V2 > tristate "Qualcomm MSM GPIO v2" > - depends on GPIOLIB && OF && ARCH_MSM > + depends on GPIOLIB && OF && ARCH_QCOM > help > Say yes here to support the GPIO interface on ARM v7 based > Qualcomm MSM chips. Most of the pins on the MSM can be > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > hosted by The Linux Foundation > -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] gpio: msm: switch Kconfig to ARCH_QCOM depends
On Feb 11, 2014, at 2:22 PM, Kumar Gala ga...@codeaurora.org wrote: We've split Qualcomm MSM support into legacy and multiplatform. The gpio msm-v2 driver is only relevant on the multiplatform supported SoCs so switch the Kconfig depends to ARCH_QCOM. CC: Linus Walleij linus.wall...@linaro.org Signed-off-by: Kumar Gala ga...@codeaurora.org --- Linus, If you can ack this I'll send it via linux-qcom/arm-soc tree's thanks - k ping. - k drivers/gpio/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 6973387..aa74949 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -192,7 +192,7 @@ config GPIO_MSM_V1 config GPIO_MSM_V2 tristate Qualcomm MSM GPIO v2 - depends on GPIOLIB OF ARCH_MSM + depends on GPIOLIB OF ARCH_QCOM help Say yes here to support the GPIO interface on ARM v7 based Qualcomm MSM chips. Most of the pins on the MSM can be -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v3 2/2] i2c: New bus driver for the Qualcomm QUP I2C controller
On Feb 20, 2014, at 6:38 PM, Bjorn Andersson bjorn.anders...@sonymobile.com wrote: This bus driver supports the QUP i2c hardware controller in the Qualcomm SOCs. The Qualcomm Universal Peripheral Engine (QUP) is a general purpose data path engine with input/output FIFOs and an embedded i2c mini-core. The driver supports FIFO mode (for low bandwidth applications) and block mode (interrupt generated for each block-size data transfer). Cc: Andy Gross agr...@codeaurora.org Cc: Stephen Boyd sb...@codeaurora.org Signed-off-by: Ivan T. Ivanov iiva...@mm-sol.com Signed-off-by: Bjorn Andersson bjorn.anders...@sonymobile.com --- drivers/i2c/busses/Kconfig | 10 + drivers/i2c/busses/Makefile |1 + drivers/i2c/busses/i2c-qup.c | 772 ++ 3 files changed, 783 insertions(+) create mode 100644 drivers/i2c/busses/i2c-qup.c diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index f5ed031..403e196 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -648,6 +648,16 @@ config I2C_PXA_SLAVE is necessary for systems where the PXA may be a target on the I2C bus. +config I2C_QUP + tristate Qualcomm QUP based I2C controller + depends on ARCH_MSM ARCH_QCOM + help + If you say yes to this option, support will be included for the + built-in I2C interface on the Qualcomm SoCs. + + This driver can also be built as a module. If so, the module + will be called i2c-qup. + config I2C_RIIC tristate Renesas RIIC adapter depends on ARCH_SHMOBILE || COMPILE_TEST - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v3] hwrng: msm: switch Kconfig to ARCH_QCOM depends
We've split Qualcomm MSM support into legacy and multiplatform. The RNG driver is only relevant on the multiplatform supported SoCs so switch the Kconfig depends to ARCH_QCOM. CC: Herbert Xu CC: Stanimir Varbanov Signed-off-by: Kumar Gala --- Herbert, If you can ack this I'll send it via linux-qcom/arm-soc tree's thanks v3: * drop ARM references as the driver could be used on hexagon v2: * Updated help text to remove MSM references, made more generic drivers/char/hw_random/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig index 2f2b084..244759b 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -342,11 +342,11 @@ config HW_RANDOM_TPM If unsure, say Y. config HW_RANDOM_MSM - tristate "Qualcomm MSM Random Number Generator support" - depends on HW_RANDOM && ARCH_MSM + tristate "Qualcomm SoCs Random Number Generator support" + depends on HW_RANDOM && ARCH_QCOM ---help--- This driver provides kernel-side support for the Random Number - Generator hardware found on Qualcomm MSM SoCs. + Generator hardware found on Qualcomm SoCs. To compile this driver as a module, choose M here. the module will be called msm-rng. -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2] hwrng: msm: switch Kconfig to ARCH_QCOM depends
On Feb 20, 2014, at 12:42 PM, Christopher Covington wrote: > On 02/20/2014 11:09 AM, Kumar Gala wrote: >> We've split Qualcomm MSM support into legacy and multiplatform. The RNG >> driver is only relevant on the multiplatform supported SoCs so switch the >> Kconfig depends to ARCH_QCOM. >> >> CC: Herbert Xu >> CC: Stanimir Varbanov >> Signed-off-by: Kumar Gala >> --- >> >> Herbert, >> >> If you can ack this I'll send it via linux-qcom/arm-soc tree's >> >> thanks >> >> v2: >> * Updated help text to remove MSM references, made more generic >> >> drivers/char/hw_random/Kconfig | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig >> index 2f2b084..f2b9f8c 100644 >> --- a/drivers/char/hw_random/Kconfig >> +++ b/drivers/char/hw_random/Kconfig >> @@ -342,11 +342,11 @@ config HW_RANDOM_TPM >>If unsure, say Y. >> >> config HW_RANDOM_MSM >> -tristate "Qualcomm MSM Random Number Generator support" > >> +tristate "Qualcomm ARM SoCs Random Number Generator support" > > Can the Hexagon use the PRNG, at least theoretically? If so maybe it'd be > clearest to leave ARM off. > > Christopher Fair point. - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] qcom DT changes for v3.15
The following changes since commit cf1e8f0cd665e2a9966d2bee4e11ecc0938ff166: ARM: qcom: Rename various msm prefixed functions to qcom (2014-02-06 16:20:41 -0600) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git tags/qcom-dt-for-3.15 for you to fetch changes up to 5a229c2a59e5d42a7d670f4639aaedb272146ef1: ARM: dts: qcom-msm8960-cdp: Add RNG device tree node (2014-02-20 10:02:22 -0600) Qualcomm ARM Based Device Tree Updates for v3.15 * Added device tree nodes to enable SMP on msm8660, msm8960, and msm8974 * Added Random Number Generator DT nodes for msm8974 and msm8960 SoCs Rohit Vaswani (1): ARM: dts: qcom: Add nodes necessary for SMP boot Stanimir Varbanov (2): ARM: dts: qcom: Add RNG device tree node ARM: dts: qcom-msm8960-cdp: Add RNG device tree node arch/arm/boot/dts/qcom-msm8660.dtsi | 24 arch/arm/boot/dts/qcom-msm8960.dtsi | 59 arch/arm/boot/dts/qcom-msm8974.dtsi | 76 + 3 files changed, 159 insertions(+) -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2] hwrng: msm: switch Kconfig to ARCH_QCOM depends
We've split Qualcomm MSM support into legacy and multiplatform. The RNG driver is only relevant on the multiplatform supported SoCs so switch the Kconfig depends to ARCH_QCOM. CC: Herbert Xu CC: Stanimir Varbanov Signed-off-by: Kumar Gala --- Herbert, If you can ack this I'll send it via linux-qcom/arm-soc tree's thanks v2: * Updated help text to remove MSM references, made more generic drivers/char/hw_random/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig index 2f2b084..f2b9f8c 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -342,11 +342,11 @@ config HW_RANDOM_TPM If unsure, say Y. config HW_RANDOM_MSM - tristate "Qualcomm MSM Random Number Generator support" - depends on HW_RANDOM && ARCH_MSM + tristate "Qualcomm ARM SoCs Random Number Generator support" + depends on HW_RANDOM && ARCH_QCOM ---help--- This driver provides kernel-side support for the Random Number - Generator hardware found on Qualcomm MSM SoCs. + Generator hardware found on Qualcomm ARM SoCs. To compile this driver as a module, choose M here. the module will be called msm-rng. -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2] hwrng: msm: switch Kconfig to ARCH_QCOM depends
We've split Qualcomm MSM support into legacy and multiplatform. The RNG driver is only relevant on the multiplatform supported SoCs so switch the Kconfig depends to ARCH_QCOM. CC: Herbert Xu herb...@gondor.apana.org.au CC: Stanimir Varbanov svarba...@mm-sol.com Signed-off-by: Kumar Gala ga...@codeaurora.org --- Herbert, If you can ack this I'll send it via linux-qcom/arm-soc tree's thanks v2: * Updated help text to remove MSM references, made more generic drivers/char/hw_random/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig index 2f2b084..f2b9f8c 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -342,11 +342,11 @@ config HW_RANDOM_TPM If unsure, say Y. config HW_RANDOM_MSM - tristate Qualcomm MSM Random Number Generator support - depends on HW_RANDOM ARCH_MSM + tristate Qualcomm ARM SoCs Random Number Generator support + depends on HW_RANDOM ARCH_QCOM ---help--- This driver provides kernel-side support for the Random Number - Generator hardware found on Qualcomm MSM SoCs. + Generator hardware found on Qualcomm ARM SoCs. To compile this driver as a module, choose M here. the module will be called msm-rng. -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] qcom DT changes for v3.15
The following changes since commit cf1e8f0cd665e2a9966d2bee4e11ecc0938ff166: ARM: qcom: Rename various msm prefixed functions to qcom (2014-02-06 16:20:41 -0600) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git tags/qcom-dt-for-3.15 for you to fetch changes up to 5a229c2a59e5d42a7d670f4639aaedb272146ef1: ARM: dts: qcom-msm8960-cdp: Add RNG device tree node (2014-02-20 10:02:22 -0600) Qualcomm ARM Based Device Tree Updates for v3.15 * Added device tree nodes to enable SMP on msm8660, msm8960, and msm8974 * Added Random Number Generator DT nodes for msm8974 and msm8960 SoCs Rohit Vaswani (1): ARM: dts: qcom: Add nodes necessary for SMP boot Stanimir Varbanov (2): ARM: dts: qcom: Add RNG device tree node ARM: dts: qcom-msm8960-cdp: Add RNG device tree node arch/arm/boot/dts/qcom-msm8660.dtsi | 24 arch/arm/boot/dts/qcom-msm8960.dtsi | 59 arch/arm/boot/dts/qcom-msm8974.dtsi | 76 + 3 files changed, 159 insertions(+) -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2] hwrng: msm: switch Kconfig to ARCH_QCOM depends
On Feb 20, 2014, at 12:42 PM, Christopher Covington c...@codeaurora.org wrote: On 02/20/2014 11:09 AM, Kumar Gala wrote: We've split Qualcomm MSM support into legacy and multiplatform. The RNG driver is only relevant on the multiplatform supported SoCs so switch the Kconfig depends to ARCH_QCOM. CC: Herbert Xu herb...@gondor.apana.org.au CC: Stanimir Varbanov svarba...@mm-sol.com Signed-off-by: Kumar Gala ga...@codeaurora.org --- Herbert, If you can ack this I'll send it via linux-qcom/arm-soc tree's thanks v2: * Updated help text to remove MSM references, made more generic drivers/char/hw_random/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig index 2f2b084..f2b9f8c 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -342,11 +342,11 @@ config HW_RANDOM_TPM If unsure, say Y. config HW_RANDOM_MSM -tristate Qualcomm MSM Random Number Generator support +tristate Qualcomm ARM SoCs Random Number Generator support Can the Hexagon use the PRNG, at least theoretically? If so maybe it'd be clearest to leave ARM off. Christopher Fair point. - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v3] hwrng: msm: switch Kconfig to ARCH_QCOM depends
We've split Qualcomm MSM support into legacy and multiplatform. The RNG driver is only relevant on the multiplatform supported SoCs so switch the Kconfig depends to ARCH_QCOM. CC: Herbert Xu herb...@gondor.apana.org.au CC: Stanimir Varbanov svarba...@mm-sol.com Signed-off-by: Kumar Gala ga...@codeaurora.org --- Herbert, If you can ack this I'll send it via linux-qcom/arm-soc tree's thanks v3: * drop ARM references as the driver could be used on hexagon v2: * Updated help text to remove MSM references, made more generic drivers/char/hw_random/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig index 2f2b084..244759b 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -342,11 +342,11 @@ config HW_RANDOM_TPM If unsure, say Y. config HW_RANDOM_MSM - tristate Qualcomm MSM Random Number Generator support - depends on HW_RANDOM ARCH_MSM + tristate Qualcomm SoCs Random Number Generator support + depends on HW_RANDOM ARCH_QCOM ---help--- This driver provides kernel-side support for the Random Number - Generator hardware found on Qualcomm MSM SoCs. + Generator hardware found on Qualcomm SoCs. To compile this driver as a module, choose M here. the module will be called msm-rng. -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] ARM: qcom: Copyright marking changes
Code Aurora Forum (CAF) is part of Linux Foundation Labs. Signed-off-by: Kumar Gala --- arch/arm/mach-qcom/platsmp.c | 3 +-- arch/arm/mach-qcom/scm-boot.c | 2 +- arch/arm/mach-qcom/scm-boot.h | 2 +- arch/arm/mach-qcom/scm.c | 2 +- arch/arm/mach-qcom/scm.h | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c index 9c53ea7..ede7f53 100644 --- a/arch/arm/mach-qcom/platsmp.c +++ b/arch/arm/mach-qcom/platsmp.c @@ -1,8 +1,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. + * 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 as diff --git a/arch/arm/mach-qcom/scm-boot.c b/arch/arm/mach-qcom/scm-boot.c index 45cee3e..4f0e1fa 100644 --- a/arch/arm/mach-qcom/scm-boot.c +++ b/arch/arm/mach-qcom/scm-boot.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2010, 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 diff --git a/arch/arm/mach-qcom/scm-boot.h b/arch/arm/mach-qcom/scm-boot.h index 7be32ff..b8a1aba 100644 --- a/arch/arm/mach-qcom/scm-boot.h +++ b/arch/arm/mach-qcom/scm-boot.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2010, 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 diff --git a/arch/arm/mach-qcom/scm.c b/arch/arm/mach-qcom/scm.c index c536fd6..21d69c1 100644 --- a/arch/arm/mach-qcom/scm.c +++ b/arch/arm/mach-qcom/scm.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2010, 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 diff --git a/arch/arm/mach-qcom/scm.h b/arch/arm/mach-qcom/scm.h index 00b31ea..979f549 100644 --- a/arch/arm/mach-qcom/scm.h +++ b/arch/arm/mach-qcom/scm.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2010, 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 -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL] qcom cleanups for v3.15
On Feb 19, 2014, at 12:56 PM, Stephen Boyd wrote: > On 02/19/14 07:20, Kumar Gala wrote: >> On Feb 18, 2014, at 6:06 PM, Stephen Boyd wrote: >> >>> On 02/10/14 15:23, Kumar Gala wrote: >>>> Kumar Gala (6): >>>> ARM: dts: msm: split out msm8660 and msm8960 soc into dts include >>>> ARM: msm: kill off hotplug.c >>>> clocksource: qcom: Move clocksource code out of mach-msm >>>> ARM: qcom: Split Qualcomm support into legacy and multiplatform >>> Sorry to nag, but can you please address my comment on this patch? >> Which comment? The copyright one or something else? >> > > Yes the copyright one. Was going to send that as a separate patch. So no reason to hold up this pull request on it. - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL] qcom cleanups for v3.15
On Feb 18, 2014, at 6:06 PM, Stephen Boyd wrote: > On 02/10/14 15:23, Kumar Gala wrote: >> >> Kumar Gala (6): >> ARM: dts: msm: split out msm8660 and msm8960 soc into dts include >> ARM: msm: kill off hotplug.c >> clocksource: qcom: Move clocksource code out of mach-msm >> ARM: qcom: Split Qualcomm support into legacy and multiplatform > > Sorry to nag, but can you please address my comment on this patch? Which comment? The copyright one or something else? - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL] qcom cleanups for v3.15
On Feb 18, 2014, at 6:06 PM, Stephen Boyd sb...@codeaurora.org wrote: On 02/10/14 15:23, Kumar Gala wrote: Kumar Gala (6): ARM: dts: msm: split out msm8660 and msm8960 soc into dts include ARM: msm: kill off hotplug.c clocksource: qcom: Move clocksource code out of mach-msm ARM: qcom: Split Qualcomm support into legacy and multiplatform Sorry to nag, but can you please address my comment on this patch? Which comment? The copyright one or something else? - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL] qcom cleanups for v3.15
On Feb 19, 2014, at 12:56 PM, Stephen Boyd sb...@codeaurora.org wrote: On 02/19/14 07:20, Kumar Gala wrote: On Feb 18, 2014, at 6:06 PM, Stephen Boyd sb...@codeaurora.org wrote: On 02/10/14 15:23, Kumar Gala wrote: Kumar Gala (6): ARM: dts: msm: split out msm8660 and msm8960 soc into dts include ARM: msm: kill off hotplug.c clocksource: qcom: Move clocksource code out of mach-msm ARM: qcom: Split Qualcomm support into legacy and multiplatform Sorry to nag, but can you please address my comment on this patch? Which comment? The copyright one or something else? Yes the copyright one. Was going to send that as a separate patch. So no reason to hold up this pull request on it. - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] ARM: qcom: Copyright marking changes
Code Aurora Forum (CAF) is part of Linux Foundation Labs. Signed-off-by: Kumar Gala ga...@codeaurora.org --- arch/arm/mach-qcom/platsmp.c | 3 +-- arch/arm/mach-qcom/scm-boot.c | 2 +- arch/arm/mach-qcom/scm-boot.h | 2 +- arch/arm/mach-qcom/scm.c | 2 +- arch/arm/mach-qcom/scm.h | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c index 9c53ea7..ede7f53 100644 --- a/arch/arm/mach-qcom/platsmp.c +++ b/arch/arm/mach-qcom/platsmp.c @@ -1,8 +1,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. + * 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 as diff --git a/arch/arm/mach-qcom/scm-boot.c b/arch/arm/mach-qcom/scm-boot.c index 45cee3e..4f0e1fa 100644 --- a/arch/arm/mach-qcom/scm-boot.c +++ b/arch/arm/mach-qcom/scm-boot.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2010, 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 diff --git a/arch/arm/mach-qcom/scm-boot.h b/arch/arm/mach-qcom/scm-boot.h index 7be32ff..b8a1aba 100644 --- a/arch/arm/mach-qcom/scm-boot.h +++ b/arch/arm/mach-qcom/scm-boot.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2010, 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 diff --git a/arch/arm/mach-qcom/scm.c b/arch/arm/mach-qcom/scm.c index c536fd6..21d69c1 100644 --- a/arch/arm/mach-qcom/scm.c +++ b/arch/arm/mach-qcom/scm.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2010, 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 diff --git a/arch/arm/mach-qcom/scm.h b/arch/arm/mach-qcom/scm.h index 00b31ea..979f549 100644 --- a/arch/arm/mach-qcom/scm.h +++ b/arch/arm/mach-qcom/scm.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2010, 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 -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCHv3 2/6] mailbox: Introduce a new common API
On Feb 15, 2014, at 12:25 PM, Jassi Brar wrote: > Introduce common framework for client/protocol drivers and > controller drivers of Inter-Processor-Communication (IPC). > > Client driver developers should have a look at > include/linux/mailbox_client.h to understand the part of > the API exposed to client drivers. > Similarly controller driver developers should have a look > at include/linux/mailbox_controller.h > > Signed-off-by: Jassi Brar > --- > drivers/mailbox/Makefile | 4 + > drivers/mailbox/mailbox.c | 534 + > include/linux/mailbox.h| 17 ++ > include/linux/mailbox_client.h | 87 ++ > include/linux/mailbox_controller.h | 102 +++ > 5 files changed, 744 insertions(+) > create mode 100644 drivers/mailbox/mailbox.c > create mode 100644 include/linux/mailbox.h > create mode 100644 include/linux/mailbox_client.h > create mode 100644 include/linux/mailbox_controller.h What’s the intent of trying to provide a unified interface here? I’m trying to understand what benefit we are going for, I get possibly wanting something to reduce duplication in drivers (help functions, library, etc). But do we really see benefit in a common interface for clients? Are we really going to mix a OMAP mailbox controller with a client developed for some other SoC vendor? - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL] qcom cleanups for v3.15
On Feb 10, 2014, at 5:23 PM, Kumar Gala wrote:
> The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:
>
> Linus 3.14-rc1 (2014-02-02 16:42:13 -0800)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git
> tags/qcom-cleanup-for-3.15
>
> for you to fetch changes up to cf1e8f0cd665e2a9966d2bee4e11ecc0938ff166:
>
> ARM: qcom: Rename various msm prefixed functions to qcom (2014-02-06
> 16:20:41 -0600)
>
>
> General cleanups for MSM/QCOM for 3.15
>
> 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.
>
> ----
> Kumar Gala (6):
> ARM: dts: msm: split out msm8660 and msm8960 soc into dts include
> 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
>
> Rohit Vaswani (1):
> ARM: msm: Remove pen_release usage
>
> MAINTAINERS| 8 +++
> arch/arm/Kconfig | 7 +-
> arch/arm/Kconfig.debug | 2 +-
> arch/arm/Makefile | 1 +
> arch/arm/boot/dts/Makefile | 6 +-
> arch/arm/boot/dts/qcom-msm8660-surf.dts| 59 +
> arch/arm/boot/dts/qcom-msm8660.dtsi| 63 ++
> arch/arm/boot/dts/qcom-msm8960-cdp.dts | 66 +--
> arch/arm/boot/dts/qcom-msm8960.dtsi| 70
> arch/arm/mach-msm/Kconfig | 54 ++--
> arch/arm/mach-msm/Makefile | 8 ---
> arch/arm/mach-msm/common.h | 1 -
> arch/arm/mach-msm/headsmp.S| 39
> arch/arm/mach-msm/hotplug.c| 74 --
> arch/arm/mach-qcom/Kconfig | 33 ++
> arch/arm/mach-qcom/Makefile| 5 ++
> .../arm/{mach-msm/board-dt.c => mach-qcom/board.c} | 15 ++---
> arch/arm/{mach-msm => mach-qcom}/platsmp.c | 66 ++-
> 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
> drivers/clocksource/Kconfig| 3 +
> drivers/clocksource/Makefile | 1 +
> .../timer.c => drivers/clocksource/qcom-timer.c| 29 -
> 25 files changed, 240 insertions(+), 370 deletions(-)
> create mode 100644 arch/arm/boot/dts/qcom-msm8660.dtsi
> create mode 100644 arch/arm/boot/dts/qcom-msm8960.dtsi
> delete mode 100644 arch/arm/mach-msm/headsmp.S
> 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} (68%)
> rename arch/arm/{mach-msm => mach-qcom}/platsmp.c (65%)
> 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/timer.c => drivers/clocksource/qcom-timer.c (98%)
ping
- k
--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by
The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] gpio: msm: switch Kconfig to ARCH_QCOM depends
On Feb 11, 2014, at 2:22 PM, Kumar Gala wrote: > We've split Qualcomm MSM support into legacy and multiplatform. The gpio > msm-v2 driver is only relevant on the multiplatform supported SoCs so > switch the Kconfig depends to ARCH_QCOM. > > CC: Linus Walleij > Signed-off-by: Kumar Gala > --- > Linus, > > If you can ack this I'll send it via linux-qcom/arm-soc tree's > > thanks > > - k ping - k > > drivers/gpio/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig > index 6973387..aa74949 100644 > --- a/drivers/gpio/Kconfig > +++ b/drivers/gpio/Kconfig > @@ -192,7 +192,7 @@ config GPIO_MSM_V1 > > config GPIO_MSM_V2 > tristate "Qualcomm MSM GPIO v2" > - depends on GPIOLIB && OF && ARCH_MSM > + depends on GPIOLIB && OF && ARCH_QCOM > help > Say yes here to support the GPIO interface on ARM v7 based > Qualcomm MSM chips. Most of the pins on the MSM can be > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > hosted by The Linux Foundation > > -- > To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL] qcom SoC changes for v3.15
On Feb 11, 2014, at 3:19 PM, Kumar Gala wrote: > The following changes since commit cf1e8f0cd665e2a9966d2bee4e11ecc0938ff166: > > ARM: qcom: Rename various msm prefixed functions to qcom (2014-02-06 > 16:20:41 -0600) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git > tags/qcom-soc-for-3.15 > > for you to fetch changes up to 6990c132abc984bd6e75ac2be1f1d657cd600f63: > > ARM: qcom: Add SMP support for KPSSv2 (2014-02-11 15:00:40 -0600) > > > Qualcomm ARM Based SoC Updates for v3.15 > > * Add support for determining smp ops based on device tree. > * Add DT binding specs for Krait/Scorpion enable method > * Add DT binding specs for various Krait Processor controller complexes > * Add SoC SMP support for Krait Processor Subsystem v1 & v2 > > > Rohit Vaswani (4): > ARM: qcom: Re-organize platsmp to make it extensible > devicetree: bindings: Document Krait/Scorpion cpus and enable-method > ARM: qcom: Add SMP support for KPSSv1 > ARM: qcom: Add SMP support for KPSSv2 > > Stephen Boyd (3): > ARM: Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp > devicetree: bindings: Document qcom,kpss-acc > devicetree: bindings: Document qcom,saw2 node > > Documentation/devicetree/bindings/arm/cpus.txt | 25 +- > .../devicetree/bindings/arm/msm/qcom,kpss-acc.txt | 30 ++ > .../devicetree/bindings/arm/msm/qcom,saw2.txt | 35 +++ > arch/arm/include/asm/smp.h | 9 + > arch/arm/kernel/devtree.c | 40 +++ > arch/arm/mach-msm/common.h | 2 - > arch/arm/mach-qcom/board.c | 14 - > arch/arm/mach-qcom/platsmp.c | 341 ++--- > arch/arm/mach-qcom/scm-boot.h | 8 +- > include/asm-generic/vmlinux.lds.h | 10 + > 10 files changed, 444 insertions(+), 70 deletions(-) > create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt > create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt > > — ping - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL] qcom SoC changes for v3.15
On Feb 11, 2014, at 3:19 PM, Kumar Gala ga...@codeaurora.org wrote: The following changes since commit cf1e8f0cd665e2a9966d2bee4e11ecc0938ff166: ARM: qcom: Rename various msm prefixed functions to qcom (2014-02-06 16:20:41 -0600) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git tags/qcom-soc-for-3.15 for you to fetch changes up to 6990c132abc984bd6e75ac2be1f1d657cd600f63: ARM: qcom: Add SMP support for KPSSv2 (2014-02-11 15:00:40 -0600) Qualcomm ARM Based SoC Updates for v3.15 * Add support for determining smp ops based on device tree. * Add DT binding specs for Krait/Scorpion enable method * Add DT binding specs for various Krait Processor controller complexes * Add SoC SMP support for Krait Processor Subsystem v1 v2 Rohit Vaswani (4): ARM: qcom: Re-organize platsmp to make it extensible devicetree: bindings: Document Krait/Scorpion cpus and enable-method ARM: qcom: Add SMP support for KPSSv1 ARM: qcom: Add SMP support for KPSSv2 Stephen Boyd (3): ARM: Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp devicetree: bindings: Document qcom,kpss-acc devicetree: bindings: Document qcom,saw2 node Documentation/devicetree/bindings/arm/cpus.txt | 25 +- .../devicetree/bindings/arm/msm/qcom,kpss-acc.txt | 30 ++ .../devicetree/bindings/arm/msm/qcom,saw2.txt | 35 +++ arch/arm/include/asm/smp.h | 9 + arch/arm/kernel/devtree.c | 40 +++ arch/arm/mach-msm/common.h | 2 - arch/arm/mach-qcom/board.c | 14 - arch/arm/mach-qcom/platsmp.c | 341 ++--- arch/arm/mach-qcom/scm-boot.h | 8 +- include/asm-generic/vmlinux.lds.h | 10 + 10 files changed, 444 insertions(+), 70 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt — ping - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] gpio: msm: switch Kconfig to ARCH_QCOM depends
On Feb 11, 2014, at 2:22 PM, Kumar Gala ga...@codeaurora.org wrote: We've split Qualcomm MSM support into legacy and multiplatform. The gpio msm-v2 driver is only relevant on the multiplatform supported SoCs so switch the Kconfig depends to ARCH_QCOM. CC: Linus Walleij linus.wall...@linaro.org Signed-off-by: Kumar Gala ga...@codeaurora.org --- Linus, If you can ack this I'll send it via linux-qcom/arm-soc tree's thanks - k ping - k drivers/gpio/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 6973387..aa74949 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -192,7 +192,7 @@ config GPIO_MSM_V1 config GPIO_MSM_V2 tristate Qualcomm MSM GPIO v2 - depends on GPIOLIB OF ARCH_MSM + depends on GPIOLIB OF ARCH_QCOM help Say yes here to support the GPIO interface on ARM v7 based Qualcomm MSM chips. Most of the pins on the MSM can be -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL] qcom cleanups for v3.15
On Feb 10, 2014, at 5:23 PM, Kumar Gala ga...@codeaurora.org wrote:
The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:
Linus 3.14-rc1 (2014-02-02 16:42:13 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git
tags/qcom-cleanup-for-3.15
for you to fetch changes up to cf1e8f0cd665e2a9966d2bee4e11ecc0938ff166:
ARM: qcom: Rename various msm prefixed functions to qcom (2014-02-06
16:20:41 -0600)
General cleanups for MSM/QCOM for 3.15
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.
Kumar Gala (6):
ARM: dts: msm: split out msm8660 and msm8960 soc into dts include
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
Rohit Vaswani (1):
ARM: msm: Remove pen_release usage
MAINTAINERS| 8 +++
arch/arm/Kconfig | 7 +-
arch/arm/Kconfig.debug | 2 +-
arch/arm/Makefile | 1 +
arch/arm/boot/dts/Makefile | 6 +-
arch/arm/boot/dts/qcom-msm8660-surf.dts| 59 +
arch/arm/boot/dts/qcom-msm8660.dtsi| 63 ++
arch/arm/boot/dts/qcom-msm8960-cdp.dts | 66 +--
arch/arm/boot/dts/qcom-msm8960.dtsi| 70
arch/arm/mach-msm/Kconfig | 54 ++--
arch/arm/mach-msm/Makefile | 8 ---
arch/arm/mach-msm/common.h | 1 -
arch/arm/mach-msm/headsmp.S| 39
arch/arm/mach-msm/hotplug.c| 74 --
arch/arm/mach-qcom/Kconfig | 33 ++
arch/arm/mach-qcom/Makefile| 5 ++
.../arm/{mach-msm/board-dt.c = mach-qcom/board.c} | 15 ++---
arch/arm/{mach-msm = mach-qcom}/platsmp.c | 66 ++-
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
drivers/clocksource/Kconfig| 3 +
drivers/clocksource/Makefile | 1 +
.../timer.c = drivers/clocksource/qcom-timer.c| 29 -
25 files changed, 240 insertions(+), 370 deletions(-)
create mode 100644 arch/arm/boot/dts/qcom-msm8660.dtsi
create mode 100644 arch/arm/boot/dts/qcom-msm8960.dtsi
delete mode 100644 arch/arm/mach-msm/headsmp.S
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} (68%)
rename arch/arm/{mach-msm = mach-qcom}/platsmp.c (65%)
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/timer.c = drivers/clocksource/qcom-timer.c (98%)
ping
- k
--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by
The Linux Foundation
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCHv3 2/6] mailbox: Introduce a new common API
On Feb 15, 2014, at 12:25 PM, Jassi Brar jassisinghb...@gmail.com wrote: Introduce common framework for client/protocol drivers and controller drivers of Inter-Processor-Communication (IPC). Client driver developers should have a look at include/linux/mailbox_client.h to understand the part of the API exposed to client drivers. Similarly controller driver developers should have a look at include/linux/mailbox_controller.h Signed-off-by: Jassi Brar jaswinder.si...@linaro.org --- drivers/mailbox/Makefile | 4 + drivers/mailbox/mailbox.c | 534 + include/linux/mailbox.h| 17 ++ include/linux/mailbox_client.h | 87 ++ include/linux/mailbox_controller.h | 102 +++ 5 files changed, 744 insertions(+) create mode 100644 drivers/mailbox/mailbox.c create mode 100644 include/linux/mailbox.h create mode 100644 include/linux/mailbox_client.h create mode 100644 include/linux/mailbox_controller.h What’s the intent of trying to provide a unified interface here? I’m trying to understand what benefit we are going for, I get possibly wanting something to reduce duplication in drivers (help functions, library, etc). But do we really see benefit in a common interface for clients? Are we really going to mix a OMAP mailbox controller with a client developed for some other SoC vendor? - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] qcom SoC changes for v3.15
The following changes since commit cf1e8f0cd665e2a9966d2bee4e11ecc0938ff166: ARM: qcom: Rename various msm prefixed functions to qcom (2014-02-06 16:20:41 -0600) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git tags/qcom-soc-for-3.15 for you to fetch changes up to 6990c132abc984bd6e75ac2be1f1d657cd600f63: ARM: qcom: Add SMP support for KPSSv2 (2014-02-11 15:00:40 -0600) Qualcomm ARM Based SoC Updates for v3.15 * Add support for determining smp ops based on device tree. * Add DT binding specs for Krait/Scorpion enable method * Add DT binding specs for various Krait Processor controller complexes * Add SoC SMP support for Krait Processor Subsystem v1 & v2 Rohit Vaswani (4): ARM: qcom: Re-organize platsmp to make it extensible devicetree: bindings: Document Krait/Scorpion cpus and enable-method ARM: qcom: Add SMP support for KPSSv1 ARM: qcom: Add SMP support for KPSSv2 Stephen Boyd (3): ARM: Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp devicetree: bindings: Document qcom,kpss-acc devicetree: bindings: Document qcom,saw2 node Documentation/devicetree/bindings/arm/cpus.txt | 25 +- .../devicetree/bindings/arm/msm/qcom,kpss-acc.txt | 30 ++ .../devicetree/bindings/arm/msm/qcom,saw2.txt | 35 +++ arch/arm/include/asm/smp.h | 9 + arch/arm/kernel/devtree.c | 40 +++ arch/arm/mach-msm/common.h | 2 - arch/arm/mach-qcom/board.c | 14 - arch/arm/mach-qcom/platsmp.c | 341 ++--- arch/arm/mach-qcom/scm-boot.h | 8 +- include/asm-generic/vmlinux.lds.h | 10 + 10 files changed, 444 insertions(+), 70 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [Patch v5 2/2] dmaengine: qcom_bam_dma: Add device tree binding
On Feb 4, 2014, at 2:42 PM, Andy Gross wrote:
> Add device tree binding support for the QCOM BAM DMA driver.
>
> Signed-off-by: Andy Gross
> ---
> .../devicetree/bindings/dma/qcom_bam_dma.txt | 48
> 1 file changed, 48 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
Acked-by: Kumar Gala
- k
>
> diff --git a/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
> b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
> new file mode 100644
> index 000..86344f1
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
> @@ -0,0 +1,48 @@
> +QCOM BAM DMA controller
> +
> +Required properties:
> +- compatible:Must be "qcom,bam-v1.4.0" for MSM8974 V1
> + Must be "qcom,bam-v1.4.1" for MSM8974 V2
> +- reg: Address range for DMA registers
> +- interrupts: single interrupt for this controller
> +- #dma-cells: must be <1>
> +- clocks: required clock
> +- clock-names: name of clock
> +- qcom,ee : indicates the active Execution Environment identifier (0-7)
> +
> +Example:
> +
> + uart-bam: dma@f9984000 = {
> + compatible = "qcom,bam-v1.4.1";
> + reg = <0xf9984000 0x15000>;
> + interrupts = <0 94 0>;
> + clocks = < GCC_BAM_DMA_AHB_CLK>;
> + clock-names = "bam_clk";
> + #dma-cells = <1>;
> + qcom,ee = <0>;
> + };
> +
> +Client:
> +Required properties:
> +- dmas: List of dma channel requests
> +- dma-names: Names of aforementioned requested channels
> +
> +Clients must use the format described in the dma.txt file, using a two cell
> +specifier for each channel.
> +
> +The three cells in order are:
> + 1. A phandle pointing to the DMA controller
> + 2. The channel number
> +
> +Example:
> + serial@f991e000 {
> + compatible = "qcom,msm-uart";
> + reg = <0xf991e000 0x1000>
> + <0xf9944000 0x19000>;
> + interrupts = <0 108 0>;
> + clocks = < GCC_BLSP1_UART2_APPS_CLK>, <
> GCC_BLSP1_AHB_CLK>;
> + clock-names = "core", "iface";
> +
> + dmas = < 0>, < 1>;
> + dma-names = "rx", "tx";
> + };
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> hosted by The Linux Foundation
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by
The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH] hwrng: msm: switch Kconfig to ARCH_QCOM depends
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): We've split Qualcomm MSM support into legacy and multiplatform. The RNG driver is only relevant on the multiplatform supported SoCs so switch the Kconfig depends to ARCH_QCOM. CC: Herbert Xu Signed-off-by: Kumar Gala --- drivers/char/hw_random/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig index 2f2b084..289bd3a 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -343,7 +343,7 @@ config HW_RANDOM_TPM config HW_RANDOM_MSM tristate "Qualcomm MSM Random Number Generator support" - depends on HW_RANDOM && ARCH_MSM + depends on HW_RANDOM && ARCH_QCOM ---help--- This driver provides kernel-side support for the Random Number Generator hardware found on Qualcomm MSM SoCs. -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/2] ARM: dts: MSM8974: Add pinctrl node
On Feb 10, 2014, at 12:55 PM, Bjorn Andersson wrote:
> On Thu, Feb 6, 2014 at 7:28 AM, Ivan T. Ivanov wrote:
>> From: "Ivan T. Ivanov"
>>
>> Add the pin control node and pin definitions of SPI8.
>>
>> Signed-off-by: Ivan T. Ivanov
>> ---
>> arch/arm/boot/dts/qcom-msm8974.dtsi | 29 +
>> 1 file changed, 29 insertions(+)
>>
>> diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi
>> b/arch/arm/boot/dts/qcom-msm8974.dtsi
>> index 9e5dadb..395603f 100644
>> --- a/arch/arm/boot/dts/qcom-msm8974.dtsi
>> +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
>> @@ -117,5 +117,34 @@
>>clocks = < GCC_BLSP1_UART2_APPS_CLK>, <
>> GCC_BLSP1_AHB_CLK>;
>>clock-names = "core", "iface";
>>};
>> +
>> + msmgpio: pinctrl@fd51 {
>> + compatible = "qcom,msm8974-pinctrl";
>> + reg = <0xfd51 0x4000>;
>> + gpio-controller;
>> + #gpio-cells = <2>;
>> + interrupt-controller;
>> + #interrupt-cells = <2>;
>> + interrupts = <0 208 0>;
>> +
>> + spi8_default: spi8_default {
>> + mosi {
>> + pins = "gpio45";
>> + function = "blsp_spi8";
>> + };
>> + miso {
>> + pins = "gpio46";
>> + function = "blsp_spi8";
>> + };
>> + cs {
>> + pins = "gpio47";
>> + function = "blsp_spi8";
>> + };
>> + clk {
>> + pins = "gpio48";
>> + function = "blsp_spi8";
>> + };
>> + };
>> + };
>>};
>> };
>
> Nice, listing it like this makes it easy to add the electrical
> properties when inheriting these nodes, closer to the product dts
> files.
>
> Reviewed-by: Bjorn Andersson
Linus,
I can take the .dts patch via the linux-qcom tree to keep it with other DT
changes if you want to provide an ack.
- k
--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by
The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH] power: reset: msm - switch Kconfig to ARCH_QCOM depends
We've split Qualcomm MSM support into legacy and multiplatform. The reset driver is only relevant on the multiplatform supported SoCs so switch the Kconfig depends to ARCH_QCOM. Signed-off-by: Kumar Gala --- Dmitry, David, If you can ack this I'll send it via linux-qcom/arm-soc tree's thanks - k drivers/power/reset/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig index 6d452a7..fa0e4e0 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -22,7 +22,7 @@ config POWER_RESET_GPIO config POWER_RESET_MSM bool "Qualcomm MSM power-off driver" - depends on POWER_RESET && ARCH_MSM + depends on POWER_RESET && ARCH_QCOM help Power off and restart support for Qualcomm boards. -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] drm/msm: drop ARCH_MSM Kconfig depend
The ARCH_MSM depend is redundant with ARCH_MSM8960, so we can remove it. Additionally, we are splitting Qualcomm MSM support into legacy (ARCH_MSM) and multiplatform (ARCH_QCOM). The MSM8960 with be ARCH_QCOM going forward so dropping ARCH_MSM will work properly for the new ARCH_QCOM multiplatform build. Signed-off-by: Kumar Gala --- David/Rob, If you can ack this I'll send it via linux-qcom/arm-soc tree's thanks - k drivers/gpu/drm/msm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index c69d1e0..b698497 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -3,7 +3,7 @@ config DRM_MSM tristate "MSM DRM" depends on DRM depends on MSM_IOMMU - depends on (ARCH_MSM && ARCH_MSM8960) || (ARM && COMPILE_TEST) + depends on ARCH_MSM8960 || (ARM && COMPILE_TEST) select DRM_KMS_HELPER select SHMEM select TMPFS -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] gpio: msm: switch Kconfig to ARCH_QCOM depends
We've split Qualcomm MSM support into legacy and multiplatform. The gpio msm-v2 driver is only relevant on the multiplatform supported SoCs so switch the Kconfig depends to ARCH_QCOM. CC: Linus Walleij Signed-off-by: Kumar Gala --- Linus, If you can ack this I'll send it via linux-qcom/arm-soc tree's thanks - k drivers/gpio/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 6973387..aa74949 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -192,7 +192,7 @@ config GPIO_MSM_V1 config GPIO_MSM_V2 tristate "Qualcomm MSM GPIO v2" - depends on GPIOLIB && OF && ARCH_MSM + depends on GPIOLIB && OF && ARCH_QCOM help Say yes here to support the GPIO interface on ARM v7 based Qualcomm MSM chips. Most of the pins on the MSM can be -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v3 3/5] ARM: qcom: Split Qualcomm support into legacy and multiplatform
On Feb 7, 2014, at 9:26 PM, Stephen Boyd wrote: > On 02/06, Kumar Gala wrote: >> diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-qcom/platsmp.c >> similarity index 98% >> rename from arch/arm/mach-msm/platsmp.c >> rename to arch/arm/mach-qcom/platsmp.c >> index 251a91e..67823a7 100644 >> --- a/arch/arm/mach-msm/platsmp.c >> +++ b/arch/arm/mach-qcom/platsmp.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. > > 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 -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/5] clocksource: qcom: Move clocksource code out of mach-msm
On Feb 11, 2014, at 3:26 AM, Daniel Lezcano wrote: > On 02/04/2014 11:36 PM, Kumar Gala wrote: >> We intent to share the clocksource code for MSM platforms between legacy >> and multiplatform supported qcom SoCs. >> >> Acked-by: Olof Johansson >> Signed-off-by: Kumar Gala > > Hi Kumar, > > through which tree do you expect this patch to be upstream ? The linux-qcom to keep things sane there. So an ack would be great. - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/5] clocksource: qcom: Move clocksource code out of mach-msm
On Feb 11, 2014, at 3:26 AM, Daniel Lezcano daniel.lezc...@linaro.org wrote: On 02/04/2014 11:36 PM, Kumar Gala wrote: We intent to share the clocksource code for MSM platforms between legacy and multiplatform supported qcom SoCs. Acked-by: Olof Johansson o...@lixom.net Signed-off-by: Kumar Gala ga...@codeaurora.org Hi Kumar, through which tree do you expect this patch to be upstream ? The linux-qcom to keep things sane there. So an ack would be great. - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v3 3/5] ARM: qcom: Split Qualcomm support into legacy and multiplatform
On Feb 7, 2014, at 9:26 PM, Stephen Boyd sb...@codeaurora.org wrote: On 02/06, Kumar Gala wrote: diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-qcom/platsmp.c similarity index 98% rename from arch/arm/mach-msm/platsmp.c rename to arch/arm/mach-qcom/platsmp.c index 251a91e..67823a7 100644 --- a/arch/arm/mach-msm/platsmp.c +++ b/arch/arm/mach-qcom/platsmp.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. 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 -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] gpio: msm: switch Kconfig to ARCH_QCOM depends
We've split Qualcomm MSM support into legacy and multiplatform. The gpio msm-v2 driver is only relevant on the multiplatform supported SoCs so switch the Kconfig depends to ARCH_QCOM. CC: Linus Walleij linus.wall...@linaro.org Signed-off-by: Kumar Gala ga...@codeaurora.org --- Linus, If you can ack this I'll send it via linux-qcom/arm-soc tree's thanks - k drivers/gpio/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 6973387..aa74949 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -192,7 +192,7 @@ config GPIO_MSM_V1 config GPIO_MSM_V2 tristate Qualcomm MSM GPIO v2 - depends on GPIOLIB OF ARCH_MSM + depends on GPIOLIB OF ARCH_QCOM help Say yes here to support the GPIO interface on ARM v7 based Qualcomm MSM chips. Most of the pins on the MSM can be -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] power: reset: msm - switch Kconfig to ARCH_QCOM depends
We've split Qualcomm MSM support into legacy and multiplatform. The reset driver is only relevant on the multiplatform supported SoCs so switch the Kconfig depends to ARCH_QCOM. Signed-off-by: Kumar Gala ga...@codeaurora.org --- Dmitry, David, If you can ack this I'll send it via linux-qcom/arm-soc tree's thanks - k drivers/power/reset/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig index 6d452a7..fa0e4e0 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -22,7 +22,7 @@ config POWER_RESET_GPIO config POWER_RESET_MSM bool Qualcomm MSM power-off driver - depends on POWER_RESET ARCH_MSM + depends on POWER_RESET ARCH_QCOM help Power off and restart support for Qualcomm boards. -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] drm/msm: drop ARCH_MSM Kconfig depend
The ARCH_MSM depend is redundant with ARCH_MSM8960, so we can remove it. Additionally, we are splitting Qualcomm MSM support into legacy (ARCH_MSM) and multiplatform (ARCH_QCOM). The MSM8960 with be ARCH_QCOM going forward so dropping ARCH_MSM will work properly for the new ARCH_QCOM multiplatform build. Signed-off-by: Kumar Gala ga...@codeaurora.org --- David/Rob, If you can ack this I'll send it via linux-qcom/arm-soc tree's thanks - k drivers/gpu/drm/msm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index c69d1e0..b698497 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -3,7 +3,7 @@ config DRM_MSM tristate MSM DRM depends on DRM depends on MSM_IOMMU - depends on (ARCH_MSM ARCH_MSM8960) || (ARM COMPILE_TEST) + depends on ARCH_MSM8960 || (ARM COMPILE_TEST) select DRM_KMS_HELPER select SHMEM select TMPFS -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/2] ARM: dts: MSM8974: Add pinctrl node
On Feb 10, 2014, at 12:55 PM, Bjorn Andersson bj...@kryo.se wrote:
On Thu, Feb 6, 2014 at 7:28 AM, Ivan T. Ivanov iiva...@mm-sol.com wrote:
From: Ivan T. Ivanov iiva...@mm-sol.com
Add the pin control node and pin definitions of SPI8.
Signed-off-by: Ivan T. Ivanov iiva...@mm-sol.com
---
arch/arm/boot/dts/qcom-msm8974.dtsi | 29 +
1 file changed, 29 insertions(+)
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi
b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 9e5dadb..395603f 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -117,5 +117,34 @@
clocks = gcc GCC_BLSP1_UART2_APPS_CLK, gcc
GCC_BLSP1_AHB_CLK;
clock-names = core, iface;
};
+
+ msmgpio: pinctrl@fd51 {
+ compatible = qcom,msm8974-pinctrl;
+ reg = 0xfd51 0x4000;
+ gpio-controller;
+ #gpio-cells = 2;
+ interrupt-controller;
+ #interrupt-cells = 2;
+ interrupts = 0 208 0;
+
+ spi8_default: spi8_default {
+ mosi {
+ pins = gpio45;
+ function = blsp_spi8;
+ };
+ miso {
+ pins = gpio46;
+ function = blsp_spi8;
+ };
+ cs {
+ pins = gpio47;
+ function = blsp_spi8;
+ };
+ clk {
+ pins = gpio48;
+ function = blsp_spi8;
+ };
+ };
+ };
};
};
Nice, listing it like this makes it easy to add the electrical
properties when inheriting these nodes, closer to the product dts
files.
Reviewed-by: Bjorn Andersson bjorn.anders...@sonymobile.com
Linus,
I can take the .dts patch via the linux-qcom tree to keep it with other DT
changes if you want to provide an ack.
- k
--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by
The Linux Foundation
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH] hwrng: msm: switch Kconfig to ARCH_QCOM depends
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): We've split Qualcomm MSM support into legacy and multiplatform. The RNG driver is only relevant on the multiplatform supported SoCs so switch the Kconfig depends to ARCH_QCOM. CC: Herbert Xu herb...@gondor.apana.org.au Signed-off-by: Kumar Gala ga...@codeaurora.org --- drivers/char/hw_random/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig index 2f2b084..289bd3a 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -343,7 +343,7 @@ config HW_RANDOM_TPM config HW_RANDOM_MSM tristate Qualcomm MSM Random Number Generator support - depends on HW_RANDOM ARCH_MSM + depends on HW_RANDOM ARCH_QCOM ---help--- This driver provides kernel-side support for the Random Number Generator hardware found on Qualcomm MSM SoCs. -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [Patch v5 2/2] dmaengine: qcom_bam_dma: Add device tree binding
On Feb 4, 2014, at 2:42 PM, Andy Gross agr...@codeaurora.org wrote:
Add device tree binding support for the QCOM BAM DMA driver.
Signed-off-by: Andy Gross agr...@codeaurora.org
---
.../devicetree/bindings/dma/qcom_bam_dma.txt | 48
1 file changed, 48 insertions(+)
create mode 100644 Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
Acked-by: Kumar Gala ga...@codeaurora.org
- k
diff --git a/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
new file mode 100644
index 000..86344f1
--- /dev/null
+++ b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
@@ -0,0 +1,48 @@
+QCOM BAM DMA controller
+
+Required properties:
+- compatible:Must be qcom,bam-v1.4.0 for MSM8974 V1
+ Must be qcom,bam-v1.4.1 for MSM8974 V2
+- reg: Address range for DMA registers
+- interrupts: single interrupt for this controller
+- #dma-cells: must be 1
+- clocks: required clock
+- clock-names: name of clock
+- qcom,ee : indicates the active Execution Environment identifier (0-7)
+
+Example:
+
+ uart-bam: dma@f9984000 = {
+ compatible = qcom,bam-v1.4.1;
+ reg = 0xf9984000 0x15000;
+ interrupts = 0 94 0;
+ clocks = gcc GCC_BAM_DMA_AHB_CLK;
+ clock-names = bam_clk;
+ #dma-cells = 1;
+ qcom,ee = 0;
+ };
+
+Client:
+Required properties:
+- dmas: List of dma channel requests
+- dma-names: Names of aforementioned requested channels
+
+Clients must use the format described in the dma.txt file, using a two cell
+specifier for each channel.
+
+The three cells in order are:
+ 1. A phandle pointing to the DMA controller
+ 2. The channel number
+
+Example:
+ serial@f991e000 {
+ compatible = qcom,msm-uart;
+ reg = 0xf991e000 0x1000
+ 0xf9944000 0x19000;
+ interrupts = 0 108 0;
+ clocks = gcc GCC_BLSP1_UART2_APPS_CLK, gcc
GCC_BLSP1_AHB_CLK;
+ clock-names = core, iface;
+
+ dmas = uart-bam 0, uart-bam 1;
+ dma-names = rx, tx;
+ };
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line unsubscribe linux-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by
The Linux Foundation
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] qcom SoC changes for v3.15
The following changes since commit cf1e8f0cd665e2a9966d2bee4e11ecc0938ff166: ARM: qcom: Rename various msm prefixed functions to qcom (2014-02-06 16:20:41 -0600) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git tags/qcom-soc-for-3.15 for you to fetch changes up to 6990c132abc984bd6e75ac2be1f1d657cd600f63: ARM: qcom: Add SMP support for KPSSv2 (2014-02-11 15:00:40 -0600) Qualcomm ARM Based SoC Updates for v3.15 * Add support for determining smp ops based on device tree. * Add DT binding specs for Krait/Scorpion enable method * Add DT binding specs for various Krait Processor controller complexes * Add SoC SMP support for Krait Processor Subsystem v1 v2 Rohit Vaswani (4): ARM: qcom: Re-organize platsmp to make it extensible devicetree: bindings: Document Krait/Scorpion cpus and enable-method ARM: qcom: Add SMP support for KPSSv1 ARM: qcom: Add SMP support for KPSSv2 Stephen Boyd (3): ARM: Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp devicetree: bindings: Document qcom,kpss-acc devicetree: bindings: Document qcom,saw2 node Documentation/devicetree/bindings/arm/cpus.txt | 25 +- .../devicetree/bindings/arm/msm/qcom,kpss-acc.txt | 30 ++ .../devicetree/bindings/arm/msm/qcom,saw2.txt | 35 +++ arch/arm/include/asm/smp.h | 9 + arch/arm/kernel/devtree.c | 40 +++ arch/arm/mach-msm/common.h | 2 - arch/arm/mach-qcom/board.c | 14 - arch/arm/mach-qcom/platsmp.c | 341 ++--- arch/arm/mach-qcom/scm-boot.h | 8 +- include/asm-generic/vmlinux.lds.h | 10 + 10 files changed, 444 insertions(+), 70 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] qcom cleanups for v3.15
The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:
Linus 3.14-rc1 (2014-02-02 16:42:13 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git
tags/qcom-cleanup-for-3.15
for you to fetch changes up to cf1e8f0cd665e2a9966d2bee4e11ecc0938ff166:
ARM: qcom: Rename various msm prefixed functions to qcom (2014-02-06 16:20:41
-0600)
General cleanups for MSM/QCOM for 3.15
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.
Kumar Gala (6):
ARM: dts: msm: split out msm8660 and msm8960 soc into dts include
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
Rohit Vaswani (1):
ARM: msm: Remove pen_release usage
MAINTAINERS| 8 +++
arch/arm/Kconfig | 7 +-
arch/arm/Kconfig.debug | 2 +-
arch/arm/Makefile | 1 +
arch/arm/boot/dts/Makefile | 6 +-
arch/arm/boot/dts/qcom-msm8660-surf.dts| 59 +
arch/arm/boot/dts/qcom-msm8660.dtsi| 63 ++
arch/arm/boot/dts/qcom-msm8960-cdp.dts | 66 +--
arch/arm/boot/dts/qcom-msm8960.dtsi| 70
arch/arm/mach-msm/Kconfig | 54 ++--
arch/arm/mach-msm/Makefile | 8 ---
arch/arm/mach-msm/common.h | 1 -
arch/arm/mach-msm/headsmp.S| 39
arch/arm/mach-msm/hotplug.c| 74 --
arch/arm/mach-qcom/Kconfig | 33 ++
arch/arm/mach-qcom/Makefile| 5 ++
.../arm/{mach-msm/board-dt.c => mach-qcom/board.c} | 15 ++---
arch/arm/{mach-msm => mach-qcom}/platsmp.c | 66 ++-
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
drivers/clocksource/Kconfig| 3 +
drivers/clocksource/Makefile | 1 +
.../timer.c => drivers/clocksource/qcom-timer.c| 29 -
25 files changed, 240 insertions(+), 370 deletions(-)
create mode 100644 arch/arm/boot/dts/qcom-msm8660.dtsi
create mode 100644 arch/arm/boot/dts/qcom-msm8960.dtsi
delete mode 100644 arch/arm/mach-msm/headsmp.S
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} (68%)
rename arch/arm/{mach-msm => mach-qcom}/platsmp.c (65%)
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/timer.c => drivers/clocksource/qcom-timer.c (98%)
--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by
The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL] qcom cleanups for v3.15
The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:
Linus 3.14-rc1 (2014-02-02 16:42:13 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git
tags/qcom-cleanup-for-3.15
for you to fetch changes up to cf1e8f0cd665e2a9966d2bee4e11ecc0938ff166:
ARM: qcom: Rename various msm prefixed functions to qcom (2014-02-06 16:20:41
-0600)
General cleanups for MSM/QCOM for 3.15
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.
Kumar Gala (6):
ARM: dts: msm: split out msm8660 and msm8960 soc into dts include
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
Rohit Vaswani (1):
ARM: msm: Remove pen_release usage
MAINTAINERS| 8 +++
arch/arm/Kconfig | 7 +-
arch/arm/Kconfig.debug | 2 +-
arch/arm/Makefile | 1 +
arch/arm/boot/dts/Makefile | 6 +-
arch/arm/boot/dts/qcom-msm8660-surf.dts| 59 +
arch/arm/boot/dts/qcom-msm8660.dtsi| 63 ++
arch/arm/boot/dts/qcom-msm8960-cdp.dts | 66 +--
arch/arm/boot/dts/qcom-msm8960.dtsi| 70
arch/arm/mach-msm/Kconfig | 54 ++--
arch/arm/mach-msm/Makefile | 8 ---
arch/arm/mach-msm/common.h | 1 -
arch/arm/mach-msm/headsmp.S| 39
arch/arm/mach-msm/hotplug.c| 74 --
arch/arm/mach-qcom/Kconfig | 33 ++
arch/arm/mach-qcom/Makefile| 5 ++
.../arm/{mach-msm/board-dt.c = mach-qcom/board.c} | 15 ++---
arch/arm/{mach-msm = mach-qcom}/platsmp.c | 66 ++-
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
drivers/clocksource/Kconfig| 3 +
drivers/clocksource/Makefile | 1 +
.../timer.c = drivers/clocksource/qcom-timer.c| 29 -
25 files changed, 240 insertions(+), 370 deletions(-)
create mode 100644 arch/arm/boot/dts/qcom-msm8660.dtsi
create mode 100644 arch/arm/boot/dts/qcom-msm8960.dtsi
delete mode 100644 arch/arm/mach-msm/headsmp.S
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} (68%)
rename arch/arm/{mach-msm = mach-qcom}/platsmp.c (65%)
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/timer.c = drivers/clocksource/qcom-timer.c (98%)
--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by
The Linux Foundation
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] Convert powerpc simple spinlocks into ticket locks
On Feb 7, 2014, at 3:02 AM, Torsten Duwe wrote: > On Thu, Feb 06, 2014 at 02:19:52PM -0600, Scott Wood wrote: >> On Thu, 2014-02-06 at 18:37 +0100, Torsten Duwe wrote: >>> On Thu, Feb 06, 2014 at 05:38:37PM +0100, Peter Zijlstra wrote: >> Can you pair lwarx with sthcx ? I couldn't immediately find the answer in the PowerISA doc. If so I think you can do better by being able to atomically load both tickets but only storing the head without affecting the tail. > > Can I simply write the half word, without a reservation, or will the HW caches > mess up the other half? Will it ruin the cache coherency on some > (sub)architectures? The coherency should be fine, I just can’t remember if you’ll lose the reservation by doing this. >> Plus, sthcx doesn't exist on all PPC chips. > > Which ones are lacking it? Do all have at least a simple 16-bit store? Everything implements a simple 16-bit store, just not everything implements the store conditional of 16-bit data. - k-- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] Convert powerpc simple spinlocks into ticket locks
On Feb 7, 2014, at 3:02 AM, Torsten Duwe d...@lst.de wrote: On Thu, Feb 06, 2014 at 02:19:52PM -0600, Scott Wood wrote: On Thu, 2014-02-06 at 18:37 +0100, Torsten Duwe wrote: On Thu, Feb 06, 2014 at 05:38:37PM +0100, Peter Zijlstra wrote: Can you pair lwarx with sthcx ? I couldn't immediately find the answer in the PowerISA doc. If so I think you can do better by being able to atomically load both tickets but only storing the head without affecting the tail. Can I simply write the half word, without a reservation, or will the HW caches mess up the other half? Will it ruin the cache coherency on some (sub)architectures? The coherency should be fine, I just can’t remember if you’ll lose the reservation by doing this. Plus, sthcx doesn't exist on all PPC chips. Which ones are lacking it? Do all have at least a simple 16-bit store? Everything implements a simple 16-bit store, just not everything implements the store conditional of 16-bit data. - k-- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[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.
Signed-off-by: Kumar Gala
---
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
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 721f27f..8327f60 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -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
diff --git a/arch/arm/mach-msm/common.h b/arch/arm/mach-msm/common.h
index 33c7725..0a4899b 100644
--- a/arch/arm/mach-msm/common.h
+++ b/arch/arm/mach-msm/common.h
@@ -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;
diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c
deleted file mode 100644
index cea80fc..000
--- 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
-#include
-#include
-
-#include
-
-#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-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index 3721b31..251a91e 100644
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
@@ -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 */
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v3 3/5] ARM: qcom: Split Qualcomm support into legacy and multiplatform
Introduce 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.
Signed-off-by: Kumar Gala
---
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%)
diff --git a/MAINTAINERS b/MAINTAINERS
index b2cf5cf..402be60 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1167,6 +1167,14 @@ L: linux-arm-ker...@lists.infradead.org (moderated
for non-subscribers)
W: http://www.arm.linux.org.uk/
S: Maintained
+ARM/QUALCOMM SUPPORT
+M: Kumar Gala
+M: David Brown
+L: linux-arm-...@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
L: linux-arm-ker...@lists.infradead.org (moderated for non-subscribers)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e254198..f093f20 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/Kconfig.debug b/arch/arm/Kconfig.debug
index 0531da8..4491c7b 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -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
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 \
+ qco
[PATCH v3 2/5] clocksource: qcom: Move clocksource code out of mach-msm
We intend to share the clocksource code for MSM platforms between legacy and multiplatform supported qcom SoCs. Acked-by: Olof Johansson Signed-off-by: Kumar Gala --- 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%) diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index 9625cf3..3c4eca7 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -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 diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index 8327f60..04b1bee 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -1,4 +1,3 @@ -obj-$(CONFIG_MSM_TIMER) += timer.o obj-$(CONFIG_MSM_PROC_COMM) += clock.o obj-$(CONFIG_MSM_VIC) += irq-vic.o diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index cd6950f..6510ec4 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -140,3 +140,6 @@ config VF_PIT_TIMER bool help Support for Period Interrupt Timer on Freescale Vybrid Family SoCs. + +config CLKSRC_QCOM + bool diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index c7ca50a..2e0c0cc 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -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 diff --git a/arch/arm/mach-msm/timer.c b/drivers/clocksource/qcom-timer.c similarity index 98% rename from arch/arm/mach-msm/timer.c rename to drivers/clocksource/qcom-timer.c index fd16449..dca829e 100644 --- a/arch/arm/mach-msm/timer.c +++ b/drivers/clocksource/qcom-timer.c @@ -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 #include -#include - -#include "common.h" - #define TIMER_MATCH_VAL0x #define TIMER_COUNT_VAL0x0004 #define TIMER_ENABLE 0x0008 -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v3 4/5] clocksource: qcom: split building of legacy vs multiplatform support
The 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.
Acked-by: Olof Johansson
Signed-off-by: Kumar Gala
---
drivers/clocksource/qcom-timer.c | 23 ---
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/clocksource/qcom-timer.c b/drivers/clocksource/qcom-timer.c
index dca829e..e807acf 100644
--- a/drivers/clocksource/qcom-timer.c
+++ b/drivers/clocksource/qcom-timer.c
@@ -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 = _clocksource;
@@ -327,3 +327,4 @@ void __init qsd8x50_timer_init(void)
return;
msm_timer_init(1920 / 4, 32, 7, false);
}
+#endif
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v3 5/5] ARM: qcom: Rename various msm prefixed functions to qcom
As 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.
Signed-off-by: Kumar Gala
---
arch/arm/mach-qcom/board.c | 4 ++--
arch/arm/mach-qcom/platsmp.c | 22 +++---
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-qcom/board.c b/arch/arm/mach-qcom/board.c
index 4529f6b..830f69c 100644
--- a/arch/arm/mach-qcom/board.c
+++ b/arch/arm/mach-qcom/board.c
@@ -17,7 +17,7 @@
#include
#include
-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
diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c
index 67823a7..9c53ea7 100644
--- a/arch/arm/mach-qcom/platsmp.c
+++ b/arch/arm/mach-qcom/platsmp.c
@@ -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
};
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v3 0/5] 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(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v3 0/5] 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(-) -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v3 5/5] ARM: qcom: Rename various msm prefixed functions to qcom
As 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.
Signed-off-by: Kumar Gala ga...@codeaurora.org
---
arch/arm/mach-qcom/board.c | 4 ++--
arch/arm/mach-qcom/platsmp.c | 22 +++---
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-qcom/board.c b/arch/arm/mach-qcom/board.c
index 4529f6b..830f69c 100644
--- a/arch/arm/mach-qcom/board.c
+++ b/arch/arm/mach-qcom/board.c
@@ -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
diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c
index 67823a7..9c53ea7 100644
--- a/arch/arm/mach-qcom/platsmp.c
+++ b/arch/arm/mach-qcom/platsmp.c
@@ -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
};
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v3 2/5] clocksource: qcom: Move clocksource code out of mach-msm
We intend to share the clocksource code for MSM platforms between legacy and multiplatform supported qcom SoCs. Acked-by: Olof Johansson o...@lixom.net Signed-off-by: Kumar Gala ga...@codeaurora.org --- 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%) diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index 9625cf3..3c4eca7 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -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 diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index 8327f60..04b1bee 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -1,4 +1,3 @@ -obj-$(CONFIG_MSM_TIMER) += timer.o obj-$(CONFIG_MSM_PROC_COMM) += clock.o obj-$(CONFIG_MSM_VIC) += irq-vic.o diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index cd6950f..6510ec4 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -140,3 +140,6 @@ config VF_PIT_TIMER bool help Support for Period Interrupt Timer on Freescale Vybrid Family SoCs. + +config CLKSRC_QCOM + bool diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index c7ca50a..2e0c0cc 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -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 diff --git a/arch/arm/mach-msm/timer.c b/drivers/clocksource/qcom-timer.c similarity index 98% rename from arch/arm/mach-msm/timer.c rename to drivers/clocksource/qcom-timer.c index fd16449..dca829e 100644 --- a/arch/arm/mach-msm/timer.c +++ b/drivers/clocksource/qcom-timer.c @@ -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_VAL0x #define TIMER_COUNT_VAL0x0004 #define TIMER_ENABLE 0x0008 -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v3 4/5] clocksource: qcom: split building of legacy vs multiplatform support
The 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.
Acked-by: Olof Johansson o...@lixom.net
Signed-off-by: Kumar Gala ga...@codeaurora.org
---
drivers/clocksource/qcom-timer.c | 23 ---
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/clocksource/qcom-timer.c b/drivers/clocksource/qcom-timer.c
index dca829e..e807acf 100644
--- a/drivers/clocksource/qcom-timer.c
+++ b/drivers/clocksource/qcom-timer.c
@@ -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(1920 / 4, 32, 7, false);
}
+#endif
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[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.
Signed-off-by: Kumar Gala ga...@codeaurora.org
---
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
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 721f27f..8327f60 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -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
diff --git a/arch/arm/mach-msm/common.h b/arch/arm/mach-msm/common.h
index 33c7725..0a4899b 100644
--- a/arch/arm/mach-msm/common.h
+++ b/arch/arm/mach-msm/common.h
@@ -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;
diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c
deleted file mode 100644
index cea80fc..000
--- 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-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index 3721b31..251a91e 100644
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
@@ -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 */
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v3 3/5] ARM: qcom: Split Qualcomm support into legacy and multiplatform
Introduce 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.
Signed-off-by: Kumar Gala ga...@codeaurora.org
---
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%)
diff --git a/MAINTAINERS b/MAINTAINERS
index b2cf5cf..402be60 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1167,6 +1167,14 @@ L: linux-arm-ker...@lists.infradead.org (moderated
for non-subscribers)
W: http://www.arm.linux.org.uk/
S: Maintained
+ARM/QUALCOMM SUPPORT
+M: Kumar Gala ga...@codeaurora.org
+M: David Brown dav...@codeaurora.org
+L: linux-arm-...@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 ker...@wantstofly.org
L: linux-arm-ker...@lists.infradead.org (moderated for non-subscribers)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e254198..f093f20 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/Kconfig.debug b/arch/arm/Kconfig.debug
index 0531da8..4491c7b 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -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
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
Re: [PATCH v2 0/5] Split mach-msm into legacy and mach-qcom (multiplatform)
On Feb 4, 2014, at 6:47 PM, Stephen Boyd wrote: > On 02/04, Kumar Gala wrote: >> 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 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 > > What's the plan for this series combined with my SMP series? It > looks like this isn't based on those patches, so we'll have some > conflicts with the msm to qcom rename but it should be fairly > minor. I’ve rebased the smp patch series on top of this set, so will post the new version short (hopefully once we close on these). - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2 0/5] Split mach-msm into legacy and mach-qcom (multiplatform)
On Feb 4, 2014, at 6:47 PM, Stephen Boyd sb...@codeaurora.org wrote: On 02/04, Kumar Gala wrote: 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 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 What's the plan for this series combined with my SMP series? It looks like this isn't based on those patches, so we'll have some conflicts with the msm to qcom rename but it should be fairly minor. I’ve rebased the smp patch series on top of this set, so will post the new version short (hopefully once we close on these). - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2 2/5] clocksource: qcom: Move clocksource code out of mach-msm
On Feb 4, 2014, at 5:09 PM, Stephen Boyd wrote: > On 02/04, Kumar Gala wrote: >> We intent to share the clocksource code for MSM platforms between legacy > > s/intent/intend/ > >> and multiplatform supported qcom SoCs. >> >> Acked-by: Olof Johansson >> Signed-off-by: Kumar Gala > >> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig >> index cd6950f..81caa16 100644 >> --- a/drivers/clocksource/Kconfig >> +++ b/drivers/clocksource/Kconfig >> @@ -140,3 +140,7 @@ config VF_PIT_TIMER >> bool >> help >>Support for Period Interrupt Timer on Freescale Vybrid Family SoCs. >> + >> +config CLKSRC_QCOM >> +bool >> +depends on ARCH_MSM > > It would be a a little less noisy if you left this as MSM_TIMER > (msm is all over the code in that file anyway). Also, why do we > care about depending on ARCH_MSM here? This is a hidden Kconfig > option anyway. I will drop the depends, but not sure what point in leaving this as MSM_TIMER. - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2 1/5] ARM: msm: kill off hotplug.c
On Feb 4, 2014, at 5:07 PM, Stephen Boyd wrote:
> On 02/04, Kumar Gala wrote:
>> diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
>> index 3721b31..251a91e 100644
>> --- a/arch/arm/mach-msm/platsmp.c
>> +++ b/arch/arm/mach-msm/platsmp.c
>> @@ -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)
>
> We shouldn't need __ref anymore either right?
I think we might as cpu_die is still marked __ref so I think we need it.
>
>> +{
>> +wfi();
>> +}
>> +#endif
>> +
>> static inline int get_core_count(void)
>> {
>> /* 1 + the PART[1:0] field of MIDR */
> --
> Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
> hosted by The Linux Foundation
> --
> To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by
The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 2/5] clocksource: qcom: Move clocksource code out of mach-msm
We intent to share the clocksource code for MSM platforms between legacy
and multiplatform supported qcom SoCs.
Acked-by: Olof Johansson
Signed-off-by: Kumar Gala
---
arch/arm/mach-msm/Kconfig| 13 +-
arch/arm/mach-msm/Makefile | 1 -
arch/arm/mach-msm/timer.c| 333 ---
drivers/clocksource/Kconfig | 4 +
drivers/clocksource/Makefile | 1 +
drivers/clocksource/qcom-timer.c | 329 ++
6 files changed, 339 insertions(+), 342 deletions(-)
delete mode 100644 arch/arm/mach-msm/timer.c
create mode 100644 drivers/clocksource/qcom-timer.c
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 9625cf3..3c4eca7 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -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
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 8327f60..04b1bee 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -1,4 +1,3 @@
-obj-$(CONFIG_MSM_TIMER) += timer.o
obj-$(CONFIG_MSM_PROC_COMM) += clock.o
obj-$(CONFIG_MSM_VIC) += irq-vic.o
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
deleted file mode 100644
index fd16449..000
--- a/arch/arm/mach-msm/timer.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- *
- * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2009-2012, 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
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-
-#include "common.h"
-
-#define TIMER_MATCH_VAL0x
-#define TIMER_COUNT_VAL0x0004
-#define TIMER_ENABLE 0x0008
-#define TIMER_ENABLE_CLR_ON_MATCH_EN BIT(1)
-#define TIMER_ENABLE_ENBIT(0)
-#define TIMER_CLEAR0x000C
-#define DGT_CLK_CTL0x10
-#define DGT_CLK_CTL_DIV_4 0x3
-#define TIMER_STS_GPT0_CLR_PENDBIT(10)
-
-#define GPT_HZ 32768
-
-#define MSM_DGT_SHIFT 5
-
-static void __iomem *event_base;
-static void __iomem *sts_base;
-
-static irqreturn_t msm_timer_interrupt(int irq, void *dev_id)
-{
- struct clock_event_device *evt = dev_id;
- /* Stop the timer tick */
- if (evt->mode == CLOCK_EVT_MODE_ONESHOT) {
- u32 ctrl = readl_relaxed(event_base + TIMER_ENABLE);
- ctrl &= ~TIMER_ENABLE_EN;
- writel_relaxed(ctrl, event_base + TIMER_ENABLE);
- }
- evt->event_handler(evt);
- return IRQ_HANDLED;
-}
-
-static int msm_timer_set_next_event(unsigned long cycles,
- struct clock_event_device *evt)
-{
- u32 ctrl = readl_relaxed(event_base + TIMER_ENABLE);
-
- ctrl &= ~TIMER_ENABLE_EN;
- writel_relaxed(ctrl, event_base + TIMER_ENABLE);
-
- writel_relaxed(ctrl, event_base + TIMER_CLEAR);
- writel_relaxed(cycles, event_base + TIMER_MATCH_VAL);
-
- if (sts_base)
- while (readl_relaxed(sts_base) & TIMER_STS_GPT0_CLR_PEND)
- cpu_relax();
-
- writel_relaxed(ctrl | TIMER_ENABLE_EN, event_base + TIMER_ENABLE);
- return 0;
-}
-
-static vo
[PATCH v2 2/5] clocksource: qcom: Move clocksource code out of mach-msm
We intent to share the clocksource code for MSM platforms between legacy
and multiplatform supported qcom SoCs.
Acked-by: Olof Johansson
Signed-off-by: Kumar Gala
---
arch/arm/mach-msm/Kconfig| 13 +-
arch/arm/mach-msm/Makefile | 1 -
arch/arm/mach-msm/timer.c| 333 ---
drivers/clocksource/Kconfig | 4 +
drivers/clocksource/Makefile | 1 +
drivers/clocksource/qcom-timer.c | 329 ++
6 files changed, 339 insertions(+), 342 deletions(-)
delete mode 100644 arch/arm/mach-msm/timer.c
create mode 100644 drivers/clocksource/qcom-timer.c
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 9625cf3..3c4eca7 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -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
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 8327f60..04b1bee 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -1,4 +1,3 @@
-obj-$(CONFIG_MSM_TIMER) += timer.o
obj-$(CONFIG_MSM_PROC_COMM) += clock.o
obj-$(CONFIG_MSM_VIC) += irq-vic.o
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
deleted file mode 100644
index fd16449..000
--- a/arch/arm/mach-msm/timer.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- *
- * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2009-2012, 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
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-
-#include "common.h"
-
-#define TIMER_MATCH_VAL0x
-#define TIMER_COUNT_VAL0x0004
-#define TIMER_ENABLE 0x0008
-#define TIMER_ENABLE_CLR_ON_MATCH_EN BIT(1)
-#define TIMER_ENABLE_ENBIT(0)
-#define TIMER_CLEAR0x000C
-#define DGT_CLK_CTL0x10
-#define DGT_CLK_CTL_DIV_4 0x3
-#define TIMER_STS_GPT0_CLR_PENDBIT(10)
-
-#define GPT_HZ 32768
-
-#define MSM_DGT_SHIFT 5
-
-static void __iomem *event_base;
-static void __iomem *sts_base;
-
-static irqreturn_t msm_timer_interrupt(int irq, void *dev_id)
-{
- struct clock_event_device *evt = dev_id;
- /* Stop the timer tick */
- if (evt->mode == CLOCK_EVT_MODE_ONESHOT) {
- u32 ctrl = readl_relaxed(event_base + TIMER_ENABLE);
- ctrl &= ~TIMER_ENABLE_EN;
- writel_relaxed(ctrl, event_base + TIMER_ENABLE);
- }
- evt->event_handler(evt);
- return IRQ_HANDLED;
-}
-
-static int msm_timer_set_next_event(unsigned long cycles,
- struct clock_event_device *evt)
-{
- u32 ctrl = readl_relaxed(event_base + TIMER_ENABLE);
-
- ctrl &= ~TIMER_ENABLE_EN;
- writel_relaxed(ctrl, event_base + TIMER_ENABLE);
-
- writel_relaxed(ctrl, event_base + TIMER_CLEAR);
- writel_relaxed(cycles, event_base + TIMER_MATCH_VAL);
-
- if (sts_base)
- while (readl_relaxed(sts_base) & TIMER_STS_GPT0_CLR_PEND)
- cpu_relax();
-
- writel_relaxed(ctrl | TIMER_ENABLE_EN, event_base + TIMER_ENABLE);
- return 0;
-}
-
-static vo
[PATCH v2 3/5] arm: qcom: Split Qualcomm support into legacy and multiplatform
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 --- 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-msm/board-dt.c | 41 -- arch/arm/mach-msm/platsmp.c | 137 --- 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-qcom/Kconfig| 33 + arch/arm/mach-qcom/Makefile | 5 + arch/arm/mach-qcom/board.c| 40 ++ arch/arm/mach-qcom/scm-boot.c | 39 ++ arch/arm/mach-qcom/scm-boot.h | 22 arch/arm/mach-qcom/scm.c | 299 ++ arch/arm/mach-qcom/scm.h | 25 arch/arm/mach-qcom/smp.c | 137 +++ 21 files changed, 619 insertions(+), 619 deletions(-) delete mode 100644 arch/arm/mach-msm/board-dt.c delete mode 100644 arch/arm/mach-msm/platsmp.c delete mode 100644 arch/arm/mach-msm/scm-boot.c delete mode 100644 arch/arm/mach-msm/scm-boot.h delete mode 100644 arch/arm/mach-msm/scm.c delete mode 100644 arch/arm/mach-msm/scm.h create mode 100644 arch/arm/mach-qcom/Kconfig create mode 100644 arch/arm/mach-qcom/Makefile create mode 100644 arch/arm/mach-qcom/board.c create mode 100644 arch/arm/mach-qcom/scm-boot.c create mode 100644 arch/arm/mach-qcom/scm-boot.h create mode 100644 arch/arm/mach-qcom/scm.c create mode 100644 arch/arm/mach-qcom/scm.h create mode 100644 arch/arm/mach-qcom/smp.c diff --git a/MAINTAINERS b/MAINTAINERS index b2cf5cf..402be60 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1167,6 +1167,14 @@ L: linux-arm-ker...@lists.infradead.org (moderated for non-subscribers) W: http://www.arm.linux.org.uk/ S: Maintained +ARM/QUALCOMM SUPPORT +M: Kumar Gala +M: David Brown +L: linux-arm-...@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 L: linux-arm-ker...@lists.infradead.org (moderated for non-subscribers) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e254198..f093f20 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/Kconfig.debug b/arch/arm/Kconfig.debug index 0531da8..4491c7b 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -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 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 \ d
[PATCH v2 4/5] clocksource: qcom: split building of legacy vs multiplatform support
The 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.
Acked-by: Olof Johansson
Signed-off-by: Kumar Gala
---
drivers/clocksource/qcom-timer.c | 23 ---
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/clocksource/qcom-timer.c b/drivers/clocksource/qcom-timer.c
index dca829e..e807acf 100644
--- a/drivers/clocksource/qcom-timer.c
+++ b/drivers/clocksource/qcom-timer.c
@@ -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 = _clocksource;
@@ -327,3 +327,4 @@ void __init qsd8x50_timer_init(void)
return;
msm_timer_init(1920 / 4, 32, 7, false);
}
+#endif
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2 5/5] ARM: qcom: Rename various msm prefixed functions to qcom
As 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.
Signed-off-by: Kumar Gala
---
arch/arm/mach-qcom/board.c | 4 ++--
arch/arm/mach-qcom/smp.c | 22 +++---
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-qcom/board.c b/arch/arm/mach-qcom/board.c
index 4529f6b..830f69c 100644
--- a/arch/arm/mach-qcom/board.c
+++ b/arch/arm/mach-qcom/board.c
@@ -17,7 +17,7 @@
#include
#include
-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
diff --git a/arch/arm/mach-qcom/smp.c b/arch/arm/mach-qcom/smp.c
index 67823a7..9c53ea7 100644
--- a/arch/arm/mach-qcom/smp.c
+++ b/arch/arm/mach-qcom/smp.c
@@ -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
};
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2 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.
Signed-off-by: Kumar Gala
---
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
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 721f27f..8327f60 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -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
diff --git a/arch/arm/mach-msm/common.h b/arch/arm/mach-msm/common.h
index 33c7725..0a4899b 100644
--- a/arch/arm/mach-msm/common.h
+++ b/arch/arm/mach-msm/common.h
@@ -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;
diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c
deleted file mode 100644
index cea80fc..000
--- 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
-#include
-#include
-
-#include
-
-#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-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index 3721b31..251a91e 100644
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
@@ -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 */
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2 0/5] 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 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/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/arch/arm/mach-qcom/smp.c | 137 +++ b/drivers/clocksource/Kconfig |4 b/drivers/clocksource/Makefile |1 b/drivers/clocksource/qcom-timer.c | 330 27 files changed, 957 insertions(+), 1005 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3/5] arm: qcom: Split Qualcomm support into legacy and multiplatform
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 --- 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-msm/board-dt.c | 41 -- arch/arm/mach-msm/platsmp.c | 137 --- 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-qcom/Kconfig| 33 + arch/arm/mach-qcom/Makefile | 5 + arch/arm/mach-qcom/board.c| 40 ++ arch/arm/mach-qcom/scm-boot.c | 39 ++ arch/arm/mach-qcom/scm-boot.h | 22 arch/arm/mach-qcom/scm.c | 299 ++ arch/arm/mach-qcom/scm.h | 25 arch/arm/mach-qcom/smp.c | 137 +++ 21 files changed, 619 insertions(+), 619 deletions(-) delete mode 100644 arch/arm/mach-msm/board-dt.c delete mode 100644 arch/arm/mach-msm/platsmp.c delete mode 100644 arch/arm/mach-msm/scm-boot.c delete mode 100644 arch/arm/mach-msm/scm-boot.h delete mode 100644 arch/arm/mach-msm/scm.c delete mode 100644 arch/arm/mach-msm/scm.h create mode 100644 arch/arm/mach-qcom/Kconfig create mode 100644 arch/arm/mach-qcom/Makefile create mode 100644 arch/arm/mach-qcom/board.c create mode 100644 arch/arm/mach-qcom/scm-boot.c create mode 100644 arch/arm/mach-qcom/scm-boot.h create mode 100644 arch/arm/mach-qcom/scm.c create mode 100644 arch/arm/mach-qcom/scm.h create mode 100644 arch/arm/mach-qcom/smp.c diff --git a/MAINTAINERS b/MAINTAINERS index b2cf5cf..402be60 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1167,6 +1167,14 @@ L: linux-arm-ker...@lists.infradead.org (moderated for non-subscribers) W: http://www.arm.linux.org.uk/ S: Maintained +ARM/QUALCOMM SUPPORT +M: Kumar Gala +M: David Brown +L: linux-arm-...@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 L: linux-arm-ker...@lists.infradead.org (moderated for non-subscribers) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e254198..f093f20 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/Kconfig.debug b/arch/arm/Kconfig.debug index 0531da8..4491c7b 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -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 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 \ d
[PATCH 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.
Signed-off-by: Kumar Gala
---
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
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 721f27f..8327f60 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -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
diff --git a/arch/arm/mach-msm/common.h b/arch/arm/mach-msm/common.h
index 33c7725..0a4899b 100644
--- a/arch/arm/mach-msm/common.h
+++ b/arch/arm/mach-msm/common.h
@@ -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;
diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c
deleted file mode 100644
index cea80fc..000
--- 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
-#include
-#include
-
-#include
-
-#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-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index 3721b31..251a91e 100644
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
@@ -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 */
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2 0/5] 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 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/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/arch/arm/mach-qcom/smp.c | 137 +++ b/drivers/clocksource/Kconfig |4 b/drivers/clocksource/Makefile |1 b/drivers/clocksource/qcom-timer.c | 330 27 files changed, 957 insertions(+), 1005 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2 0/5] 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 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/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/arch/arm/mach-qcom/smp.c | 137 +++ b/drivers/clocksource/Kconfig |4 b/drivers/clocksource/Makefile |1 b/drivers/clocksource/qcom-timer.c | 330 27 files changed, 957 insertions(+), 1005 deletions(-) -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 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.
Signed-off-by: Kumar Gala ga...@codeaurora.org
---
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
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 721f27f..8327f60 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -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
diff --git a/arch/arm/mach-msm/common.h b/arch/arm/mach-msm/common.h
index 33c7725..0a4899b 100644
--- a/arch/arm/mach-msm/common.h
+++ b/arch/arm/mach-msm/common.h
@@ -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;
diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c
deleted file mode 100644
index cea80fc..000
--- 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-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index 3721b31..251a91e 100644
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
@@ -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 */
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3/5] arm: qcom: Split Qualcomm support into legacy and multiplatform
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 ga...@codeaurora.org --- 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-msm/board-dt.c | 41 -- arch/arm/mach-msm/platsmp.c | 137 --- 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-qcom/Kconfig| 33 + arch/arm/mach-qcom/Makefile | 5 + arch/arm/mach-qcom/board.c| 40 ++ arch/arm/mach-qcom/scm-boot.c | 39 ++ arch/arm/mach-qcom/scm-boot.h | 22 arch/arm/mach-qcom/scm.c | 299 ++ arch/arm/mach-qcom/scm.h | 25 arch/arm/mach-qcom/smp.c | 137 +++ 21 files changed, 619 insertions(+), 619 deletions(-) delete mode 100644 arch/arm/mach-msm/board-dt.c delete mode 100644 arch/arm/mach-msm/platsmp.c delete mode 100644 arch/arm/mach-msm/scm-boot.c delete mode 100644 arch/arm/mach-msm/scm-boot.h delete mode 100644 arch/arm/mach-msm/scm.c delete mode 100644 arch/arm/mach-msm/scm.h create mode 100644 arch/arm/mach-qcom/Kconfig create mode 100644 arch/arm/mach-qcom/Makefile create mode 100644 arch/arm/mach-qcom/board.c create mode 100644 arch/arm/mach-qcom/scm-boot.c create mode 100644 arch/arm/mach-qcom/scm-boot.h create mode 100644 arch/arm/mach-qcom/scm.c create mode 100644 arch/arm/mach-qcom/scm.h create mode 100644 arch/arm/mach-qcom/smp.c diff --git a/MAINTAINERS b/MAINTAINERS index b2cf5cf..402be60 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1167,6 +1167,14 @@ L: linux-arm-ker...@lists.infradead.org (moderated for non-subscribers) W: http://www.arm.linux.org.uk/ S: Maintained +ARM/QUALCOMM SUPPORT +M: Kumar Gala ga...@codeaurora.org +M: David Brown dav...@codeaurora.org +L: linux-arm-...@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 ker...@wantstofly.org L: linux-arm-ker...@lists.infradead.org (moderated for non-subscribers) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e254198..f093f20 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/Kconfig.debug b/arch/arm/Kconfig.debug index 0531da8..4491c7b 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -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 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
[PATCH v2 0/5] 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 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/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/arch/arm/mach-qcom/smp.c | 137 +++ b/drivers/clocksource/Kconfig |4 b/drivers/clocksource/Makefile |1 b/drivers/clocksource/qcom-timer.c | 330 27 files changed, 957 insertions(+), 1005 deletions(-) -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2 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.
Signed-off-by: Kumar Gala ga...@codeaurora.org
---
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
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 721f27f..8327f60 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -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
diff --git a/arch/arm/mach-msm/common.h b/arch/arm/mach-msm/common.h
index 33c7725..0a4899b 100644
--- a/arch/arm/mach-msm/common.h
+++ b/arch/arm/mach-msm/common.h
@@ -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;
diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c
deleted file mode 100644
index cea80fc..000
--- 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-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index 3721b31..251a91e 100644
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
@@ -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 */
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2 3/5] arm: qcom: Split Qualcomm support into legacy and multiplatform
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 ga...@codeaurora.org --- 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-msm/board-dt.c | 41 -- arch/arm/mach-msm/platsmp.c | 137 --- 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-qcom/Kconfig| 33 + arch/arm/mach-qcom/Makefile | 5 + arch/arm/mach-qcom/board.c| 40 ++ arch/arm/mach-qcom/scm-boot.c | 39 ++ arch/arm/mach-qcom/scm-boot.h | 22 arch/arm/mach-qcom/scm.c | 299 ++ arch/arm/mach-qcom/scm.h | 25 arch/arm/mach-qcom/smp.c | 137 +++ 21 files changed, 619 insertions(+), 619 deletions(-) delete mode 100644 arch/arm/mach-msm/board-dt.c delete mode 100644 arch/arm/mach-msm/platsmp.c delete mode 100644 arch/arm/mach-msm/scm-boot.c delete mode 100644 arch/arm/mach-msm/scm-boot.h delete mode 100644 arch/arm/mach-msm/scm.c delete mode 100644 arch/arm/mach-msm/scm.h create mode 100644 arch/arm/mach-qcom/Kconfig create mode 100644 arch/arm/mach-qcom/Makefile create mode 100644 arch/arm/mach-qcom/board.c create mode 100644 arch/arm/mach-qcom/scm-boot.c create mode 100644 arch/arm/mach-qcom/scm-boot.h create mode 100644 arch/arm/mach-qcom/scm.c create mode 100644 arch/arm/mach-qcom/scm.h create mode 100644 arch/arm/mach-qcom/smp.c diff --git a/MAINTAINERS b/MAINTAINERS index b2cf5cf..402be60 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1167,6 +1167,14 @@ L: linux-arm-ker...@lists.infradead.org (moderated for non-subscribers) W: http://www.arm.linux.org.uk/ S: Maintained +ARM/QUALCOMM SUPPORT +M: Kumar Gala ga...@codeaurora.org +M: David Brown dav...@codeaurora.org +L: linux-arm-...@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 ker...@wantstofly.org L: linux-arm-ker...@lists.infradead.org (moderated for non-subscribers) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e254198..f093f20 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/Kconfig.debug b/arch/arm/Kconfig.debug index 0531da8..4491c7b 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -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 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
[PATCH v2 4/5] clocksource: qcom: split building of legacy vs multiplatform support
The 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.
Acked-by: Olof Johansson o...@lixom.net
Signed-off-by: Kumar Gala ga...@codeaurora.org
---
drivers/clocksource/qcom-timer.c | 23 ---
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/clocksource/qcom-timer.c b/drivers/clocksource/qcom-timer.c
index dca829e..e807acf 100644
--- a/drivers/clocksource/qcom-timer.c
+++ b/drivers/clocksource/qcom-timer.c
@@ -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(1920 / 4, 32, 7, false);
}
+#endif
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2 2/5] clocksource: qcom: Move clocksource code out of mach-msm
We intent to share the clocksource code for MSM platforms between legacy
and multiplatform supported qcom SoCs.
Acked-by: Olof Johansson o...@lixom.net
Signed-off-by: Kumar Gala ga...@codeaurora.org
---
arch/arm/mach-msm/Kconfig| 13 +-
arch/arm/mach-msm/Makefile | 1 -
arch/arm/mach-msm/timer.c| 333 ---
drivers/clocksource/Kconfig | 4 +
drivers/clocksource/Makefile | 1 +
drivers/clocksource/qcom-timer.c | 329 ++
6 files changed, 339 insertions(+), 342 deletions(-)
delete mode 100644 arch/arm/mach-msm/timer.c
create mode 100644 drivers/clocksource/qcom-timer.c
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 9625cf3..3c4eca7 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -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
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 8327f60..04b1bee 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -1,4 +1,3 @@
-obj-$(CONFIG_MSM_TIMER) += timer.o
obj-$(CONFIG_MSM_PROC_COMM) += clock.o
obj-$(CONFIG_MSM_VIC) += irq-vic.o
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
deleted file mode 100644
index fd16449..000
--- a/arch/arm/mach-msm/timer.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- *
- * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2009-2012, 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
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-#include linux/clocksource.h
-#include linux/clockchips.h
-#include linux/cpu.h
-#include linux/init.h
-#include linux/interrupt.h
-#include linux/irq.h
-#include linux/io.h
-#include linux/of.h
-#include linux/of_address.h
-#include linux/of_irq.h
-#include linux/sched_clock.h
-
-#include asm/mach/time.h
-
-#include common.h
-
-#define TIMER_MATCH_VAL0x
-#define TIMER_COUNT_VAL0x0004
-#define TIMER_ENABLE 0x0008
-#define TIMER_ENABLE_CLR_ON_MATCH_EN BIT(1)
-#define TIMER_ENABLE_ENBIT(0)
-#define TIMER_CLEAR0x000C
-#define DGT_CLK_CTL0x10
-#define DGT_CLK_CTL_DIV_4 0x3
-#define TIMER_STS_GPT0_CLR_PENDBIT(10)
-
-#define GPT_HZ 32768
-
-#define MSM_DGT_SHIFT 5
-
-static void __iomem *event_base;
-static void __iomem *sts_base;
-
-static irqreturn_t msm_timer_interrupt(int irq, void *dev_id)
-{
- struct clock_event_device *evt = dev_id;
- /* Stop the timer tick */
- if (evt-mode == CLOCK_EVT_MODE_ONESHOT) {
- u32 ctrl = readl_relaxed(event_base + TIMER_ENABLE);
- ctrl = ~TIMER_ENABLE_EN;
- writel_relaxed(ctrl, event_base + TIMER_ENABLE);
- }
- evt-event_handler(evt);
- return IRQ_HANDLED;
-}
-
-static int msm_timer_set_next_event(unsigned long cycles,
- struct clock_event_device *evt)
-{
- u32 ctrl = readl_relaxed(event_base + TIMER_ENABLE);
-
- ctrl = ~TIMER_ENABLE_EN;
- writel_relaxed(ctrl, event_base + TIMER_ENABLE);
-
- writel_relaxed(ctrl, event_base + TIMER_CLEAR);
- writel_relaxed(cycles, event_base + TIMER_MATCH_VAL);
-
- if (sts_base)
- while (readl_relaxed(sts_base) TIMER_STS_GPT0_CLR_PEND
[PATCH v2 5/5] ARM: qcom: Rename various msm prefixed functions to qcom
As 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.
Signed-off-by: Kumar Gala ga...@codeaurora.org
---
arch/arm/mach-qcom/board.c | 4 ++--
arch/arm/mach-qcom/smp.c | 22 +++---
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-qcom/board.c b/arch/arm/mach-qcom/board.c
index 4529f6b..830f69c 100644
--- a/arch/arm/mach-qcom/board.c
+++ b/arch/arm/mach-qcom/board.c
@@ -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
diff --git a/arch/arm/mach-qcom/smp.c b/arch/arm/mach-qcom/smp.c
index 67823a7..9c53ea7 100644
--- a/arch/arm/mach-qcom/smp.c
+++ b/arch/arm/mach-qcom/smp.c
@@ -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
};
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 2/5] clocksource: qcom: Move clocksource code out of mach-msm
We intent to share the clocksource code for MSM platforms between legacy
and multiplatform supported qcom SoCs.
Acked-by: Olof Johansson o...@lixom.net
Signed-off-by: Kumar Gala ga...@codeaurora.org
---
arch/arm/mach-msm/Kconfig| 13 +-
arch/arm/mach-msm/Makefile | 1 -
arch/arm/mach-msm/timer.c| 333 ---
drivers/clocksource/Kconfig | 4 +
drivers/clocksource/Makefile | 1 +
drivers/clocksource/qcom-timer.c | 329 ++
6 files changed, 339 insertions(+), 342 deletions(-)
delete mode 100644 arch/arm/mach-msm/timer.c
create mode 100644 drivers/clocksource/qcom-timer.c
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 9625cf3..3c4eca7 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -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
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 8327f60..04b1bee 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -1,4 +1,3 @@
-obj-$(CONFIG_MSM_TIMER) += timer.o
obj-$(CONFIG_MSM_PROC_COMM) += clock.o
obj-$(CONFIG_MSM_VIC) += irq-vic.o
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
deleted file mode 100644
index fd16449..000
--- a/arch/arm/mach-msm/timer.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- *
- * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2009-2012, 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
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-#include linux/clocksource.h
-#include linux/clockchips.h
-#include linux/cpu.h
-#include linux/init.h
-#include linux/interrupt.h
-#include linux/irq.h
-#include linux/io.h
-#include linux/of.h
-#include linux/of_address.h
-#include linux/of_irq.h
-#include linux/sched_clock.h
-
-#include asm/mach/time.h
-
-#include common.h
-
-#define TIMER_MATCH_VAL0x
-#define TIMER_COUNT_VAL0x0004
-#define TIMER_ENABLE 0x0008
-#define TIMER_ENABLE_CLR_ON_MATCH_EN BIT(1)
-#define TIMER_ENABLE_ENBIT(0)
-#define TIMER_CLEAR0x000C
-#define DGT_CLK_CTL0x10
-#define DGT_CLK_CTL_DIV_4 0x3
-#define TIMER_STS_GPT0_CLR_PENDBIT(10)
-
-#define GPT_HZ 32768
-
-#define MSM_DGT_SHIFT 5
-
-static void __iomem *event_base;
-static void __iomem *sts_base;
-
-static irqreturn_t msm_timer_interrupt(int irq, void *dev_id)
-{
- struct clock_event_device *evt = dev_id;
- /* Stop the timer tick */
- if (evt-mode == CLOCK_EVT_MODE_ONESHOT) {
- u32 ctrl = readl_relaxed(event_base + TIMER_ENABLE);
- ctrl = ~TIMER_ENABLE_EN;
- writel_relaxed(ctrl, event_base + TIMER_ENABLE);
- }
- evt-event_handler(evt);
- return IRQ_HANDLED;
-}
-
-static int msm_timer_set_next_event(unsigned long cycles,
- struct clock_event_device *evt)
-{
- u32 ctrl = readl_relaxed(event_base + TIMER_ENABLE);
-
- ctrl = ~TIMER_ENABLE_EN;
- writel_relaxed(ctrl, event_base + TIMER_ENABLE);
-
- writel_relaxed(ctrl, event_base + TIMER_CLEAR);
- writel_relaxed(cycles, event_base + TIMER_MATCH_VAL);
-
- if (sts_base)
- while (readl_relaxed(sts_base) TIMER_STS_GPT0_CLR_PEND
Re: [PATCH v2 1/5] ARM: msm: kill off hotplug.c
On Feb 4, 2014, at 5:07 PM, Stephen Boyd sb...@codeaurora.org wrote:
On 02/04, Kumar Gala wrote:
diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index 3721b31..251a91e 100644
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
@@ -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)
We shouldn't need __ref anymore either right?
I think we might as cpu_die is still marked __ref so I think we need it.
+{
+wfi();
+}
+#endif
+
static inline int get_core_count(void)
{
/* 1 + the PART[1:0] field of MIDR */
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line unsubscribe linux-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by
The Linux Foundation
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2 2/5] clocksource: qcom: Move clocksource code out of mach-msm
On Feb 4, 2014, at 5:09 PM, Stephen Boyd sb...@codeaurora.org wrote: On 02/04, Kumar Gala wrote: We intent to share the clocksource code for MSM platforms between legacy s/intent/intend/ and multiplatform supported qcom SoCs. Acked-by: Olof Johansson o...@lixom.net Signed-off-by: Kumar Gala ga...@codeaurora.org diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index cd6950f..81caa16 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -140,3 +140,7 @@ config VF_PIT_TIMER bool help Support for Period Interrupt Timer on Freescale Vybrid Family SoCs. + +config CLKSRC_QCOM +bool +depends on ARCH_MSM It would be a a little less noisy if you left this as MSM_TIMER (msm is all over the code in that file anyway). Also, why do we care about depending on ARCH_MSM here? This is a hidden Kconfig option anyway. I will drop the depends, but not sure what point in leaving this as MSM_TIMER. - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/4] arm: qcom: Split Qualcomm support into legacy and multiplatform
On Jan 31, 2014, at 1:34 PM, Arnd Bergmann 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 -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/4] arm: qcom: Split Qualcomm support into legacy and multiplatform
On Jan 31, 2014, at 1:20 PM, Arnd Bergmann 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
>> ---
>> 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
--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by
The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/4] arm: qcom: Split Qualcomm support into legacy and multiplatform
On Jan 31, 2014, at 1:20 PM, Arnd Bergmann a...@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 ga...@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
--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by
The Linux Foundation
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/4] arm: qcom: Split Qualcomm support into legacy and multiplatform
On Jan 31, 2014, at 1:34 PM, Arnd Bergmann a...@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 -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 1/4] clocksource: qcom: Move clocksource code out of mach-msm
We intent to share the clocksource code for MSM platforms between legacy and multiplatform supported qcom SoCs. Signed-off-by: Kumar Gala --- arch/arm/mach-msm/Kconfig | 13 + arch/arm/mach-msm/Makefile | 1 - drivers/clocksource/Kconfig | 4 drivers/clocksource/Makefile| 1 + .../mach-msm/timer.c => drivers/clocksource/qcom-timer.c| 6 +- 5 files changed, 11 insertions(+), 14 deletions(-) rename arch/arm/mach-msm/timer.c => drivers/clocksource/qcom-timer.c (98%) diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index 9625cf3..3c4eca7 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -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 diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index 721f27f..4baff13 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -1,4 +1,3 @@ -obj-$(CONFIG_MSM_TIMER) += timer.o obj-$(CONFIG_MSM_PROC_COMM) += clock.o obj-$(CONFIG_MSM_VIC) += irq-vic.o diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index cd6950f..81caa16 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -140,3 +140,7 @@ config VF_PIT_TIMER bool help Support for Period Interrupt Timer on Freescale Vybrid Family SoCs. + +config CLKSRC_QCOM + bool + depends on ARCH_MSM diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index c7ca50a..2e0c0cc 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -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 diff --git a/arch/arm/mach-msm/timer.c b/drivers/clocksource/qcom-timer.c similarity index 98% rename from arch/arm/mach-msm/timer.c rename to drivers/clocksource/qcom-timer.c index fd16449..dca829e 100644 --- a/arch/arm/mach-msm/timer.c +++ b/drivers/clocksource/qcom-timer.c @@ -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 #include -#include - -#include "common.h" - #define TIMER_MATCH_VAL0x #define TIMER_COUNT_VAL0x0004 #define TIMER_ENABLE 0x0008 -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 2/4] arm: qcom: Split Qualcomm support into legacy and multiplatform
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
---
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-ker...@lists.infradead.org (moderated
for non-subscribers)
W: http://www.arm.linux.org.uk/
S: Maintained
+ARM/QUALCOMM SUPPORT
+M: David Brown
+M: Kumar Gala
+L: linux-arm-...@vger.kernel.org
+S: Maintained
+F: arch/arm/mach-qcom/
+
ARM/RADISYS ENP2611 MACHINE SUPPORT
M: Lennert Buytenhek
L: linux-arm-ker...@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
[PATCH 4/4] tty: serial: msm: Enable building msm_serial for ARCH_QCOM
We've split Qualcomm MSM support into legacy and multiplatform. So add the ability to build the serial driver on the newer ARCH_QCOM multiplatform. Signed-off-by: Kumar Gala --- Greg, If we can get an ack on this, will probably go via the arm-soc tree to keep the patchset together. thanks - k drivers/tty/serial/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index a3815ea..ce9b12d 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -1024,7 +1024,7 @@ config SERIAL_SGI_IOC3 config SERIAL_MSM bool "MSM on-chip serial port support" - depends on ARCH_MSM + depends on ARCH_MSM || ARCH_QCOM select SERIAL_CORE config SERIAL_MSM_CONSOLE -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3/4] clocksource: qcom: split building of legacy vs multiplatform support
The 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.
Signed-off-by: Kumar Gala
---
drivers/clocksource/qcom-timer.c | 23 ---
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/clocksource/qcom-timer.c b/drivers/clocksource/qcom-timer.c
index dca829e..e807acf 100644
--- a/drivers/clocksource/qcom-timer.c
+++ b/drivers/clocksource/qcom-timer.c
@@ -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 = _clocksource;
@@ -327,3 +327,4 @@ void __init qsd8x50_timer_init(void)
return;
msm_timer_init(1920 / 4, 32, 7, false);
}
+#endif
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 0/4] Split mach-msm into legacy and mach-qcom (multiplatform)
This is the starts of splitting the Qualcomm MSM platform into legacy support that we will not try and convert to multiplatform and multiplatform support. These patches are based on the 'CPU enable method based SMP' patches. I wanted to get these out for review, will add a few more patches for defconfig updates/additions, as well as some additional driver being enabled for ARCH_QCOM. - k arch/arm/mach-msm/board-dt.c | 27 -- arch/arm/mach-msm/hotplug.c| 51 arch/arm/mach-msm/platsmp.c| 371 arch/arm/mach-msm/scm-boot.c | 39 --- arch/arm/mach-msm/scm-boot.h | 24 -- arch/arm/mach-msm/scm.c| 299 - arch/arm/mach-msm/scm.h| 25 -- arch/arm/mach-msm/timer.c | 333 b/MAINTAINERS |7 b/arch/arm/Kconfig |7 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-qcom/Kconfig | 34 +++ b/arch/arm/mach-qcom/Makefile |5 b/arch/arm/mach-qcom/board.c | 26 ++ b/arch/arm/mach-qcom/scm-boot.c| 39 +++ b/arch/arm/mach-qcom/scm-boot.h| 24 ++ b/arch/arm/mach-qcom/scm.c | 299 + b/arch/arm/mach-qcom/scm.h | 25 ++ b/arch/arm/mach-qcom/smp.c | 380 + b/drivers/clocksource/Kconfig |4 b/drivers/clocksource/Makefile |1 b/drivers/clocksource/qcom-timer.c | 330 b/drivers/tty/serial/Kconfig |2 26 files changed, 1188 insertions(+), 1233 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 0/4] Split mach-msm into legacy and mach-qcom (multiplatform)
This is the starts of splitting the Qualcomm MSM platform into legacy support that we will not try and convert to multiplatform and multiplatform support. These patches are based on the 'CPU enable method based SMP' patches. I wanted to get these out for review, will add a few more patches for defconfig updates/additions, as well as some additional driver being enabled for ARCH_QCOM. - k arch/arm/mach-msm/board-dt.c | 27 -- arch/arm/mach-msm/hotplug.c| 51 arch/arm/mach-msm/platsmp.c| 371 arch/arm/mach-msm/scm-boot.c | 39 --- arch/arm/mach-msm/scm-boot.h | 24 -- arch/arm/mach-msm/scm.c| 299 - arch/arm/mach-msm/scm.h| 25 -- arch/arm/mach-msm/timer.c | 333 b/MAINTAINERS |7 b/arch/arm/Kconfig |7 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-qcom/Kconfig | 34 +++ b/arch/arm/mach-qcom/Makefile |5 b/arch/arm/mach-qcom/board.c | 26 ++ b/arch/arm/mach-qcom/scm-boot.c| 39 +++ b/arch/arm/mach-qcom/scm-boot.h| 24 ++ b/arch/arm/mach-qcom/scm.c | 299 + b/arch/arm/mach-qcom/scm.h | 25 ++ b/arch/arm/mach-qcom/smp.c | 380 + b/drivers/clocksource/Kconfig |4 b/drivers/clocksource/Makefile |1 b/drivers/clocksource/qcom-timer.c | 330 b/drivers/tty/serial/Kconfig |2 26 files changed, 1188 insertions(+), 1233 deletions(-) -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
