Commit 4580cb8a authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Merge "qcom SoC changes for v4.1" from Kumar Gala:

Qualcomm ARM Based SoC Updates for v4.1

* Merged the based Qualcomm SCM and SCM boot support
* Cleaned up SCM interface to only expose functional SCM APIs
* Moved Qualcomm SCM code into drivers/firmware
* Updated the SCM APIs for setting cpu cold and warm boot addresses
* Added support for ADM CRCI muxing

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

:
  soc: qcom: gsbi: Add support for ADM CRCI muxing
  firmware: qcom: scm: Support cpu power down through SCM
  firmware: qcom: scm: Add qcom_scm_set_warm_boot_addr function
  firmware: qcom: scm: Clean cold boot entry to export only the API
  firmware: qcom: scm: Move the scm driver to drivers/firmware
  ARM: qcom: Prep scm code for move to drivers/firmware
  ARM: qcom: Cleanup scm interface to only export what is needed
  ARM: qcom: Merge scm and scm boot code together

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3f9b66b3 e5fdad68

Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt

+20 −10
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ configuration settings. The mode setting will govern the input/output mode of 
the 4 GSBI IOs.



Required properties:

- compatible: must contain "qcom,gsbi-v1.0.0" for APQ8064/IPQ8064

- compatible:	Should contain "qcom,gsbi-v1.0.0"

- cell-index:	Should contain the GSBI index

- reg: Address range for GSBI registers

- clocks: required clock

- clock-names: must contain "iface" entry
@@ -16,6 +17,8 @@ Required properties: 
Optional properties:

- qcom,crci : indicates CRCI MUX value for QUP CRCI ports.  Please reference

  dt-bindings/soc/qcom,gsbi.h for valid CRCI mux values.

- syscon-tcsr: indicates phandle of TCSR syscon node.  Required if child uses

  dma.



Required properties if child node exists:

- #address-cells: Must be 1
@@ -39,6 +42,7 @@ Example for APQ8064: 


	gsbi4@16300000 {

		compatible = "qcom,gsbi-v1.0.0";

		cell-index = <4>;

		reg = <0x16300000 0x100>;

		clocks = <&gcc GSBI4_H_CLK>;

		clock-names = "iface";
@@ -48,6 +52,8 @@ Example for APQ8064: 
		qcom,mode = <GSBI_PROT_I2C_UART>;

		qcom,crci = <GSBI_CRCI_QUP>;



		syscon-tcsr = <&tcsr>;



		/* child nodes go under here */



		i2c_qup4: i2c@16380000 {
@@ -76,3 +82,7 @@ Example for APQ8064: 
		};

	};



	tcsr: syscon@1a400000 {

		compatible = "qcom,apq8064-tcsr", "syscon";

		reg = <0x1a400000 0x100>;

	};

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1317,6 +1317,7 @@ L: linux-soc@vger.kernel.org 
S:	Maintained

F:	arch/arm/mach-qcom/

F:	drivers/soc/qcom/

F:	drivers/firmware/qcom_scm.c

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git



ARM/RADISYS ENP2611 MACHINE SUPPORT

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -2160,6 +2160,8 @@ source "net/Kconfig" 


source "drivers/Kconfig"



source "drivers/firmware/Kconfig"



source "fs/Kconfig"



source "arch/arm/Kconfig.debug"

arch/arm/mach-qcom/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -22,7 +22,4 @@ config ARCH_MSM8974 
	bool "Enable support for MSM8974"

	select HAVE_ARM_ARCH_TIMER



config QCOM_SCM

	bool



endif

arch/arm/mach-qcom/Makefile

+0 −3
Original line number Diff line number Diff line 
obj-y			:= board.o

obj-$(CONFIG_SMP)	+= platsmp.o
 
obj-$(CONFIG_QCOM_SCM)	+= scm.o scm-boot.o



CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)

CRA Git | Maintained and supported by SUSTech CRA and CCSE