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

Commit ea68bc8e 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:
  lpm-levels: Remove kfree for memory allocated with devm_kzalloc
  clk: qcom: clk-smd-rpm: Update number of RPM clocks
  msm: pcie: release PCIe regulator current load vote when powering off
  msm: npu: Enable system cache
  ARM: dts: msm: add smp2p ipa support for msmnile
  clk: qcom: gcc-sm8150: Update the halt_check flag for the PCIe pipe clocks
  defconfig: sm8150: Enable SMP2P Sleepstate driver
  ARM: dts: msm: Add smp2p sleepstate node for sm8150
  soc: qcom: smp2p_sleepstate: Update smp2p APIs
  bt: Unset multi channel bit for 44.1/88.2Khz A2DP Rx
  defconfig: msm: quota limit indication for sm8150
  ARM: kernel: smp: Clear Pending IPI flag after handling
  diag: Add new log codes to diag mask
  fbdev: Make changes to enable compilation for MDSS FB driver
  msm: kgsl: Avoid unnecessary "AHB fence stuck in ISR" error logs
  diag: Wait until usb diag channel opens during cable connect
  msm: adsprpc: decrease length of IOVA mask for SDSP devices
  net: qualcomm: rmnet: Disable UL aggregation by default
  net: qualcomm: rmnet: Fix for UL aggregation with stats change
  net: qualcomm: rmnet: Remove redundant command check
  net: qualcomm: rmnet: Add support for ethtool private stats
  net: qualcomm: rmnet: Capture all drops in transmit path
  ANDROID: uid_sys_stats: Replace tasklist lock with RCU in uid_cputime_show
  arm64: Add fallback option during memory hot add
  arm64: Honor limits set by bootloader
  soc: qcom: Add snapshot of SMP2P Sleepstate driver
  Add support for 44.1/48/88.1/96KHz for Tx channel
  sched: ceil idle index to prevent from out of bound accessing
  sched: prevent out of bound access in calc_sg_energy
  cfg80211: Call reg_notifier for self managed hints conditionally
  sched/core_ctl: introduce nr_prev_assist_thresh tunable
  drivers: base: arch_topology: swap the order of updating shared_cap_level
  ARM: dts: msm: Disable u1u2 functionality with USB controller on SM8150
  dwc3: Add support to disable clock gating with USB controller
  ARM: dts: msm: fix QDSS clocks for qcs405
  ARM: dts: msm: add support for QBT1000 on sm8150
  pinctrl: qcom: Add irq_enable callback for msmgpio-dc
  bdi: introduce BDI_CAP_SYNCHRONOUS_IO
  zram: set BDI_CAP_STABLE_WRITES once
  defconfig: qcs405: Enable SPS configs for QCS405
  regulator: core: add regulator_list_corner_voltage function
  msm: kgsl: Update GPU idleness check when RB is empty
  ARM: dts: msm: disable recycle buffer for rmnet_mhi interface for sm8150
  qrtr: Return success if control port is not bound
  defconfig:sa8150: Enable RPMSG GLINK spi transport
  clk: qcom: clk-rcg2: Update the clock warning during RCG force enable
  ARM: dts: msm: Add qcedev context bank information for sm8150
  msm: crypto: Add support for map and unmap ioctls
  msm: crypto: Parse smmu context bank details
  soc: qcom: add scm calls for ion and iommu
  iommu/arm-smmu: add option to enable static context bank allocation
  msm: ipa4: Do not notify clk state starting at IPAv4.1
  mm/Kconfig: Enable MEMORY_HOTPLUG for arm64
  arm64: Add "remove" probe driver for memory hot-remove
  ARM: dts: msm: Add power grid regulator phandles for SM6150
  soc: qcom: qsee_ipc_irq_bridge: Rearrange parsing property
  ARM: dts: msm: Update compatible strings for IFE on sm8150 target
  msm: camera: Add IFE 175 hardware support
  msm: camera: ife: Changes CSID acquire resource logic
  power: smb1390: remove unnecessary votables
  ARM: dts: msm: Rename the PMIC DT files and DT nodes
  defconfig: sm8150: Enable SPMI PMIC arbiter debug bus driver
  mfd: qcom-spmi-pmic: add support for slow SPMI busses
  spmi: spmi-pmic-arb-debug: add clock management support
  msm: camera: isp: Change context lock acquire sequence in flush
  usb: gadget: diag: Notify cable status while opening channel
  msm: camera: isp: Fix the sequence of CSID Master-Slave start
  msm: camera: ife: Add bus write master UBWC config update
  msm: kgsl: Get kgsl device from the hfi_start() caller
  msm: camera: uapi: Adds UBWC blob payload structure
  msm: camera: isp: Add support for BUS driver version 175
  ARM: dts: msm: Update to latest memory map for sdmshrike

