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

Commit 6998daf8 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of kernel.lnx.4.4-161211.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1092907   I6d73b8f246ae3754ab60984af198333fd284ae16   sched/core: Fix race condition in clearing hmp request
1078814   Ie28323cdabccdc64196fae25deb2f56dfbb5a0e7   ARM: dts: msm: enable the watchdog bark interrupt for sm
1094175   I34a3ad2da7f8e267f0d570c0329ac9b73a43309e   ARM: dts: msm: add qdss node support for msmtriton
1092907   I078d01e63860d1fc60fc96eb0c739c0f680ae983   sched/core: Prevent (user) space tasks from affining to
1096988   I34e3f586b99b6ff1af1d2323d4f272ee3cca7fa2   ARM: dts: msm: Configure MPM for qusb2phy_dpse_hv for ms
1080662   I42e448ecacad4781b460c4c989026307169ba1b5   mm: remove gup_flags FOLL_WRITE games from __get_user_pa
1091972   I9d7cc82c50c1b09610f5a4eac86af4617389f23f   ARM: dts: msm: Add BCL peripheral configs for pmfalcon
1092907   Id06151a8e34edab49ac76b4bffd50c132f0b792f   sched: Ensure proper task migration when a CPU is isolat
1098004   I7d96555573cfd6cca1ca56c877d78fde943f8100   sound: usb: Handle implicit feedback data endpoint prope
1091972   I0062f3b39f00ff2f0e74affcffbcf1afd89d3b2f   power: bcl: Add frequency mitigation as an optional prop
1099112   I014c823bcf2545f005205dde326a074eaa5d7a6a   clk: msm: clock-osm: don't use version register to enabl

Change-Id: Ie97cd9c7d2048e9e540056d4f5f121435a147d05
CRs-Fixed: 1098004, 1094175, 1078814, 1080662, 1092907, 1099112, 1096988, 1091972
parents 97e6e94b a80e267a
Loading
Loading
Loading
Loading
+16 −11
Original line number Diff line number Diff line
@@ -38,17 +38,19 @@ Optional parameters:
- qcom,bcl-framework-interface: If this property is defined, then the BCL uses
		the BCL framework for monitoring battery voltage and current.
		When this property is defined, the 'qcom,high-threshold-uamp',
		'qcom,low-threshold-uamp', 'qcom,mitigation-freq-khz',
		'qcom,vph-high-threshold-uv', 'qcom,vph-low-threshold-uv' and
		'qcom,thermal-handle' properties should be defined in the
		'qcom,ibat-monitor' node.
		'qcom,low-threshold-uamp', 'qcom,vph-high-threshold-uv',
		'qcom,vph-low-threshold-uv' and 'qcom,thermal-handle' properties
		should be defined in the 'qcom,ibat-monitor' node.
- qcom,bcl-hotplug-list = <hotplug-phandle-list>: List of phandles to the cores
		that are to be hotplugged, when battery current limit condition
		is reached.
- qcom,bcl-soc-hotplug-list: List of phandles to the cores that are to be hotplugged,
		when battery SOC limit condition is reached.
- qcom,bcl-freq-control-list: List of phandles to the cores that are to be frequency
                mitigated when BCL condition is reached.
- qcom,bcl-freq-control-list: This optional property takes list of phandles to the
		cores that are to be frequency mitigated when BCL condition is
		reached. When this property is defined, 'qcom,mitigation-freq-khz'
		and 'qcom,thermal-handle' should be defined in the
		'qcom,ibat-monitor' node.
- qcom,bcl-no-bms: This is an optional node for BCL IAVAIL monitor mode.
		If this property is defined, BCL IAVAIL monitor gets rbat value
		from power supply battery module instead of bms module.
@@ -65,10 +67,12 @@ Optional nodes:
		which the BCL driver should cap the maximum frequency.
	* qcom,low-threshold-uamp: The battery current, in microampere, below
		which the BCL driver should clear the CPU frequency mitigation.
	* qcom,mitigation-freq-khz: The maximum frequency value the BCL driver
		should mitigate the CPUS's with. This frequency shouldn't be
		less than the minimum frequency request that the kernel thermal
		monitor driver places during vdd restriction.
	* qcom,mitigation-freq-khz: This optional property defines the maximum
		frequency value the BCL driver should mitigate the CPUS's with.
		This property is valid only if 'qcom,bcl-freq-control-list' is
		defined in bcl parent node. This frequency shouldn't be less than
		the minimum frequency request that the kernel thermal monitor
		driver places during vdd restriction.
	* qcom,ibat-channel: The ADC hardware's Ibat channel number.
	* qcom,uv-to-ua-numerator: The conversion parameter required for converting
		the voltage measure from ADC hardware to current value.
