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

Commit 13976ba5 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:
  msm: ipa4: gsi: Remove WA of resetting  gsi channel
  msm:ipa3: endpoint config for SM6150
  ARM: dts: msm: add apss smmu support on qcs405
  ARM: dts: msm: Specify maintenance charging configuration in SM8150 MTP/QRD
  power: qpnp-fg-gen4: Add maintenance charging support
  defconfig: msm: Enable llcc_perfmon for sm8150
  ARM: dts: msm: Add llcc perfmon device for sm8150
  drivers: soc: llcc_perfmon: fix scid_status issue
  drivers: soc: llcc_perfmon: Add llcc_perfmon support
  power: qpnp-fg-gen4: Adjust recharge SOC dynamically
  mhi: core: allow setting wake db only if we're on MHI M2 state
  msm: msm_bus: Prevent double adding BCMs to query queue
  msm: ipa3: Added support for ipa 4.2 needed for SM6150
  defconfig: sm8150: Enable data flow control and power save
  defconfig: qcs405: Enable ADC configs for QCS405
  arm/arm64: defconfig: add config options for smmu on qcs405
  arm: dma-mapping: don't attach the clients to smmu device by default
  diag: Prevent accessing uninitialized diag_md_info member
  rmnet: egress burst mode qos
  backlight: qcom-spmi-wled: Expose max_avail_current for switch via sysfs
  backlight: qcom-spmi-wled: Add qpnp_wled_flash_led_prepare() API
  ARM: dts: msm: Add flash/torch devices for WLED on PM8150L
  backlight: qcom-spmi-wled: Add torch and flash support for WLED5
  power: smb5: Expose QNOVO_ENABLE property
  ARM: dts: msm: alter disable load to 0 for DSI supplies on sm8150
  sched: boost: Add a missing break
  defconfig: Enable minidump support for SM8150 target
  clk: qcom: clk-alpha-pll: Avoid reconfiguring Trion and Regera PLLs
  sched/sched_avg: make number of running tasks conservative
  sched/core_ctl: disable prev assist by default
  clk: qcom: Update the PMIC XO clocks for QCS405
  selinux: KASAN: slab-out-of-bounds in xattr_getsecurity
  defconfig: Enable QDSS bridge driver
  soc: qcom: Migrate to MHI device driver
  msm: vidc: Update enc work mode and route selection
  power: smb5: Enable updating of RECHARGE_SOC PSY property
  clk: qcom: npucc-sm8150: Minor change to the CRC enable sequence
  msm: vidc: Correct conditional check
  ARM: dts: msm: Enable dload_type selection on SM8150
  qcom: minidump: Fix stack pointer arithmetic to avoid underflow
  ipv4/GRO: Make GRO conform to RFC 6864
  Revert "GRO: Add support for TCP with fixed IPv4 ID field, limit tunnel IP ID values"
  ARM: dts: msm: Add QRD support for SM8150+SDX50
  ARM: dts: msm: Update support for GPI DMA device tree for SM6150
  clk: qcom: Add support for additional clocks for QCS405
  scsi: ufs: fix redzone overwritten error when print utp hci testbus
  mmc: block: fix one coding error
  scsi: ufs: fix two minor potential errors
  soc:qcom: Add support to log time taken ipi pings
  power: fg-memif: Add IMA support to access SRAM on GEN4 FG
  power: smb5: Fix ICL for SDP with non-compliant cable
  ARM: dts: msm:Add peripheral devices for sm8150-auto
  esoc: Increase the post power-on delay
  pinctrl: qcom: Add direct connect configuration for sm8150
  ARM: dts: msm: add graphics smmu support on qcs405
  ARM: dts: msm: Introduce smr masks for kgsl smmu for sm6150
  regulator: cpr: support corner based vdd mode switch
  msm: adsprpc: Avoid race condition during map creation and free
  ARM: dts: msm: Remove adsp memory node from video subsystem
  icnss: Add fatal error string in icnss error message
  locking/qrwlock: Prevent slowpath writers getting held up by fastpath
  locking/qrwlock, arm64: Move rwlock implementation over to qrwlocks
  locking/qrwlock: Use atomic_cond_read_acquire() when spinning in qrwlock
  locking/atomic: Add atomic_cond_read_acquire()
  locking/qrwlock: Use 'struct qrwlock' instead of 'struct __qrwlock'
  thermal: tsens: Disable Tsens interrupts during driver initialization
  msm: venc: Enable Adaptive B by default
  msm: vidc: Add vidioc_default functionality
  msm: vidc: Reduce the response wait time
  ARM: dts: msm: Update USB QMP DP PHY init sequence on SM8150
  soc: qcom: Create additional ramdump device node for SSR minidump
  soc: qcom: Add SSR minidump provision for subsystem ramdump
  soc: qcom: Add code change for SSR Minidump collection

