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

Commit 5685721c authored by shaohanlin's avatar shaohanlin
Browse files

Merge branch gms into release

parents 744b1696 7a2dadb1

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

+4 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ SoCs: 
- MSM8917

  compatible = "qcom,msm8917"



- MSM8940

  compatible = "qcom,msm8940"



- MSM8936

  compatible = "qcom,msm8936"
@@ -279,6 +282,7 @@ compatible = "qcom,msm8917-mtp" 
compatible = "qcom,msm8917-rumi"

compatible = "qcom,msm8917-qrd"

compatible = "qcom,msm8917-qrd-sku5"

compatible = "qcom,msm8940-mtp"

compatible = "qcom,msm8926-cdp"

compatible = "qcom,msm8926-mtp"

compatible = "qcom,msm8926-qrd"

Documentation/devicetree/bindings/power/supply/qcom/qpnp-fg-gen3.txt

+30 −0
Original line number Diff line number Diff line
@@ -179,6 +179,14 @@ First Level Node - FG Gen3 device 
		    Element 0 - Retry value for timer

		    Element 1 - Maximum value for timer



- qcom,fg-esr-timer-shutdown

	Usage:      optional

	Value type: <prop-encoded-array>

	Definition: Number of cycles between ESR pulses at/after shutdwon.This is

		    defined when TWM (traditional watch mode) is supported.

		    Element 0 - Retry value for timer

		    Element 1 - Maximum value for timer



- qcom,fg-esr-pulse-thresh-ma

	Usage:      optional

	Value type: <u32>
@@ -458,6 +466,28 @@ First Level Node - FG Gen3 device 
	Value type: <u32>

	Definition: The delay in ms for FG to enable BMD after reading RID.



- qcom,fg-use-sw-esr

	Usage:      optional

	Value type: <empty>

	Definition: A boolean property when defined uses software based

		    ESR during charging.



- qcom,fg-disable-esr-pull-dn

	Usage:      optional

	Value type: <empty>

	Definition: A boolean property which disables ESR pull-down.

		    This is to be used for debug purposes only.



- qcom,fg-sync-sleep-threshold-ma

	Usage:      optional

	Value type: <u32>

	Definition: The minimum battery current for FG to enter into sync-sleep.



- qcom,fg-disable-in-twm

	Usage:      optional

	Value type: <empty>

	Definition: A boolean property which disables FG during TWM entry.



==========================================================

Second Level Nodes - Peripherals managed by FG Gen3 driver

==========================================================

Documentation/devicetree/bindings/power/supply/qcom/qpnp-qg.txt

+14 −0
Original line number Diff line number Diff line
@@ -308,6 +308,20 @@ First Level Node - QGAUGE device 
	Definition: Boolean property to support external-rsense based

		    configuration.



- qcom,shutdown-temp-diff

	Usage:      optional

	Value type: <u32>

	Definition: The allowed battery temperature in deci-degree difference

		    between shutdown and power-on to continue with the shutdown

		    SOC. If not specified the default value is 6 degrees C (60).



- qcom,shutdown-soc-threshold

	Usage:      optional

	Value type: <u32>

	Definition: The SOC difference allowed between PON and SHUTDOWN SOC

		    for the shutdown SOC to be used. If the difference is

		    beyond this value the PON SOC is used.



==========================================================

Second Level Nodes - Peripherals managed by QGAUGE driver

==========================================================

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1781,7 +1781,7 @@ source "mm/Kconfig" 


choice

	prompt "Virtual Memory Reclaim"

	default NO_VM_RECLAIM

	default ENABLE_VMALLOC_SAVING

	help

	  Select the method of reclaiming virtual memory

arch/arm/configs/msm8909w-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ CONFIG_BPF_SYSCALL=y 
CONFIG_EMBEDDED=y

CONFIG_PROFILING=y

CONFIG_OPROFILE=m

CONFIG_CC_STACKPROTECTOR_REGULAR=y

CONFIG_CC_STACKPROTECTOR_STRONG=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y