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

Commit 2c30f1f0 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge commit '6f516dcd' into dev/msm-4.14-display"

parents 68272a2c 1a0d9146

Documentation/devicetree/bindings/arm/msm/msm.txt

+8 −0
Original line number Diff line number Diff line
@@ -106,6 +106,12 @@ SoCs: 
- SDA429W

  compatible = "qcom,sda429w"



- QCM6125

  compatible = "qcom,qcm6125"



- QCS6125

  compatible = "qcom,qcs6125"



Generic board variants:



- CDP device:
@@ -299,3 +305,5 @@ compatible = "qcom,sda429w-wdp" 
compatible = "qcom,sda429-wdp"

compatible = "qcom,sdm429w-wdp"

compatible = "qcom,sdm429-wdp"

compatible = "qcom,qcm6125"

compatible = "qcom,qcs6125"

Documentation/devicetree/bindings/arm/msm/sdx-ext-ipc.txt

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ Optional named gpio properties: 


- qcom,ap2mdm-status2-gpio: gpio for APQ to indicate graceful shutdown to modem.



- qcom,default-policy-nop: Set default policy from PANIC to NOP.



Example:

	sdx_ext_ipc: qcom,sdx_ext_ipc {

		compatible = "qcom,sdx-ext-ipc";

Documentation/devicetree/bindings/interrupt-controller/qti,mpm.txt

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ Properties: 
		"qcom,mpm-gic-trinket"

		"qcom,mpm-gic-mdm9607"

		"qcom,mpm-gic-sdm660"

		"qcom,mpm-gic-sdm429"



- interrupts:

	Usage: required
@@ -85,6 +86,7 @@ properties: 
		"qcom,mpm-gpio-trinket",

		"qcom,mpm-gpio-mdm9607"

		"qcom,mpm-gpio-sdm660"

		"qcom,mpm-gpio-sdm429"



- interrupt-parent:

	Usage: required

Documentation/devicetree/bindings/platform/msm/ipa.txt

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ memory allocation over a PCIe bridge 
				1 (override scm call as though it returned true), and

				2 (override scm call as though it returned false)

- qcom,use-xbl-boot: Boolean to indicate XBL boot loading for IPA FW

- qcom,manual-fw-load: Manually load ipa fws by writing 1 to ipa dev node



IPA pipe sub nodes (A2 static pipes configurations):

arch/arm/Kconfig

+0 −23
Original line number Diff line number Diff line
@@ -1778,29 +1778,6 @@ config ARM_MODULE_PLTS 


source "mm/Kconfig"



choice

	prompt "Virtual Memory Reclaim"

	default ENABLE_VMALLOC_SAVING

	help

	  Select the method of reclaiming virtual memory



config ENABLE_VMALLOC_SAVING

	bool "Reclaim memory for each subsystem"

	help

	  Enable this config to reclaim the virtual space belonging

	  to any subsystem which is expected to have a lifetime of

	  the entire system. This feature allows lowmem to be non-

	  contiguous.



config NO_VM_RECLAIM

	bool "Do not reclaim memory"

	help

	  Do not reclaim any memory. This might result in less lowmem

	  and wasting virtual memory space which could otherwise be

	  reclaimed by using any of the other two config options.



endchoice



config FORCE_MAX_ZONEORDER

	int "Maximum zone order"

	default "12" if SOC_AM33XX