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

Commit 5ec37333 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of kernel.lnx.4.4-160610. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1024406   If286c5b80874a95be0b5ecc533d0e5c7a14f39d3   usb: gadget: f_mtp: Change the icon to camera for PTP co
983795   I25a00441f91087a370764b451ecc73a49a75b0a6   ARM: dts: msm: vote for PCNOC from IPA on msmcobalt
1023239   Ibf7fc53d3ff7084b252a44c44e3ce29326659787   input: qpnp-power-on: use restart reason bits based upon
1002026   Icb6ec9d060ca4fb02e95c1e98bded89422bb1fff   msm: ipa: Add napi support to rmnet ipa device
1024406   I7e3527b7e08ccfe566d85e3009d8a015d8daa707   USB: gadget: mtp: Fix bug in freeing memory on allocatio
1026703   I462a750aa6ee69f588b4bbcf5cb030f9e7292951   scsi: ufs: fix comments in ufshcd_quirk_tune_host_pa_tac
1024406   I252e830568704e9e557660c1ae0f7597823e4b17   usb: gadget: f_mtp: Add support to capture time taken wi
1024406   Icbee5fe7ae2c02b2bca185a0dc7587eb4940058a   usb: gadget: f_mtp: Fix issue of NULL pointer access in
1024406   I909bebe0d22c19329cebb0a4a76424e08c82328c   USB: gadget: f_mtp: Fix bug in receive_file work
1024406   Idb4e075c89bdf94790a321bc464d30eba546eeaa   usb: gadget: f_mtp: Fix mtp enumeration failure issue
999619   Ic5b38b038508802b0b5779dc5d54ec6772f24b65   msm: camera: isp: Enable write master for stats
1024406   Ieacdc8dd76bc45638002eb749ff87aa95f496fa3   USB: f_mtp: Don't reset string id during function_unbind
1024406   I26cc10986e28a28eab6f3c65f28f4d2b808112d9   USB: gadget: Implement COMPAT_IOCTL for ioctls
1021696   Ic8f02dcc89e716ec88b711496d1e43754b95968d   NFC: Error handling correction in probe

Change-Id: I5b07f77ffc5c6fbf19101159090d3464cbbe6284
CRs-Fixed: 1021696, 1024406, 1023239, 983795, 1026703, 1002026, 999619
parents cc4502ce e3f1df3e

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

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ Optional: 
- qcom,ipa-loaduC: indicate that ipa uC should be loaded

- qcom,ipa-advertise-sg-support: determine how to respond to a query

regarding scatter-gather capability

- qcom,ipa-napi-enable: Boolean context flag to indicate whether

                        to enable napi framework or not



Example:

	qcom,rmnet-ipa {

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

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ Optional: 
- qcom,ipa-loaduC: indicate that ipa uC should be loaded

- qcom,ipa-advertise-sg-support: determine how to respond to a query

regarding scatter-gather capability

- qcom,ipa-napi-enable: Boolean context flag to indicate whether

                        to enable napi framework or not



Example:

	qcom,rmnet-ipa3 {

arch/arm/boot/dts/qcom/msmcobalt.dtsi

+17 −5
Original line number Diff line number Diff line
@@ -900,12 +900,24 @@ 
		clocks = <&clock_gcc clk_ipa_clk>;

		qcom,msm-bus,name = "ipa";

		qcom,msm-bus,num-cases = <4>;

		qcom,msm-bus,num-paths = <2>;

		qcom,msm-bus,num-paths = <3>;

		qcom,msm-bus,vectors-KBps =

		<90 512 0 0>, <90 585 0 0>,         /* No vote */

		<90 512 80000 640000>, <90 585 80000 640000>,    /* SVS */

		<90 512 206000 960000>, <90 585 206000 960000>,    /* NOMINAL */

		<90 512 206000 3600000>, <90 585 206000 3600000>;    /* TURBO */

		/* No vote */

			<90 512 0 0>,

			<90 585 0 0>,

			<1 676 0 0>,

		/* SVS */

			<90 512 80000 640000>,

			<90 585 80000 640000>,

			<1 676 80000 160000>,

		/* NOMINAL */

			<90 512 206000 960000>,

			<90 585 206000 960000>,

			<1 676 206000 200000>,

		/* TURBO */

			<90 512 206000 3600000>,

			<90 585 206000 3600000>,

			<1 676 206000 960000>;

		qcom,bus-vector-names = "MIN", "SVS", "NOMINAL", "TURBO";



		/* IPA RAM mmap */

drivers/input/qpnp-power-on.c

+7 −2
Original line number Diff line number Diff line
@@ -347,8 +347,13 @@ int qpnp_pon_set_restart_reason(enum pon_restart_reason reason) 
	if (!pon->store_hard_reset_reason)

		return 0;



	if (is_pon_gen2(pon))

		rc = qpnp_pon_masked_write(pon, QPNP_PON_SOFT_RB_SPARE(pon),

					   PON_MASK(7, 1), (reason << 1));

	else

		rc = qpnp_pon_masked_write(pon, QPNP_PON_SOFT_RB_SPARE(pon),

					   PON_MASK(7, 2), (reason << 2));



	if (rc)

		dev_err(&pon->pdev->dev,

				"Unable to write to addr=%x, rc(%d)\n",

drivers/media/platform/msm/camera_v2/isp/msm_isp.h

+3 −0
Original line number Diff line number Diff line
@@ -277,6 +277,8 @@ struct msm_vfe_stats_ops { 


	void (*update_cgc_override)(struct vfe_device *vfe_dev,

		uint32_t stats_mask, uint8_t enable);

	void (*enable_stats_wm)(struct vfe_device *vfe_dev,

		uint32_t stats_mask, uint8_t enable);

};



enum msm_isp_hw_client {
@@ -510,6 +512,7 @@ struct msm_vfe_axi_shared_data { 
struct msm_vfe_stats_hardware_info {

	uint32_t stats_capability_mask;

	uint8_t *stats_ping_pong_offset;

	uint8_t *stats_wm_index;

	uint8_t num_stats_type;

	uint8_t num_stats_comp_mask;

};