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

Commit 4be84eca 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:
  iommu: arm-smmu: enable clocks and regulators in smmu detach
  ARM: dts: msm: Add sdhc rclk pin setting for QCS405
  defconfig: Enable USB gadget uevents on QCS405
  wil6210: force EDMG channel through debugfs
  ARM: dts: msm: Remove extcon for USB2.0 on QCS405
  usb: dwc3: Change to simulate VBUS without extcon/PMI
  msm: Add CLD80211_ATTR_META_DATA vendor attribute
  msm: ADSPRPC: Use right DMA APIs to flush userspace buffers
  sched/fair: dont run energy calculation unless necessary
  sched: use cuml demand for idle selection
  net: rmnet: Add trace subsystem
  rmnet: flow control optimization
  msm: npu: Fix iommu detaching issue during unloading driver
  iommu: arm-smmu: Print page-table entry (PTE) info on cb fault
  sound: rawmidi: Move spinlock under realloc_mutex
  sched/walt: don't account CPU idle exit time to task demand
  sched/fair: start_cpu() fix for rtg_target case
  sched/walt: improve the scheduler
  kernel: Restrict permissions of /proc/iomem.
  msm: ipa: Fix disabling IPA clock for ntn pipes
  power: qpnp-qg: Update the QPNP QG driver from 4.9 kernel
  ARM: dts: msm: rename automotive device tree files for SA8155
  iommu: arm-smmu: Add fault syndrome register-1 support
  ion: invalidate the pool pointers after free
  mm: disable fault around on emulated access bit architecture
  ARM: dts: msm: add dsi pll device node on qcs405
  ARM: dts: msm: Include msm-id in overlay files for SM6150
  drivers: soc: qcom: rpmh: Correctly set dirty flag
  mm: make faultaround produce old ptes
  msm: ipa: remove extra mhi_device_get_sync()
  net: qrtr: Implement outgoing flow control
  msm: kgsl: List ACK waiters when invalid HFI ACK received
  drivers: mailbox: rpmh: Correct matching of tcs command sequence
  input: touchscreen: Add himax touchscreen support
  soc: qcom: spcom: fix NULL pointer dereference
  ARM: dts: msm: Specify stream match mask for GPU SMMU on QCS405
  ARM: dts: msm: Enable sw-jeita for QRD8150
  defconfig: Add WLAN related config parameter
  Revert "cfg80211: Add new wiphy flag WIPHY_FLAG_DFS_OFFLOAD"
  cfg80211: enable use of non-cleared DFS channels for DFS offload
  cfg80211: Add backport flag for enabling DFS offload
  msm: ipa4: Cleanup IPA registers dump
  staging: android: ion: Resolve prefetch 32bit compatibility
  msm: camera: isp: Fix overwriting UBWC config register
  arm: highmem: Fix CPU_DYING callback for kmap
  clk: qcom: smd-rpm: Remove rf_clk3 instance for QCS405
  ARM: dts: msm: update regulator min/max voltages for sdmmagpie
  devfreq: update freq variable in compute_freq function
  NFC: Add driver support for NTAG
  defconfig: arm64: sdmmagpie: Enable MPROC drivers
  msm: camera: Correct check for rdi res_id
  msm: camera: isp: Fix CSID acquire in 2PD path
  ARM: dts: msm: Add register base address for sm8150 target
  ARM: dts: msm: Add support for PWM for BoB regulator for SM8150
  msm: camera: sensor: Add support to vote for PWM mode
  msm: camera: icp: allow reconfig io during streaming
  msm: camera: sync: Protect row state read
  ARM: dts: msm: Add GPU properties for sm6150
  ARM: config: Enable Command Queue support for qcs405
  ARM: dts: msm: Fix slave id for pm6150 charger
  ARM: dts: msm: Add use-pinctrl for clock nodes on sm8150 and qcs405
  Documentation: sound: Add documentation for use-pinctrl property
  add documentation about reclaim knob on proc.txt
  mm: Support address range reclaim
  mm: Enhance per process reclaim to consider shared pages
  mm: Remove shrink_page
  mm: make shrink_page_list with pages work from multiple zones
  mm: Per process reclaim
  diag: Update mask pointers after reallocation
  msm: camera: flash: Optimizing flash off operation
  msm: camera: isp: Remove additional stop CSID paths
  ARM: dts: msm: Enable ATOS for kgsl and apps smmu for sm8150
  ARM: dts: msm: Enable deep pre-fetch for NPU CBs for sm8150
  ARM: dts: msm: Add smmu support for sm8150 v2 hardware
  mailbox: msm_qmp: Remove IRQ clear
  msm: camera: ife: Add support for 2PD pipeline
  usb: dwc3: update LC timer as per new usb V3.20
  usb: dwc3: update HP timer as per new usb 3.1 ECN
  Prevent heap overflow in uvc driver
  CHROMIUM: usb: gadget: configfs: Fix KASAN use-after-free
  clocksource: arch_timer: make virtual counter access configurable
  msm: camera: sensor: Correct spelling error
  ARM: dts: msm: Update haptics device node on pm8150b

Change-Id: Ide4fb8f51d2b0a4d1faca931b5480efb30c8f3a7
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents 21aa8ba1 41a98bea

Documentation/devicetree/bindings/arm/msm/msm.txt

+2 −2
Original line number Diff line number Diff line
@@ -163,8 +163,8 @@ compatible = "qcom,sm6150-idp" 
compatible = "qcom,qcs405-rumi"

compatible = "qcom,qcs405-iot"

compatible = "qcom,qcs403-iot"

