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

Commit 569a366a authored by Namratha Siddappa's avatar Namratha Siddappa
Browse files

Merge remote-tracking branch 'quic/msm-4.14' into dev/msm-4.14-display 



* quic/msm-4.14:
  sched: restore all values for sched_{up,down}_migrate knobs in error case
  ARM: dts: msm: Update qtimer frequency on SDXPRAIRIE RUMI
  ARM: dts: msm: Add device tree support for VAD in qcs405
  Documentation: sound: Add documentation for qcs405 VAD dais
  ARM: dts: msm: fix compilation issue in qcs405
  sched/fair: relax preferred cluster requirement
  sched/fair: improve placement logic
  sched: track mid capacity cpu
  clk: qcom: Add BRANCH_HALT_SKIP flag for gfx3d clock
  wil6210: remove crash dump collection from OTP section
  scsi: ufs: Get UFS ref_clk min/max voltage from device tree
  usb: gadget: f_rndis: Add 'wceis' flag to indicate 'Wireless' RNDIS
  dwc3: gadget: Increase TXFIFO size as 6KB for GSI IN endpoint
  f_gsi: Increase number of TRBs and its buffer size
  sched/boost: provide helper api for boost on big
  ARM: dts: msm: add default display for SM8150+SDX50 MTP
  msm: kgsl: Trigger GMU recovery on OOB set failures
  ARM: dts: msm: move default display for SM8150 CDP and MTP to overlay

Change-Id: Ia08028c85860bb4f404ae2a7209d0990cdc79dd7
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents 8dd0536e df9c344a

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

+23 −3
Original line number Diff line number Diff line
@@ -237,6 +237,13 @@ Required properties: 
                            Value is from 45056 to 45061.

                            VA codec dma port ID Value is from 45089 to 45091.



Optional properties:



- qcom,msm-dai-is-island-supported:       Defines whether this dai supported in

                                          island mode or not.

                                          0 - Unsupported

                                          1 - Supported



* msm-auxpcm



Required properties:
@@ -303,6 +310,10 @@ Optional properties: 
                                          interface to be used for enabling

                                          PCM clock. If not defined, selects

                                          default AFE clock interface.

- qcom,msm-dai-is-island-supported:       Defines whether this dai supported in

                                          island mode or not.

                                          0 - Unsupported

                                          1 - Supported



* msm-pcm-hostless
@@ -794,6 +805,10 @@ Optional properties: 
- pinctrl-names:		          Pinctrl state names for each pin group

				          configuration.

- pinctrl-x: 			          Defines pinctrl state for each pin group

- qcom,msm-dai-is-island-supported:       Defines whether this dai supported in

                                          island mode or not.

                                          0 - Unsupported

                                          1 - Supported



Example:
@@ -977,6 +992,11 @@ Optional properties: 


 - pinctrl-x: Defines pinctrl state for each pin group.



 - qcom,msm-dai-is-island-supported:      Defines whether this dai supported in

                                          island mode or not.

                                          0 - Unsupported

                                          1 - Supported



Example:



	qcom,msm-dai-tdm-quat-rx {

Documentation/devicetree/bindings/ufs/ufs-qcom.txt

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ Optional properties: 
- vdda-pll-max-microamp : specifies max. load that can be drawn from pll supply

- vddp-ref-clk-supply   : phandle to UFS device ref_clk pad power supply

- vddp-ref-clk-max-microamp : specifies max. load that can be drawn from this supply

- vddp-ref-clk-min-uV : specifies min voltage that can be set for reference clock supply

- vddp-ref-clk-max-uV : specifies max voltage that can be set for reference clock supply

- qcom,disable-lpm : disable various LPM mechanisms in UFS for platform compatibility

  (limit link to PWM Gear-1, 1-lane slow mode; disable hibernate, and avoid suspend/resume)

arch/arm64/boot/dts/qcom/qcs405-audio.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -139,3 +139,15 @@ 
		};

	};

};



&dai_mi2s4 {

	qcom,msm-dai-is-island-supported = <1>;

};



&dai_quin_auxpcm {

	qcom,msm-dai-is-island-supported = <1>;

};



&dai_quin_tdm_tx_0 {

	qcom,msm-dai-is-island-supported = <1>;

};

arch/arm64/boot/dts/qcom/qcs405-tasha.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
		pinctrl-0 = <&tasha_mclk_default>;

		pinctrl-1 = <&tasha_mclk_default>;

		#clock-names = "osr_clk";

		#clocks = <&pms405_div_clk>;

		#clocks = <&pms405_clkdiv>;

		#clock-cells = <1>;

	};

arch/arm64/boot/dts/qcom/qcs405-va-bolero.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -32,3 +32,7 @@ 
		#clock-cells = <1>;

	};

};



&va_cdc_dma_0_tx {

	qcom,msm-dai-is-island-supported = <1>;

};