Change-Id: Iebcd5c9f3a505941147a19770bc60d62e517c945
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents f3771ca0 ada19597

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

+10 −0
Original line number Diff line number Diff line
@@ -73,6 +73,11 @@ USB Diag Cookies: 
Memory region used to store USB PID and serial numbers to be used by

bootloader in download mode.



SSR Minidump Offset

-------------------

-Compatible: "qcom,msm-imem-minidump"

-reg: start address and size of ssr imem region



Required properties:

-compatible: "qcom,msm-imem-diag-dload"

-reg: start address and size of USB Diag download mode region in imem
@@ -121,4 +126,9 @@ Example: 
			compatible = "qcom,msm-imem-emergency_download_mode";

			reg = <0xfe0 12>;

		};



		ss_mdump@b88 {

			compatible = "qcom,msm-imem-minidump";

			reg = <0xb88 28>;

		};

	};

Documentation/devicetree/bindings/arm/msm/qcom,llcc.txt

+7 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ Reports single and double bit errors in the data and tag ram of LLCC. 
4. LLCC AMON Driver:

Keeps track of the data progress within the internal channels of LLCC.



5. LLCC Performance Monitor

Used to monitor the events of LLCC sub blocks.



== llcc device ==



Require Properties:
@@ -118,6 +121,10 @@ Example: 
			compatible = "qcom,llcc-amon";

			qcom,fg-cnt = <0x7>;

		};



		qcom,llcc-perfmon {

			compatible = "qcom,llcc-perfmon";

		};

	};



== Client ==

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

+123 −14
Original line number Diff line number Diff line
@@ -23,6 +23,22 @@ platforms. The PMIC is connected to the host processor via SPMI bus. 
	Definition:  Names associated with base addresses. should be

		     "wled-ctrl-base", "wled-sink-base".



- interrupts

	Usage:      optional

	Value type: <prop encoded array>

	Definition: Interrupts associated with WLED. Interrupts can be

		    specified as per the encoding listed under

		    Documentation/devicetree/bindings/spmi/

		    qcom,spmi-pmic-arb.txt.



- interrupt-names

	Usage:      optional

	Value type: <string>

	Definition: Interrupt names associated with the interrupts.

		    Currently supported interrupts are "sc-irq", "ovp-irq",

		    "pre-flash-irq" and "flash-irq". Pre_flash and flash

		    interrupts can be specified only for PMICs that has WLED5.



- label

	Usage:      required

	Value type: <string>
@@ -95,20 +111,6 @@ platforms. The PMIC is connected to the host processor via SPMI bus. 
	Definition: Specify if external PFET control for short circuit

		    protection is needed. This is not applicable for PM8150L.



- interrupts

	Usage:      optional

	Value type: <prop encoded array>

	Definition: Interrupts associated with WLED. Interrupts can be

		    specified as per the encoding listed under

		    Documentation/devicetree/bindings/spmi/

		    qcom,spmi-pmic-arb.txt.



- interrupt-names

	Usage:      optional

	Value type: <string>

	Definition: Interrupt names associated with the interrupts.

		    Currently supported interrupts are "sc-irq" and "ovp-irq".



- qcom,auto-calibration

	Usage:      optional

	Value type: <bool>
@@ -140,6 +142,95 @@ platforms. The PMIC is connected to the host processor via SPMI bus. 
	Value type: <phandle>

	Definition: If specified, can be used to get PMIC revision information.



Following properties are for child subnodes that are needed for WLED preflash

(or torch), flash and switch. These child subnodes can be specified only for

PMICs that has WLED5 (e.g. PM8150L).



For wled_torch child subnode,



- label

	Usage:      required

	Value type: <string>

	Definition: Should be "torch".



- qcom,default-led-trigger

	Usage:      optional

	Value type: <string>

	Definition: Name for LED trigger. If unspecified, "wled_torch" is used.



- qcom,wled-torch-fsc

	Usage:      optional

	Value type: <u32>

	Definition: WLED torch full scale current in mA. This configures the

		    maximum current allowed for torch device. Allowed values

		    are from 5 to 60 mA with a step of 5 mA. If not specified,

		    default value is set to 30 mA.



- qcom,wled-torch-step

	Usage:      optional

	Value type: <u32>

	Definition: WLED torch step delay in us. This configures the step delay

		    when the output is ramped up to the desired target current.

		    Allowed values are from 50 to 400 us with a step of 50 us.

		    If not specified, default value is set to 200 us.



