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

Commit 3564f146 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of kernel.lnx.4.4-161020.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1079955   Ib98ac10d87200a2fd5492e27399f696f2468eba6   qpnp-smb2: implement PE_START property
1079955   Ia0b9e5b011ae72e1afcaf5109b8253d124afc021   usb: pd: Start state machine when PE_START is true
1079955   I9deb48f7bff71b022c5899e6eff7617526d02324   power_supply: Add PE_START property
1079791   Ia90d020f5e0bdf37c600661a1c246dab5b637b3b   sched/hmp: Fix range checking for target load
1077090   I9398a81738a778dfae5282ef6809a8c2174bd589   clk: msm: clock-osm: Update droop timers
1079471   I0419b34fde9d74460b849ee8a7ef7e2cdf5592d2   qpnp-fg-gen3: notify charger with float voltage and FCC
1079471   I72465484b154b1a758285d58906ce7661a246767   qpnp-smb2: support setting FCC and float voltage in batt
1079459   Ic5c9626628f05f3167f9f8d0b78b04b83446f413   qpnp-smb2: Fix LIMITED reporting
1079821   I9d57f3011fee086b2d54997d85bc9a37ccc07e4a   sound: usb: Increase maximum transfer buffer limit
1078551   Ic55c44de74e537463a218619861f28c1e6eb66c1   ARM: dts: msm: Add sound card entry for msmcobalt QVR
1079245   I6131aa646edfd6192e4f0895a7cc97728d6f7536   msm: gsi: add 1ms delay before reset
1079955   I967e3841af614ecd2129bf60dc08a1b19731c4e3   usb: pd: Clear PD_IN_HARD_RESET in PE_SNK_TRANSITION_TO_
1079270   I0c9221c6a748aff5e8fbe889316f729155eded3e   qpnp-smb2: expose parallel slave percentage via battery
1078640   I3cdef3870dfd88562f3435d678698e3a906ae673   ARM: dts: msm: Add support for Venus PIL on msmtriton
1072607   I8e6d7dba762b678070d66e291347af2cdf804ae5   clk: qcom: Update the GPU PLL configuration to 800MHz
1079270   I02a3dc02911646240a1ecee41584903aab971d81   smb-lib: qpnp-smb2: fix input collapse by limiting slave
1057982   Id64f344f4c77749b7d322b31b1557b1cf15965d3   ARM: dts: msm: Add sdhc1 support for msmfalcon
1048291   I90891232d37b95f011b3f2d5278f0fd0f4c9eb71   qcom-charger: smb2: disable EN_TRY_SINK_MODE for PD
1078420   Ib497ef7ecdee6c517205ec76724283d4cbd89bdc   ARM: 8618/1: decompressor: reset ttbcr fields to use TTB
1048242   Id7ec03919e2fd08540cd7e677bf5e4048d73c23d   qcom-charger: smblib: change secure address threshold

Change-Id: Ibb6f28b0e5a8aa53b92d14cebcd02c54734e56ef
CRs-Fixed: 1077090, 1079270, 1078420, 1057982, 1048242, 1079245, 1078551, 1079821, 1079471, 1079459, 1048291, 1078640, 1079955, 1072607, 1079791
parents 6d8759f6 1ff56658
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ __armv7_mmu_cache_on:
		orrne	r0, r0, #1		@ MMU enabled
		movne	r1, #0xfffffffd		@ domain 0 = client
		bic     r6, r6, #1 << 31        @ 32-bit translation system
		bic     r6, r6, #3 << 0         @ use only ttbr0
		bic     r6, r6, #(7 << 0) | (1 << 4)	@ use only ttbr0
		mcrne	p15, 0, r3, c2, c0, 0	@ load page table pointer
		mcrne	p15, 0, r0, c8, c7, 0	@ flush I,D TLBs
		mcr	p15, 0, r0, c7, c5, 4	@ ISB
+29 −0
Original line number Diff line number Diff line
@@ -21,3 +21,32 @@
	compatible = "qcom,msmcobalt-qrd", "qcom,msmcobalt", "qcom,qrd";
	qcom,board-id = <0x02000b 0x80>;
};