Change-Id: I83c2a17588715cc1d034fbea6d660d6b3c0895ce
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents 54559809 053fad16

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

0 → 100644
+12 −0
Original line number Diff line number Diff line 
Qualcomm Technologies, Inc. SMSM Point-to-Point (SMP2P) Sleepstate driver



Required properties:

-compatible : should be one of the following:

- "qcom,smp2p-sleepstate"

-qcom,smem-states : the relevant outgoing smp2p entry



Example:

qcom,smp2p_sleepstate {

	compatible = "qcom,smp2p-sleepstate";

	qcom,smem-states = <&sleepstate_smp2p_out 0>;

};

Documentation/devicetree/bindings/crypto/msm/qcedev.txt

+27 −0
Original line number Diff line number Diff line 
* QCEDEV (QTI Crypto Engine Device)



[Root level node]

Crypto Engine

============

Required properties:

  - compatible : should be "qcom,qcedev"

  - reg : should contain crypto, BAM register map.
@@ -24,6 +27,19 @@ Optional properties: 
  - iommus : A list of phandle and IOMMU specifier pairs that describe the IOMMU master interfaces of the device.

  - qcom,no-clock-support : indicates clocks are not handled by hlos crypto driver.





[Second level nodes]

Context banks

=============

Required properties:

  - compatible : should be "qcom,qcedev,context-bank"

  - iommus : A phandle parsed by smmu driver. Number of entries will vary across targets.



Optional properties:

  - label - string describing iommu domain usage.

  - virtual-addr : start of virtual address pool.

  - virtual-size : size of virtual address pool.



Example:



	qcom,qcedev@fd440000 {
@@ -43,4 +59,15 @@ Example: 
				<56 512 0 0>,

				<56 512 3936000 393600>,

		qcom,ce-opp-freq = <100000000>;



		qcom_cedev_ns_cb {

			compatible = "qcom,qcedev,context-bank";

			label = "ns_context";

			iommus = <&anoc2_smmu 0x1878>,

				<&anoc2_smmu 0x1879>,

				<&anoc2_smmu 0x187c>,

				<&anoc2_smmu 0x187f>;

			virtual-addr = <0x60000000>;

			virtual-size = <0x00200000>;

		};

	};

Documentation/devicetree/bindings/iommu/arm,smmu.txt

+9 −0
Original line number Diff line number Diff line
@@ -101,6 +101,15 @@ conditions. 
		  Any sid X for which X&~mask==sid will be programmed with the

		  given actlr-setting.



- qcom,enable-static-cb : Enables option to use pre-defined static context bank

		  allocation programmed by TZ. Global register including SMR and

		  S2CR registers are configured by TZ before kernel comes up and

		  this programming is not altered throughout the life of system.

		  We would be reading through these registers at run time to

		  identify CB allocated for a particular sid. SID masking isn't

		  supported as we are directly comparing client SID with ID bits

		  of SMR registers.



- qcom,deferred-regulator-disable-delay : The time delay for deferred regulator

                  disable in ms. In case of unmap call, regulator is

                  enabled/disabled. This may introduce additional delay. For

Documentation/devicetree/bindings/leds/backlight/qcom-spmi-wled.txt

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ platforms. The PMIC is connected to the host processor via SPMI bus. 
	Definition: should be one of the below.

			"qcom,pmi8998-spmi-wled",

			"qcom,pm855l-spmi-wled",

			"qcom,pm640l-spmi-wled"

			"qcom,pm6150l-spmi-wled"



- reg

	Usage:      required

Documentation/devicetree/bindings/media/video/msm-cam-ife-csid.txt

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ First Level Node - CAM IFE CSID device 
- compatible

  Usage: required

  Value type: <string>

  Definition: Should be "qcom,csid170" or "qcom,csid-lite170".

  Definition: Should be "qcom,csid170", "qcom,csid175", "qcom,csid-lite170"

              or "qcom,csid-lite175".



- cell-index

  Usage: required