@@ -92,7 +96,8 @@ Optional nodes:
		used by BCL driver to get the minimum frequency request that the
		thermal driver places during vdd restriction. This frequency
		value will be the lowest max frequency value the BCL driver can
		request.
		request. This property is valid only if 'qcom,bcl-freq-control-list'
		is defined in bcl parent node.
	* qcom,soc-low-threshold: The battery SOC percentage threshold below which
		mitigation needs to be applied.

+14 −0
Original line number Diff line number Diff line
@@ -550,6 +550,20 @@
						  "dma-grant";
			};
		};

		bcl@4200 {
			compatible = "qcom,msm-bcl-lmh";
			reg = <0x4200 0xff>,
				<0x4300 0xff>;
			reg-names = "fg_user_adc",
					"fg_lmh";
			interrupts = <0x0 0x42 0x0 IRQ_TYPE_NONE>,
					<0x0 0x42 0x2 IRQ_TYPE_NONE>;
			interrupt-names = "bcl-high-ibat-int",
					"bcl-low-vbat-int";
			qcom,vbat-polling-delay-ms = <100>;
			qcom,ibat-polling-delay-ms = <100>;
		};
	};

	qcom,pmfalcon@1 {
+13 −4
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@

&i2c_7 {
	status = "okay";
	qcom,smb138x@8 {
	smb138x: qcom,smb138x@8 {
		compatible = "qcom,i2c-pmic";
		reg = <0x8>;
		#address-cells = <2>;
		#size-cells = <0>;
		#address-cells = <1>;
		#size-cells = <1>;
		interrupt-parent = <&spmi_bus>;
		interrupts = <0x0 0xd1 0x0 IRQ_TYPE_LEVEL_LOW>;
		interrupt_names = "smb138x";
@@ -37,6 +37,7 @@
			#address-cells = <1>;
			#size-cells = <0>;
			#io-channel-cells = <1>;
			interrupt-parent = <&smb138x>;
			interrupts = <0x36 0x0 IRQ_TYPE_EDGE_BOTH>;
			interrupt-names = "eoc";

@@ -91,13 +92,21 @@
			compatible = "qcom,smb138x-parallel-slave";
			qcom,pmic-revid = <&smb138x_revid>;
			reg = <0x1000 0x700>;

			#address-cells = <1>;
			#size-cells = <1>;
			interrupt-parent = <&smb138x>;
			io-channels = <&smb138x_tadc 2>,
				      <&smb138x_tadc 12>,
				      <&smb138x_tadc 3>;
			io-channel-names = "charger_temp",
					   "charger_temp_max",
					   "batt_i";

			qcom,chgr-misc@1600 {
				reg = <0x1600 0x100>;
				interrupts = <0x16 0x1 IRQ_TYPE_EDGE_RISING>;
				interrupt-names = "wdog-bark";
			};
		};
	};
};
+2 −1
Original line number Diff line number Diff line
@@ -343,7 +343,8 @@
			<0x2 216>, /* tsens1_upper_lower_int	*/
			<0x34 275>, /* qmp_usb3_lfps_rxterm_irq_cx	*/
			<0x57 358>, /*  spmi_periph_irq[0]	*/
			<0x4f 379>, /* usb2phy_intr	*/
			<0x4f 379>, /* usb2phy_intr: qusb2phy_dmse_hv	*/
			<0x51 379>, /* usb2phy_intr: qusb2phy_dpse_hv	*/
			<0x50 384>, /* sp_rmb_sp2soc_irq	*/
			<0xff 16>, /* APC0_qgicQTmrHypPhysIrptReq	*/
			<0xff 17>, /* APC3_qgicQTmrSecPhysIrptReq	*/
+1 −1
Original line number Diff line number Diff line
@@ -1007,7 +1007,7 @@
		      <0x10b4000 0x800>;
		reg-names = "dcc-base", "dcc-ram-base";

		clocks = <&clock_rpmcc GCC_DCC_AHB_CLK>;
		clocks = <&clock_gcc GCC_DCC_AHB_CLK>;
		clock-names = "dcc_clk";
	};

Loading