Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 567acf8e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'qcom-soc-for-3.15' of... 

Merge tag 'qcom-soc-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/soc

Merge "Qualcomm ARM Based SoC Updates for v3.15" from Kumar Gala:

* 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

* tag 'qcom-soc-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom

:
  ARM: qcom: Add SMP support for KPSSv2
  ARM: qcom: Add SMP support for KPSSv1
  devicetree: bindings: Document qcom,saw2 node
  devicetree: bindings: Document qcom,kpss-acc
  devicetree: bindings: Document Krait/Scorpion cpus and enable-method
  ARM: qcom: Re-organize platsmp to make it extensible
  ARM: Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp
  ARM: qcom: Rename various msm prefixed functions to qcom
  clocksource: qcom: split building of legacy vs multiplatform support
  ARM: qcom: Split Qualcomm support into legacy and multiplatform
  clocksource: qcom: Move clocksource code out of mach-msm
  ARM: msm: kill off hotplug.c
  ARM: msm: Remove pen_release usage
  ARM: dts: msm: split out msm8660 and msm8960 soc into dts include

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6d0abeca 6990c132

Documentation/devicetree/bindings/arm/cpus.txt

+24 −1
Original line number Diff line number Diff line
@@ -180,7 +180,11 @@ nodes to be present and contain the properties described below. 
			  be one of:

			     "spin-table"

			     "psci"

			# On ARM 32-bit systems this property is optional.

			# On ARM 32-bit systems this property is optional and

			  can be one of:

			    "qcom,gcc-msm8660"

			    "qcom,kpss-acc-v1"

			    "qcom,kpss-acc-v2"



	- cpu-release-addr

		Usage: required for systems that have an "enable-method"
@@ -191,6 +195,21 @@ nodes to be present and contain the properties described below. 
			  property identifying a 64-bit zero-initialised

			  memory location.



	- qcom,saw

		Usage: required for systems that have an "enable-method"

		       property value of "qcom,kpss-acc-v1" or

		       "qcom,kpss-acc-v2"

		Value type: <phandle>

		Definition: Specifies the SAW[1] node associated with this CPU.



	- qcom,acc

		Usage: required for systems that have an "enable-method"

		       property value of "qcom,kpss-acc-v1" or

		       "qcom,kpss-acc-v2"

		Value type: <phandle>

		Definition: Specifies the ACC[2] node associated with this CPU.





Example 1 (dual-cluster big.LITTLE system 32-bit):



	cpus {
@@ -382,3 +401,7 @@ cpus { 
		cpu-release-addr = <0 0x20000000>;

	};

};



--

[1] arm/msm/qcom,saw2.txt

[2] arm/msm/qcom,kpss-acc.txt

Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt

0 → 100644
+30 −0
Original line number Diff line number Diff line 
Krait Processor Sub-system (KPSS) Application Clock Controller (ACC)



The KPSS ACC provides clock, power domain, and reset control to a Krait CPU.

There is one ACC register region per CPU within the KPSS remapped region as

well as an alias register region that remaps accesses to the ACC associated

with the CPU accessing the region.



PROPERTIES



- compatible:

	Usage: required

	Value type: <string>

	Definition: should be one of:

			"qcom,kpss-acc-v1"

			"qcom,kpss-acc-v2"



- reg:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: the first element specifies the base address and size of

		    the register region. An optional second element specifies

		    the base address and size of the alias register region.



Example:



	clock-controller@2088000 {

		compatible = "qcom,kpss-acc-v2";

		reg = <0x02088000 0x1000>,

		      <0x02008000 0x1000>;

	};

Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 
SPM AVS Wrapper 2 (SAW2)



The SAW2 is a wrapper around the Subsystem Power Manager (SPM) and the

Adaptive Voltage Scaling (AVS) hardware. The SPM is a programmable

micro-controller that transitions a piece of hardware (like a processor or

subsystem) into and out of low power modes via a direct connection to

the PMIC. It can also be wired up to interact with other processors in the

system, notifying them when a low power state is entered or exited.



PROPERTIES



- compatible:

	Usage: required

	Value type: <string>

	Definition: shall contain "qcom,saw2". A more specific value should be

		    one of:

			 "qcom,saw2-v1"

			 "qcom,saw2-v1.1"

			 "qcom,saw2-v2"

			 "qcom,saw2-v2.1"



- reg:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: the first element specifies the base address and size of

		    the register region. An optional second element specifies

		    the base address and size of the alias register region.





Example:



	regulator@2099000 {

		compatible = "qcom,saw2";

		reg = <0x02099000 0x1000>, <0x02009000 0x1000>;

	};

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -1167,6 +1167,14 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
W:	http://www.arm.linux.org.uk/

S:	Maintained



ARM/QUALCOMM SUPPORT

M:	Kumar Gala <galak@codeaurora.org>

M:	David Brown <davidb@codeaurora.org>

L:	linux-arm-msm@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 <kernel@wantstofly.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -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"