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

Commit 61240ba4 authored by Namratha Siddappa's avatar Namratha Siddappa
Browse files

Merge commit 'AU303' into dev/msm-4.14-display 



* commit '60733446':
  msm: kgsl: Enable preemption for A608 GPU
  power: smb5: support smb_en_reason property in USB psy
  mmc: core: Invoke mmc_power_up/off with claim_host acquired
  cnss2: Include kernel QMI header file in correct place
  defconfig: disable HAVE_LOW_MEMORY_KILLER on SA8155
  ARM: dts: msm: Add audio routing for sm6150 idp variant
  power: smb5-lib: Initialize nodes for SBUx and VPH_PWR channel
  ARM: dts: msm: specify SBUx and VPH_PWR channel on MTP and QRD
  msm: kgsl: Don't halt dispatcher if device is not in SUSPEND state
  clk: qcom: clk-alpha-pll: Add support for configuring fabia PLL
  soc: qcom: dcc_v2: Change HW trigger setting for secure DCC
  defconfig: qcs405: Enable ADC configs for QCS405
  mailbox: apcs-ipc: Set suppress_bind_attrs
  defconfig: sa8155: align with android config requirement
  ARM: dts: msm: set prop to specify smmu mapping range for dpu in sm8150 v2
  ARM: dts: msm: Restrict GPU max power level
  ARM: dts: msm: set property for SDE rotator smmu mapping range in sm8150 v2
  mailbox: msm_qmp: Do not reset channel open state
  msm: ipa: Update IPA_SRAM_DIRECT_ACCESS_n for IPA4.5
  msm: ipa: Support IPA4.5 new time scheme
  [media] v4l: Add V4L2_PIX_FMT_NV12_512 color format
  net: wireless: add 60GHz band for Turkey
  defconfig: msm: Enable GENI-IR Driver on QCS405
  msm: ipa: Fix to validate the filter action
  ARM: dts: msm: Add msm-id for QRD variant of SM6150P
  ARM: dts: msm: Add support for complete subsystem ramdump for SM6150
  ARM: dts: msm: add DSU PMU support for sm6150
  ARM: dts: msm: Add new platforms for SM6150 SoC
  ARM: dts: msm: Modify SMB1390 and SMB1355 device specification
  bridge: Add bridge API to access the bridge slave port
  msm: net: Add support to packet threshold events.
  ARM: dts: msm: Update the fmax corners for CPU for QCS405
  soc: qcom: Add support for Cx iPeak limit driver

Change-Id: Ia558596cd14909859743063d0cc8b8d4a486101c
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents a66f0779 60733446

Documentation/devicetree/bindings/soc/qcom/qcom,cx_ipeak.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
* Cx iPeak driver to handle requests from various multimedia clients.



Cx ipeak HW module is used to limit the current drawn by various subsystem

blocks on Cx power rail. Each client needs to set their

bit in tcsr register if it is going to cross its own threshold. If all

clients are going to cross their thresholds then Cx ipeak hw module will raise

an interrupt to cDSP block to throttle cDSP's fmax.



Required properties:



- compatible : name of the component used for driver matching, should be

	       "qcom,cx-ipeak-sdm660"



- reg : physical base address and length of the register set(s), SRAM and XPU

	of the component.



Example:



	cx_ipeak_lm: cx_ipeak@1fe5040 {

		compatible = "qcom,cx-ipeak-sdm660";

		reg = <0x01fe5040 0x28>;

	};

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

+7 −4
Original line number Diff line number Diff line
@@ -1511,7 +1511,10 @@ Optional properties: 
- qcom,wsa-max-devs : Maximum number of WSA881x devices present in the target

- qcom,wsa-devs : List of phandles for all possible WSA881x devices supported for the target

- qcom,wsa-aux-dev-prefix : Name prefix with Left/Right configuration for WSA881x device

- qcom,ext-disp-audio-rx: Property to specify if Audio over Display port is supported for the target

- qcom,wcn-btfm : Property to specify if WCN BT/FM chip is used for the target

- qcom,mi2s-audio-intf: Property to specify if MI2S interface is used for the target

- qcom,auxpcm-audio-intf: Property to specify if Aux PCM interface is used for the target

- qcom,tavil_codec : Property to specify if Tavil codec is used for this target