- qcom,wled-torch-timer

	Usage:      optional

	Value type: <u32>

	Definition: WLED torch safety timer in ms. This configures the safety

		    timer to turn off torch automatically after timer expiry.

		    Allowed values are: 50, 100, 200, 400, 600, 800, 1000 and

		    1200. If not specified, default value is set to 1200 ms.



For wled_flash child subnode,



- label

	Usage:      required

	Value type: <string>

	Definition: Should be "flash".



- qcom,default-led-trigger

	Usage:      optional

	Value type: <string>

	Definition: Name for LED trigger. If unspecified, "wled_flash" is used.



- qcom,wled-flash-fsc

	Usage:      optional

	Value type: <u32>

	Definition: WLED flash full scale current in mA. This configures the

		    maximum current allowed for flash device. Allowed values

		    are from 5 to 60 mA with a step of 5 mA. If not specified,

		    default value is set to 40 mA.



- qcom,wled-flash-step

	Usage:      optional

	Value type: <u32>

	Definition: WLED flash step delay in us. This configures the step delay

		    when the output is ramped up to the desired target current.

		    Allowed values are from 50 to 400 us with a step of 50 us.

		    If not specified, default value is set to 200 us.



- qcom,wled-flash-timer

	Usage:      optional

	Value type: <u32>

	Definition: WLED flash safety timer in ms. This configures the safety

		    timer to turn off flash automatically after timer expiry.

		    Allowed values are: 50, 100, 200, 400, 600, 800, 1000 and

		    1200. If not specified, default value is set to 100 ms.



For wled_switch child subnode,



- label

	Usage:      required

	Value type: <string>

	Definition: Should be "switch".



- qcom,default-led-trigger

	Usage:      optional

	Value type: <string>

	Definition: Name for LED trigger. If unspecified, "wled_switch" is

		    used.



Example:



qcom-wled@d800 {
@@ -171,4 +262,22 @@ qcom-wled@d800 { 
	interrupts = <0x5 0xd8 0x1 IRQ_TYPE_EDGE_RISING>;

	interrupt-names = "ovp-irq";

	qcom,string-cfg = <7>;



	wled_torch: qcom,wled-torch {

		label = "torch";

		qcom,wled-torch-fsc = <40>;

		qcom,wled-torch-step = <300>;

		qcom,wled-torch-timer = <600>;

	};



	wled_flash: qcom,wled-flash {

		label = "flash";

		qcom,wled-flash-fsc = <60>;

		qcom,wled-flash-step = <100>;

		qcom,wled-flash-timer = <200>;

	};



	wled_switch: qcom,wled-switch {

		label = "switch";

	};

};

Documentation/devicetree/bindings/platform/msm/ipa.txt

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ memory allocation over a PCIe bridge 
                                need to be unlocked by TZ.

- qcom,ipa-uc-monitor-holb:   	Boolean context flag to indicate whether

                                monitoring of holb via IPA uc is required.

-qcom,ipa-fltrt-not-hashable:   Boolean context flag to indicate filter/route rules

				hashing not supported.



IPA pipe sub nodes (A2 static pipes configurations):

Documentation/devicetree/bindings/regulator/cpr-regulator.txt

+9 −0
Original line number Diff line number Diff line
@@ -675,6 +675,14 @@ Optional properties: 
				The number of quadruples should be equal to the number of values specified in

				the qcom,cpr-aging-sensor-id property. This property is required if

				the qcom,cpr-aging-sensor-id property has been specified.

- qcom,cpr-vdd-mode-map:	Array of boolean values which define the mapping

				of the VDD operating mode for each APC virtual

				corner. A element value 0 indicates the VDD to

				be configured to AUTO mode and value 1 indicates

				the VDD to be configured to PWM mode for the

				corresponding virtual corner. The elements in

				the array are ordered from lowest voltage corner

				to highest voltage corner.

Example:

	apc_vreg_corner: regulator@f9018000 {

		status = "okay";
@@ -727,6 +735,7 @@ Example: 
		qcom,cpr-voltage-ceiling = <1050000 1150000 1280000>;

		qcom,cpr-voltage-floor = <1050000 1050000 1100000>;

		vdd-apc-supply = <&pm8226_s2>;

		qcom,cpr-vdd-mode-map = <0 0 0 0 0 0 1 1 1 1 1 1>;

		vdd-apc-optional-prim-supply = <&ncp6335d>;

		vdd-apc-optional-sec-supply = <&fan53555>;

		vdd-mx-supply = <&pm8226_l3_ao>;