&soc {
	sound-tavil {
		qcom,model = "msmcobalt-qvr-tavil-snd-card";
		qcom,audio-routing =
			"RX_BIAS", "MCLK",
			"MADINPUT", "MCLK",
			"AMIC2", "MIC BIAS2",
			"MIC BIAS2", "Headset Mic",
			"DMIC0", "MIC BIAS1",
			"MIC BIAS1", "Digital Mic0",
			"DMIC1", "MIC BIAS1",
			"MIC BIAS1", "Digital Mic1",
			"DMIC2", "MIC BIAS3",
			"MIC BIAS3", "Digital Mic2",
			"DMIC4", "MIC BIAS4",
			"MIC BIAS4", "Digital Mic4",
			"SpkrLeft IN", "SPK1 OUT";

		qcom,msm-mbhc-hphl-swh = <1>;
		/delete-property/ qcom,us-euro-gpios;
		/delete-property/ qcom,hph-en0-gpio;
		/delete-property/ qcom,hph-en0-gpio;

		qcom,wsa-max-devs = <1>;
		qcom,wsa-devs = <&wsa881x_0211>, <&wsa881x_0213>;
		qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrLeft";
	};
};
+64 −0
Original line number Diff line number Diff line
@@ -48,5 +48,69 @@
				output-low;
			};
		};

		/* SDC pin type */
		sdc1_clk_on: sdc1_clk_on {
			config {
				pins = "sdc1_clk";
				bias-disable;		/* NO pull */
				drive-strength = <16>;	/* 16 MA */
			};
		};

		sdc1_clk_off: sdc1_clk_off {
			config {
				pins = "sdc1_clk";
				bias-disable;		/* NO pull */
				drive-strength = <2>;	/* 2 MA */
			};
		};

		sdc1_cmd_on: sdc1_cmd_on {
			config {
				pins = "sdc1_cmd";
				bias-pull-up;		/* pull up */
				drive-strength = <10>;	/* 10 MA */
			};
		};

		sdc1_cmd_off: sdc1_cmd_off {
			config {
				pins = "sdc1_cmd";
				num-grp-pins = <1>;
				bias-pull-up;		/* pull up */
				drive-strength = <2>;	/* 2 MA */
			};
		};

		sdc1_data_on: sdc1_data_on {
			config {
				pins = "sdc1_data";
				bias-pull-up;		/* pull up */
				drive-strength = <10>;	/* 10 MA */
			};
		};

		sdc1_data_off: sdc1_data_off {
			config {
				pins = "sdc1_data";
				bias-pull-up;		/* pull up */
				drive-strength = <2>;	/* 2 MA */
			};
		};

		sdc1_rclk_on: sdc1_rclk_on {
			config {
				pins = "sdc1_rclk";
				bias-pull-down; /* pull down */
			};
		};

		sdc1_rclk_off: sdc1_rclk_off {
			config {
				pins = "sdc1_rclk";
				bias-pull-down; /* pull down */
			};
		};
	};
};
+26 −0
Original line number Diff line number Diff line
@@ -27,3 +27,29 @@
	pinctrl-names = "default";
	pinctrl-0 = <&uart_console_active>;
};

&sdhc_1 {
	/* device core power supply */
	vdd-supply = <&pmfalcon_l4b>;
	qcom,vdd-voltage-level = <2950000 2950000>;
	qcom,vdd-current-level = <200 570000>;

	/* device communication power supply */
	vdd-io-supply = <&pmfalcon_l8a>;
	qcom,vdd-io-always-on;
	qcom,vdd-io-lpm-sup;
	qcom,vdd-io-voltage-level = <1800000 1800000>;
	qcom,vdd-io-current-level = <200 325000>;

	pinctrl-names = "active", "sleep";
	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on &sdc1_rclk_on>;
	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off &sdc1_rclk_off>;

	qcom,clk-rates = <400000 20000000 25000000 50000000 192000000
								384000000>;

	qcom,nonremovable;
	qcom,bus-speed-mode = "HS400_1p8v", "HS200_1p8v", "DDR_1p8v";

	status = "ok";
};
+26 −0
Original line number Diff line number Diff line
@@ -27,3 +27,29 @@
	pinctrl-names = "default";
	pinctrl-0 = <&uart_console_active>;
};

&sdhc_1 {
	/* device core power supply */
	vdd-supply = <&pmfalcon_l4b>;
	qcom,vdd-voltage-level = <2950000 2950000>;
	qcom,vdd-current-level = <200 570000>;

	/* device communication power supply */
	vdd-io-supply = <&pmfalcon_l8a>;
	qcom,vdd-io-always-on;
	qcom,vdd-io-lpm-sup;
	qcom,vdd-io-voltage-level = <1800000 1800000>;
	qcom,vdd-io-current-level = <200 325000>;

	pinctrl-names = "active", "sleep";
	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on &sdc1_rclk_on>;
	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off &sdc1_rclk_off>;

	qcom,clk-rates = <400000 20000000 25000000 50000000 192000000
								384000000>;

	qcom,nonremovable;
	qcom,bus-speed-mode = "HS400_1p8v", "HS200_1p8v", "DDR_1p8v";

	status = "ok";
};
Loading