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

Commit 597a63c9 authored by yungwenpeng(55451)'s avatar yungwenpeng(55451) Committed by Gerrit Code Review
Browse files

Merge "Merge branch qc into vanilla" into 8901-fairphone-p-vanilla

parents 84619b3d 06aa916e

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

+4 −0
Original line number Diff line number Diff line
@@ -143,6 +143,9 @@ SoCs: 
- SDA429

  compatible = "qcom,sda429"



- QM215

  compatible = "qcom, qm215"



- MDM9640

  compatible = "qcom,mdm9640"
@@ -364,6 +367,7 @@ compatible = "qcom,sdm439-mtp" 
compatible = "qcom,sdm439-qrd"

compatible = "qcom,sda439-cdp"

compatible = "qcom,sda439-mtp"

compatible = "qcom,qm215-qrd"

compatible = "qcom,msm8953-rumi"

compatible = "qcom,msm8953-sim"

compatible = "qcom,msm8953-cdp"

Documentation/devicetree/bindings/input/touchscreen/synaptics_dsxv26_i2c.txt

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ Optional property: 
 - synaptics,bus-lpm-cur-uA	   : I2C bus idle mode current setting.

 - synaptics,swap-axes		   : specify whether to swap axes.

 - synaptics,resume-in-workqueue	: specify whether to defer the resume to workqueue.

 - synaptics,fw-name		   : name of firmware .img file in /lib/firmware

 - clock-names			: Clock names used for secure touch. They are: "iface_clk", "core_clk"

 - clocks			: Defined if 'clock-names' DT property is defined. These clocks

				  are associated with the underlying I2C bus.

Documentation/devicetree/bindings/pinctrl/qcom,msm8917-pinctrl.txt

+8 −1
Original line number Diff line number Diff line
@@ -11,7 +11,13 @@ MSM8917 platform. 
- reg:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: the base address and size of the TLMM register space.

	Definition: the base address and size of the TLMM register space

		    provided as "pinctrl_regs".



- reg-names:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: Provides labels for the reg property.



- interrupts:

	Usage: required
@@ -167,6 +173,7 @@ Example: 
	tlmm: pinctrl@1000000 {

		compatible = "qcom,msm8917-pinctrl";

		reg = <0x1000000 0x300000>;

		reg-names = "pinctrl_regs";

		interrupts = <0 208 0>;

		gpio-controller;

		#gpio-cells = <2>;

Documentation/devicetree/bindings/pinctrl/qcom,msm8937-pinctrl.txt

+8 −1
Original line number Diff line number Diff line
@@ -11,7 +11,13 @@ MSM8937 platform. 
- reg:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: the base address and size of the TLMM register space.

	Definition: the base address and size of the TLMM register space

		    provided as "pinctrl_regs".



- reg-names:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: Provides labels for the reg property.



- interrupts:

	Usage: required
@@ -167,6 +173,7 @@ Example: 
	tlmm: pinctrl@1000000 {

		compatible = "qcom,msm8937-pinctrl";

		reg = <0x1000000 0x300000>;

		reg-names = "pinctrl_regs";

		interrupts = <0 208 0>;

		gpio-controller;

		#gpio-cells = <2>;

Documentation/devicetree/bindings/pinctrl/qcom,msm8953-pinctrl.txt

+8 −1
Original line number Diff line number Diff line
@@ -11,7 +11,13 @@ MSM8953 platform. 
- reg:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: the base address and size of the TLMM register space.

	Definition: the base address and size of the TLMM register space

		    provided as "pinctrl_regs".



- reg-names:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: Provides labels for the reg property.



- interrupts:

	Usage: required
@@ -173,6 +179,7 @@ Example: 
	tlmm: pinctrl@1000000 {

		compatible = "qcom,msm8953-pinctrl";

		reg = <0x1000000 0x300000>;

		reg-names = "pinctrl_regs";

		interrupts = <0 208 0>;

		gpio-controller;

		#gpio-cells = <2>;