- qcom,cdc-dmic-gpios : phandle for Digital mic clk and data gpios.
@@ -1519,10 +1522,10 @@ Example: 
	sm6150_snd: sound {

		status = "okay";

		compatible = "qcom,sm6150-asoc-snd";

		qcom,ext-disp-audio-rx;

		qcom,wcn-btfm;

		qcom,mi2s-audio-intf;

		qcom,auxpcm-audio-intf;

		qcom,ext-disp-audio-rx = <1>;

		qcom,wcn-btfm = <1>;

		qcom,mi2s-audio-intf = <1>;

		qcom,auxpcm-audio-intf = <1>;



		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

				<&loopback>, <&compress>, <&hostless>,

Documentation/devicetree/bindings/sound/wcd_codec.txt

+9 −0
Original line number Diff line number Diff line
@@ -449,6 +449,7 @@ Required properties: 
	soundwire core registers.

 - clock-names : clock names defined for WSA macro

 - clocks : clock handles defined for WSA  macro

 - qcom,wsa-swr-gpios: phandle for SWR data and clock GPIOs of WSA macro



Example:
@@ -491,6 +492,8 @@ Required properties: 
	soundwire core registers.

 - clock-names : clock names defined for RX macro

 - clocks : clock handles defined for RX macro

 - qcom,rx-swr-gpios: phandle for SWR data and clock GPIOs of RX macro

 - qcom,rx_mclk_mode_muxsel: register address for RX macro MCLK mode mux select



Example:
@@ -501,6 +504,8 @@ Example: 
		clock-names = "rx_core_clk", "rx_npl_clk";

		clocks = <&clock_audio_rx_1 0>,

			 <&clock_audio_rx_2 0>;

		qcom,rx-swr-gpios = <&rx_swr_gpios>;

		qcom,rx_mclk_mode_muxsel = <0x62C25020>;

		swr_1: rx_swr_master {

			compatible = "qcom,swr-mstr";

			wcd937x_rx_slave: wcd937x-rx-slave {
@@ -518,6 +523,8 @@ Required properties: 
	soundwire core registers.

 - clock-names : clock names defined for TX macro

 - clocks : clock handles defined for TX macro

 - qcom,tx-swr-gpios: phandle for SWR data and clock GPIOs of TX macro

 - qcom,tx-dmic-sample-rate: Sample rate defined for DMICs connected to TX macro



Example:
@@ -528,6 +535,8 @@ Example: 
		clock-names = "tx_core_clk", "tx_npl_clk";

		clocks = <&clock_audio_tx_1 0>

			 <&clock_audio_tx_2 0>;

		qcom,tx-swr-gpios = <&tx_swr_gpios>;

		qcom,tx-dmic-sample-rate = <4800000>;

		swr_2: tx_swr_master {

			compatible = "qcom,swr-mstr";

			wcd937x_tx_slave: wcd937x-tx-slave {

arch/arm64/boot/dts/qcom/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -84,18 +84,24 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sm6150-idp-overlay.dtbo \

		sm6150p-qrd-overlay.dtbo \

		sm6150p-idp-overlay.dtbo \

		sm6150-external-codec-idp-overlay.dtbo \

		sm6150-usbc-idp-overlay.dtbo



sm6150-rumi-overlay.dtbo-base := sm6150.dtb

sm6150-qrd-overlay.dtbo-base := sm6150.dtb

sm6150-idp-overlay.dtbo-base := sm6150.dtb

sm6150p-qrd-overlay.dtbo-base := sm6150p.dtb

sm6150p-idp-overlay.dtbo-base := sm6150p.dtb

sm6150-external-codec-idp-overlay.dtbo-base := sm6150.dtb

sm6150-usbc-idp-overlay.dtbo-base := sm6150.dtb

else

dtb-$(CONFIG_ARCH_SM6150)	+= sm6150-rumi.dtb \

	sm6150-qrd.dtb \

	sm6150-idp.dtb \

	sm6150p-qrd.dtb \

	sm6150p-idp.dtb

	sm6150p-idp.dtb \

	sm6150-external-codec-idp.dtb \

	sm6150-usbc-idp.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

arch/arm64/boot/dts/qcom/qcs403.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
		clocks = <&clock_cpu APCS_MUX_CLK>;



		qcom,cpufreq-table =

			 < 1113600 >,

			 < 1267200 >,

			 < 1094400 >,

			 < 1248000 >,

			 < 1401600 >;

	};
@@ -42,8 +42,8 @@ 
		qcom,cpulist = <&CPU0 &CPU1>;

		qcom,target-dev = <&cpu0_cpu_ddr_latfloor>;

		qcom,core-dev-table =

			< 1113600 MHZ_TO_MBPS( 297, 4) >,

			< 1267200 MHZ_TO_MBPS( 597, 4) >,

			< 1094400 MHZ_TO_MBPS( 297, 4) >,

			< 1248000 MHZ_TO_MBPS( 597, 4) >,

			< 1401600 MHZ_TO_MBPS( 710, 4) >;

	};

};