compatible = "qcom,sa8150-adp-star"

compatible = "qcom,sa8150p-adp-star"

compatible = "qcom,sa8155-adp-star"

compatible = "qcom,sa8155p-adp-star"

compatible = "qcom,adp-star"

compatible = "qcom,sdxprairie-rumi"

compatible = "qcom,sdxprairie-mtp"

Documentation/devicetree/bindings/media/video/msm-cam-cci.txt

+21 −7
Original line number Diff line number Diff line
@@ -323,6 +323,11 @@ Image sensor node contains properties of camera image sensor 
  Value type: <phandle>

  Definition: should contain regulator from which IO voltage is supplied



- cam_bob-supply

  Usage: optional

  Value type: <phandle>

  Definition: should contain regulator from which BoB voltage is supplied



- regulator-names

  Usage: required

  Value type: <string>
@@ -387,6 +392,11 @@ Image sensor node contains properties of camera image sensor 
  Value type: <u32>

  Definition: should contain regulator from which AF voltage is supplied



- pwm-switch

  Usage: optional

  Value type: <boolean>

  Definition: This property is required for regulator to switch into PWM mode.



- gpios

  Usage: required

  Value type: <phandle>
@@ -764,14 +774,18 @@ Example: 
         actuator-src = <&actuator0>;

         ois-src = <&ois0>;

         eeprom-src = <&eeprom0>;

         cam_vdig-supply = <&pm845_s3>;

         cam_vio-supply = <&pm845_lvs1>;

         cam_vana-supply = <&pmi8998_bob>;

         regulator-names = "cam_vdig", "cam_vio", "cam_vana";

         cam_vdig-supply = <&pm8009_l2>;

         cam_vio-supply = <&pm8009l_l1>;

         cam_vana-supply = <&pm8009l_l5>;

         cam_bob-supply = <&pm8150l_bob>;

         cam_clk-supply = <&tital_top_gdsc>;

         regulator-names = "cam_vio", "cam_vana", "cam_vdig",

                "cam_clk", "cam_bob";

         rgltr-cntrl-support;

         rgltr-min-voltage = <0 3312000 1352000>;

         rgltr-max-voltage = <0 3312000 1352000>;

         rgltr-load-current = <0 80000 105000>;

         pwm-switch;

         rgltr-min-voltage = <0 2800000 1200000 0 3008000>;

         rgltr-max-voltage = <0 2800000 1200000 0 4000000>;

         rgltr-load-current = <0 80000 1200000 0 2000000>;

         gpio-no-mux = <0>;

         pinctrl-names = "cam_default", "cam_suspend";

         pinctrl-0 = <&cam_sensor_mclk0_active

Documentation/devicetree/bindings/nfc/nq-ntag.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
Qualcomm Technologies, Inc NTx NTAG device



Near Field Communication wireless tag integrated circuit device(NTAG) is compliant

with NFC Forum Type 2 Tag specification.



Required properties:



- compatible: "qcom,nq-ntag"

- reg: i2c slave address.

- pinctrl-names, pinctrl-0, pinctrl-1: references to our pinctrl settings

- qcom,nq-ntagfd : specific gpio for field detect interrupt.



Example:



	nq-ntag@55 {

		compatible = "qcom,nq-ntag";

		reg = <0x55>;

		qcom,nq-ntagfd = <&tlmm 22 0x00>;

		interrupt-parent = <&tlmm>;

		interrupts = <22 0>;

		interrupt-names = "ntag_fd";

		pinctrl-names = "ntag_active","ntag_suspend";

		pinctrl-0 = <&ntag_int_active>;

		pinctrl-1 = <&ntag_int_suspend>;

	};

Documentation/devicetree/bindings/power/supply/qcom/qpnp-qg.txt

+39 −0
Original line number Diff line number Diff line
@@ -262,6 +262,45 @@ First Level Node - QGAUGE device 
		    capacity learning cycle. If this is not specified, then

		    the default value is 0. Unit is in decipercentage.



- qcom,esr-disable

	Usage:      optional

	Value type: <bool>

	Definition: Boolean property to disable ESR estimation. If not defined

		    ESR estimation stays enabled for charge-cycles.



- qcom,esr-discharge-enable

	Usage:      optional

	Value type: <bool>

	Definition: Boolean property to enable ESR estimation during discharge.

		    Only valid if 'qcom,esr-disable' is not defined.



- qcom,esr-qual-current-ua

	Usage:      optional

	Value type: <u32>

	Definition: Minimum current differential in uA to qualify an ESR

		    reading as valid. If not defined the value defaults

		    to 130mA.



- qcom,esr-qual-vbatt-uv

	Usage:      optional

	Value type: <u32>

	Definition: Minimum vbatt differential in uV to qualify an ESR

		    reading as valid. If not defined the value defaults

		    to 7mV.



- qcom,esr-disable-soc

	Usage:      optional

	Value type: <u32>

	Definition: Minimum battery SOC below which ESR will not be

		    attempted by QG. If not defined the value defaults

		    to 10%.



- qcom,qg-ext-sns

	Usage:      optional

	Value type: <bool>

	Definition: Boolean property to support external-rsense based

		    configuration.



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

Second Level Nodes - Peripherals managed by QGAUGE driver

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

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

+3 −0
Original line number Diff line number Diff line
@@ -395,6 +395,9 @@ Optional properties: 


 - qcom,mclk-clk-reg:                       Indicate the register address for mclk.



 - qcom,use-pinctrl:                        Indicates pinctrl required or not for this

                                            clock node.



* audio_slimslave



Required properties: