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

Commit 0f6c2abb authored by Harsh Shah's avatar Harsh Shah Committed by Gerrit - the friendly Code Review server
Browse files

Merge "DOWNSTREAM: AU284: Merge commit... 

Merge "DOWNSTREAM: AU284: Merge commit '3ba6a582' into Topic - 07/27" into dev/msm-4.14-camx
parents d96f30d4 9f69409a

Documentation/devicetree/bindings/clock/qcom,debugcc.txt

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ Qualcomm Technologies, Inc. Debug Clock Controller Binding 


Required properties :

- compatible: Shall contain "qcom,debugcc-sm8150",

		"qcom,debugcc-qcs405".

		"qcom,debugcc-qcs405",

		"qcom,debugcc-sm6150".

- qcom,gcc: phandle to the GCC device node.

- qcom,videocc: phandle to the Video CC device node.

- qcom,camcc: phandle to the Camera CC device node.

Documentation/devicetree/bindings/cnss/icnss.txt

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ Optional properties: 
  - qcom,wlan-msa-fixed-region: phandle, specifier pairs to children of /reserved-memory

  - qcom,gpio-force-fatal-error: SMP2P bit triggered by WLAN FW to force error fatal.

  - qcom,gpio-early-crash-ind: SMP2P bit triggered by WLAN FW to indicate FW is in assert.

  - qcom,hyp_disabled: Boolean context flag to disable hyperviser



Example:
@@ -63,4 +64,5 @@ Example: 
	qcom,vdd-0.8-cx-mx-config = <800000 800000 2400 1000>;

	qcom,gpio-forced-fatal-error = <&smp2pgpio_wlan_1_in 0 0>;

	qcom,gpio-early-crash-ind = <&smp2pgpio_wlan_1_in 1 0>;

	qcom,hyp_disabled;

    };

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

+3 −0
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ Optional properties: 
- qcom,sde-dsc-size:		A u32 value indicates the address range for each dsc.

- qcom,sde-cdm-size:		A u32 value indicates the address range for each cdm.

- qcom,sde-pp-size:		A u32 value indicates the address range for each pingpong.

- qcom,sde-te-source:		Array of GPIO sources indicating which pingpong TE is

				sourced to which panel TE gpio.

- qcom,sde-wb-size:		A u32 value indicates the address range for each writeback.

- qcom,sde-len:			A u32 entry for SDE address range.

- qcom,sde-intf-max-prefetch-lines:	Array of u32 values for max prefetch lines on
@@ -535,6 +537,7 @@ Example: 
    qcom,sde-pp-off = <0x00071000 0x00071800

			  0x00072000 0x00072800>;

    qcom,sde-pp-slave = <0x0 0x0 0x0 0x0>;

    qcom,sde-te-source = <0x0 0x1 0x0 0x0>;

    qcom,sde-cdm-off = <0x0007a200>;

    qcom,sde-dsc-off = <0x00081000 0x00081400>;

    qcom,sde-intf-max-prefetch-lines = <0x15 0x15 0x15 0x15>;

Documentation/devicetree/bindings/dma/sps/sps.txt

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Peripheral-to-Memory (a.k.a. BAM-System) mode. SPS includes BAM (Bus 
Access Module) hardware block, BAM DMA peripheral, and pipe memory.



Required property:

  - compatible: should be "qcom,msm_sps" or "qcom,msm_sps_4k"

  - compatible: should be "qcom,msm-sps" or "qcom,msm-sps-4k"



Optional properties:

  - reg: offset and size for the memory mapping, including maps for
@@ -34,7 +34,7 @@ Optional properties: 
Example:



	qcom,sps@f9980000 {

		compatible = "qcom,msm_sps";

		compatible = "qcom,msm-sps";

		reg = <0xf9984000 0x15000>,

		      <0xf9999000 0xb000>,

		      <0xfe803000 0x4800>;

Documentation/devicetree/bindings/fb/mdss-dsi-panel.txt

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ Optional properties: 
					"bl_ctrl_pwm" = Backlight controlled by PWM gpio.

					"bl_ctrl_wled" = Backlight controlled by WLED.

					"bl_ctrl_dcs" = Backlight controlled by DCS commands.

					"bl_ctrl_tlmm_gpio" = Backlight controlled by TLMM GPIO.

					other: Unknown backlight control. (default)

- qcom,mdss-dsi-bl-pwm-pmi:		Boolean to indicate that PWM control is through second pmic chip.

- qcom,mdss-dsi-bl-pmic-bank-select:	LPG channel for backlight.