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

Commit ab38cca9 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge commit '70be28c9' into... 

Merge "Merge commit '70be28c9' into Topic+AU174" into dev/msm-4.9-camx
parents 86a11914 43ee3fca

Documentation/devicetree/bindings/arm/msm/qcom,osm.txt

+1 −23
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Properties: 
- compatible

	Usage:      required

	Value type: <string>

	Definition: must be "qcom,clk-cpu-osm".

	Definition: must be "qcom,clk-cpu-osm" or "qcom,clk-cpu-osm-v2".



- reg

	Usage:      required
@@ -85,24 +85,6 @@ Properties: 
		    by the OSM hardware for each supported DCVS setpoint

		    of the Performance cluster.



- qcom,l3-min-cpr-vc-binX

	Usage:	    required

	Value type: <u32>

	Definition: First virtual corner which does not use PLL post-divider

		    for the L3 clock domain.



- qcom,pwrcl-min-cpr-vc-binX

	Usage:      required

	Value type: <u32>

	Definition: First virtual corner which does not use PLL post-divider

		    for the power cluster.



- qcom,perfcl-min-cpr-vc-binX

	Usage:      required

	Value type: <u32>

	Definition: First virtual corner which does not use PLL post-divider

		    for the performance cluster.



- qcom,osm-no-tz

	Usage:      optional

	Value type: <empty>
@@ -501,10 +483,6 @@ Example: 
			<  1881600000 0x404c1462 0x00004e4e 0x2 21 >,

			<  1958400000 0x404c1566 0x00005252 0x3 22 >;



		qcom,l3-min-cpr-vc-bin0 = <7>;

		qcom,pwrcl-min-cpr-vc-bin0 = <6>;

		qcom,perfcl-min-cpr-vc-bin0 = <7>;



		qcom,up-timer =

			<1000 1000 1000>;

		qcom,down-timer =

Documentation/devicetree/bindings/arm/msm/qmp-debugfs-client.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
QMP debugfs client:

-----------------



QTI Messaging Protocol(QMP) debugfs client is an interface for clients to

send data to the Always on processor using QMP.



Required properties :

- compatible : must be "qcom,debugfs-qmp-client"

- mboxes : list of QMP mailbox phandle and channel identifier tuples.

- mbox-names : names of the listed mboxes



Example :

	qcom,qmp-client {

		compatible = "qcom,debugfs-qmp-client";

		mboxes = <&qmp_aop 0>;

		mbox-names = "aop";

	};

Documentation/devicetree/bindings/arm/msm/rdbg-smp2p.txt

+4 −1
Original line number Diff line number Diff line
@@ -2,12 +2,15 @@ Qualcomm Technologies, Inc. Remote Debugger (RDBG) driver 


Required properties:

-compatible : Should be one of

	To communicate with modem

	To communicate with adsp

		qcom,smp2pgpio_client_rdbg_2_in (inbound)

		qcom,smp2pgpio_client_rdbg_2_out (outbound)

	To communicate with modem

		qcom,smp2pgpio_client_rdbg_1_in (inbound)

		qcom,smp2pgpio_client_rdbg_1_out (outbound)

	To communicate with cdsp

		qcom,smp2pgpio_client_rdbg_5_in (inbound)

		qcom,smp2pgpio_client_rdbg_5_out (outbound)

-gpios : the relevant gpio pins of the entry.



Example:

Documentation/devicetree/bindings/cnss/icnss.txt

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ Optional properties: 
  - qcom,icnss-vadc: VADC handle for vph_pwr read APIs.

  - qcom,icnss-adc_tm: VADC handle for vph_pwr notification APIs.

  - qcom,smmu-s1-bypass: Boolean context flag to set SMMU to S1 bypass

  - qcom,wlan-msa-fixed-region: phandle, specifier pairs to children of /reserved-memory



Example:
@@ -54,6 +55,7 @@ Example: 
		   <0 140 0 /* CE10 */ >,

		   <0 141 0 /* CE11 */ >;

        qcom,wlan-msa-memory = <0x200000>;

	qcom,wlan-msa-fixed-region = <&wlan_msa_mem>;

	qcom,smmu-s1-bypass;

	vdd-0.8-cx-mx-supply = <&pm8998_l5>;

	qcom,vdd-0.8-cx-mx-config = <800000 800000 2400 1000>;

Documentation/devicetree/bindings/display/msm/sde.txt

+7 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ Required properties 
				The number of offsets defined should reflect the

				amount of mixers that can drive data to a panel

				interface.

- qcom,sde-dspp-top-off:		Offset address for the dspp top block.

				The offset is calculated from register "mdp_phys"

				defined in reg property.

- qcom,sde-dspp-off: 		Array of offset addresses for the available dspp

				blocks. These offsets are calculated from

				register "mdp_phys" defined in reg property.
@@ -207,6 +210,7 @@ Optional properties: 
				e.g. qcom,sde-dspp-blocks

				-- qcom,sde-dspp-pcc: offset and version of PCC hardware

				-- qcom,sde-dspp-gc: offset and version of GC hardware

				-- qcom,sde-dspp-igc: offset and version of IGC hardware

				-- qcom,sde-dspp-hsic: offset and version of global PA adjustment

				-- qcom,sde-dspp-memcolor: offset and version of PA memcolor hardware

				-- qcom,sde-dspp-sixzone: offset and version of PA sixzone hardware
@@ -424,6 +428,7 @@ Example: 
		     0x00002600 0x00002800>;

    qcom,sde-mixer-off = <0x00045000 0x00046000

			0x00047000 0x0004a000>;

    qcom,sde-dspp-top-off = <0x1300>;

    qcom,sde-dspp-off = <0x00055000 0x00057000>;

    qcom,sde-dspp-ad-off = <0x24000 0x22800>;

    qcom,sde-dspp-ad-version = <0x00030000>;
@@ -481,6 +486,7 @@ Example: 
    qcom,sde-sspp-src-size = <0x100>;

    qcom,sde-mixer-size = <0x100>;

    qcom,sde-ctl-size = <0x100>;

    qcom,sde-dspp-top-size = <0xc>;

    qcom,sde-dspp-size = <0x100>;

    qcom,sde-intf-size = <0x100>;

    qcom,sde-dsc-size = <0x100>;
@@ -599,6 +605,7 @@ Example: 
    };



    qcom,sde-dspp-blocks {

        qcom,sde-dspp-igc = <0x0 0x00010000>;

        qcom,sde-dspp-pcc = <0x1700 0x00010000>;

        qcom,sde-dspp-gc = <0x17c0 0x00010000>;

        qcom,sde-dspp-hsic = <0x0 0x00010000>;