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

Commit b299e1fd authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 68f957fa on remote branch 

Change-Id: If7065c59889f85274d47c3ac4101e76866149413
parents a71f0d5b 68f957fa

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

+4 −4
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ SoCs: 
  compatible = "qcom,apqtitanium"



- APQ8998

  compatible = "qcom,apq8998"

  compatible = "qcom,apq8098"



- MDM9630

  compatible = "qcom,mdm9630"
@@ -195,9 +195,9 @@ compatible = "qcom,apq8037-cdp" 
compatible = "qcom,apq8037-mtp"

compatible = "qcom,apqtitanium-cdp"

compatible = "qcom,apqtitanium-mtp"

compatible = "qcom,apq8998-cdp"

compatible = "qcom,apq8998-mtp"

compatible = "qcom,apq8998-qrd"

compatible = "qcom,apq8098-cdp"

compatible = "qcom,apq8098-mtp"

compatible = "qcom,apq8098-qrd"

compatible = "qcom,mdm9630-cdp"

compatible = "qcom,mdm9630-mtp"

compatible = "qcom,mdm9630-sim"

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

+8 −0
Original line number Diff line number Diff line
@@ -96,6 +96,14 @@ First Level Node - FG Gen3 device 
		    This value has to be specified in negative values for

		    the charging current.



- qcom,fg-chg-term-base-current

	Usage:      optional

	Value type: <u32>

	Definition: Battery current (in mA) upper boundary at which the fuel

		    gauge will issue an end of charge during discharging. If

		    this property is not specified, then the default value used

		    will be 75mA.



- qcom,fg-delta-soc-thr

	Usage:      optional

	Value type: <u32>

Documentation/devicetree/bindings/power/supply/qcom/smb138x-charger.txt

+5 −3
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ Charger specific properties: 
  Definition: String which indicates the charging mode. Can be one of the

	      following:

              Standalone/Parallel Master	- "qcom,smb138x-charger"

	      Parallel Slave			- "qcom,smb138x-parallel-slave"

	      smb138x Parallel Slave		- "qcom,smb138x-parallel-slave"

	      smb1355 Parallel Slave		- "qcom,smb1355-parallel-slave",



- qcom,pmic-revid

  Usage:      required
@@ -35,7 +36,8 @@ Charger specific properties: 
  Usage:      optional

  Value type: <u32>

  Definition: Specifies parallel charging mode. If not specified, MID-MID

	      option is selected by default.

	      option is selected by default. Note that smb1355 can only

	      run in MID-MID configuration.



- qcom,suspend-input

  Usage:      optional
@@ -125,7 +127,7 @@ Example 
=======



smb138x_charger: qcom,smb138x-charger {

	compatible = "qcom,qpnp-smb138x-charger";

	compatible = "qcom,smb138x-charger";

	#address-cells = <1>;

	#size-cells = <1>;

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ if ARM_DMA_USE_IOMMU 
config ARM_DMA_IOMMU_ALIGNMENT

	int "Maximum PAGE_SIZE order of alignment for DMA IOMMU buffers"

	range 4 9

	default 8

	default 9

	help

	  DMA mapping framework by default aligns all buffers to the smallest

	  PAGE_SIZE order which is greater than or equal to the requested buffer

arch/arm/boot/dts/qcom/Makefile

+10 −10
Original line number Diff line number Diff line
@@ -134,19 +134,19 @@ dtb-$(CONFIG_ARCH_MSM8998) += msm8998-sim.dtb \ 
	msm8998-v2-qrd-vr1.dtb \

	msm8998-v2-qrd-skuk-evt3.dtb \

	msm8998-v2-qrd-skuk-hdk.dtb \

	apq8998-mtp.dtb \

	apq8998-cdp.dtb \

	apq8998-v2-mtp.dtb \

	apq8998-v2-cdp.dtb \

	apq8998-v2-qrd.dtb \

	apq8998-v2-qrd-skuk-hdk.dtb \

	apq8098-mtp.dtb \

	apq8098-cdp.dtb \

	apq8098-v2-mtp.dtb \

	apq8098-v2-cdp.dtb \

	apq8098-v2-qrd.dtb \

	apq8098-v2-qrd-skuk-hdk.dtb \

	msm8998-v2.1-mtp.dtb \

	msm8998-v2.1-cdp.dtb \

	msm8998-v2.1-qrd.dtb \

	apq8998-v2.1-mtp.dtb \

	apq8998-v2.1-cdp.dtb \

	apq8998-v2.1-qrd.dtb \

	apq8998-v2.1-mediabox.dtb \

	apq8098-v2.1-mtp.dtb \

	apq8098-v2.1-cdp.dtb \

	apq8098-v2.1-qrd.dtb \

	apq8098-v2.1-mediabox.dtb \

	msm8998-v2.1-interposer-sdm660-cdp.dtb \

	msm8998-v2.1-interposer-sdm660-mtp.dtb \

	msm8998-v2.1-interposer-sdm660-qrd.dtb