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

Commit 9876c3c7 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of kernel.lnx.4.4-160607. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1015627   I570b66886edf949c3d77027d0dc8baf820c5cf0f   wil6210: change RX_HTRSH interrupt print level to debug
1023892   I0d2442c7b3d156ad919626a6015f0fbbf2116c3f   ASoC: msm: enable HDMI audio for 8996
1021086   Ieae3c1f9fce6a753821c898bcda7cd67a6b04c20   defconfig: arm64: enable dummy CoreSight source driver
1023377   Ifa797703da0ac846167651c7ed03a6710ba41867   ARM: dts: msm: Correct the offset for AD blocks on msmco
1024957   Ibc0b0506b2090f4c090d649f6e3ae7d42b102c93   usb: dwc3: Fix extcon notification for non-type-c usb ca
1024406   I68c32ef3d08b2cf943b52a7269785d0a00146953   usb: gadget: f_mtp: Make RX buffer size aligned to EP's
1025380   I02fc72583fcd9bc27156ce717b52ef17e16313d5   msm: mdss: fix solidfill config for multi-rect pipes
1015627   Ib7ff8f1debd6873069df42efd7d832db64701258   wil6210: add function name to wil log macros
1024406   I74d5da09437c25e9f1772f7cd49aecb8e4fedcf2   USB: gadget: mtp: Add module parameter for Rx transfer l
1023830   I96345f025e0da99d595e60b37f34bf581927c153   msm: wlan: Regulatory updates
1015627   If1cdfdb2086ff7e3dbf02e9a5920ef3ed0a31280   wil6210: support regular scan on P2P_DEVICE interface
1024406   I2cd9780f8b3e0ce541472c4d25c8294f11a45d76   USB: f_mtp: Handle corner cases on reception of Cancel r
999360   I2cd27481cc0fb189e35ea44709fe27ad0884fcfd   ARM: dts: msm: Increase snapshot size for msm8996 and ms
1025592   I67fef3fc65b24febef070ca9f896036f38a87fb9   ARM: dts: msm: Set alignment to 4 MB for msmcobalt
1011072   Ib357ee3c3a461613bfd1268ec8f98973c2982c10   drivers: thermal: Add ftrace events for LMH DCVSh mitiga
993338   I85cb0223ce45de2712c20a3a0edffe2a84b80f01   soc: rpm-smd: Support new format of rpm messaging
1025294   I768a9c4886aa3fe2e827aba682f67bac2dba6f71   mm/page_alloc: prevent merging between isolated and othe
1024406   I675fc3303be2aba081d2ab59a9efb94aa478f849   USB: gadget: mtp: Add module parameters for Tx transfer
1015627   Ic6bbe8b2aee53d019013159cd21597c2fa0f298f   wil6210: prevent deep sleep of 60G device in critical pa
1024406   I2eedf829f267150ff7a303824e95963219a1f555   USB: gadget: mtp: Fix OUT endpoint request length usage
1023830   I3c450ceae589ec8758eb0f0323140faab0cbc43b   msm: wlan: Change Tx Power for ETSI1 regulatory domain
1024948   I562bb546f49b1605f20fb7d705f40584d190230b   clk: msm: clock: Add support for programming the GCC_GPU
1024406   Ie95cbfc9444c56c8268b70e2916713190699c71a   USB: Add super speed descriptors for gadget functions
1024406   I0e706d5280a2460baf6ab05dbf97a09c59b642fb   USB: f_mtp: Check if the ep is not disabled before queui
973565   I4b52c7bfb3713ffd4a5bcb2aacd134d69d1dbcd4   ARM: dts: msm8998: Temporary disable GPU Turbo on A540
1019910   If6fdebb36d7108b2ac9b5f3c8a787d305505545c   ARM: dts: msm: Update the LMH interrupt information for
1015627   I41eecc91730c60a1851969f8fecf7c201b8b2050   wil6210: print debug message when transmitting while dis
1015627   I3b7770b0cbaec634ca566a82ccc648b6835d75a0   wil6210: add support for device led configuration
1021086   I5d08f4f4db00affd5f7a9e6709714d862d42c6ef   ARM: dts: msm: add dummy WCSS tpdm device for msmcobalt
1021964   I191c4709e79d1b13e3f6fd31c5e738d3c2094bc7   msm: ipa3: fix dereferencing of offset_entry without che
1015627   I9fa0e28d91d0962fc7f05b2cf92c99c2431a2295   wil6210: unmask RX_HTRSH interrupt only when connected
987939   I1b1f1801eb0578644b2e954a3a3ade17b3f2a1fd   msm: camera: Setting actuator to initial position
1006333   If72eed62e28ccaafa2e0fb6186ec88571b4e657a   ARM: dts: msm: Enable QoS settings for fabs for msmcobal
1024406   Ia8cbd1cd8c81b90389900b83744b2bed89068db5   USB: f_mtp: Fix corner cases in MTP driver while syncing

Change-Id: I8692b7ea10e8fc42a4cfdfecbc68fb5feb853f0c
CRs-Fixed: 987939, 1015627, 1021964, 1011072, 1023377, 1021086, 993338, 1023830, 999360, 973565, 1024406, 1025592, 1019910, 1024957, 1006333, 1025380, 1025294, 1023892, 1024948
parents bb9837e5 31bcecd1

Documentation/devicetree/bindings/arm/msm/rpm-smd.txt

+4 −1
Original line number Diff line number Diff line
@@ -26,11 +26,14 @@ Required properties 
Optional properties

- rpm-standalone: Allow RPM driver to run in standalone mode irrespective of RPM

			channel presence.

- reg: Contains the memory address at which rpm messaging format version is

  stored. If this field is not present, the target only supports v0 format.



Example:



	qcom,rpm-smd {

	qcom,rpm-smd@68150 {

		compatible = "qcom,rpm-smd", "qcom,rpm-glink";

		reg = <0x68150 0x3200>;

		qcom,rpm-channel-name = "rpm_requests";

		qcom,rpm-channel-type = 15; /* SMD_APPS_RPM */

		qcom,glink-edge = "rpm";

Documentation/devicetree/bindings/gpu/adreno.txt

+4 −0
Original line number Diff line number Diff line
@@ -130,6 +130,10 @@ Optional Properties: 
				rendering thread is running on masked CPUs.

				Bit 0 is for CPU-0, bit 1 is for CPU-1...



- qcom,snapshot-size:

				Specify the size of snapshot in bytes. This will override

				snapshot size defined in the driver code.



GPU Quirks:

- qcom,gpu-quirk-two-pass-use-wfi:

				Signal the GPU to set Set TWOPASSUSEWFI bit in

arch/arm/boot/dts/qcom/msm8996-gpu.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ 


		qcom,highest-bank-bit = <15>;



		qcom,snapshot-size = <1048576>; //bytes



		/* Trace bus */

		coresight-id = <300>;

		coresight-name = "coresight-gfx";

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

+45 −8
Original line number Diff line number Diff line
@@ -35,13 +35,24 @@ 
			label = "fab-a1noc";

			qcom,fab-dev;

			qcom,base-name = "a1noc-base";

			qcom,bypass-qos-prg;

			qcom,bus-type = <1>;

			qcom,qos-off = <4096>;

			qcom,base-offset = <36864>;

			clock-names = "bus_clk", "bus_a_clk";

			clocks = <&clock_gcc clk_aggre1_noc_clk>,

				<&clock_gcc clk_aggre1_noc_a_clk>;

			qcom,node-qos-clks {

				clock-names =

				"clk-ufs-axi-clk",

				"clk-aggre1-ufs-axi-no-rate",

				"clk-aggre1-usb3-axi-cfg-no-rate",

				"clk-blsp2-ahb-no-rate";

				clocks =

				<&clock_gcc clk_gcc_ufs_axi_clk>,

				<&clock_gcc clk_gcc_aggre1_ufs_axi_clk>,

				<&clock_gcc clk_gcc_aggre1_usb3_axi_clk>,

				<&clock_gcc clk_gcc_blsp2_ahb_clk>;

			};

		};



		fab_a2noc: fab-a2noc {
@@ -49,13 +60,24 @@ 
			label = "fab-a2noc";

			qcom,fab-dev;

			qcom,base-name = "a2noc-base";

			qcom,bypass-qos-prg;

			qcom,bus-type = <1>;

			qcom,qos-off = <4096>;

			qcom,base-offset = <20480>;

			clock-names = "bus_clk", "bus_a_clk";

			clocks = <&clock_gcc clk_aggre2_noc_clk>,

				<&clock_gcc clk_aggre2_noc_a_clk>;

			qcom,node-qos-clks {

				clock-names =

				"clk-ipa-clk",

				"clk-sdcc2-ahb-no-rate",

				"clk-sdcc4-ahb-no-rate",

				"clk-blsp1-ahb-no-rate";

				clocks =

				<&clock_gcc clk_ipa_clk>,

				<&clock_gcc clk_gcc_sdcc2_ahb_clk>,

				<&clock_gcc clk_gcc_sdcc4_ahb_clk>,

				<&clock_gcc clk_gcc_blsp1_ahb_clk>;

			};

		};



		fab_bimc: fab-bimc {
@@ -64,7 +86,6 @@ 
			qcom,fab-dev;

			qcom,base-name = "bimc-base";

			qcom,bus-type = <2>;

			qcom,bypass-qos-prg;

			qcom,util-fact = <153>;

			clock-names = "bus_clk", "bus_a_clk";

			clocks = <&clock_gcc clk_bimc_msmbus_clk>,
@@ -76,7 +97,6 @@ 
			label = "fab-cnoc";

			qcom,fab-dev;

			qcom,base-name = "cnoc-base";

			qcom,bypass-qos-prg;

			qcom,bus-type = <1>;

			clock-names = "bus_clk", "bus_a_clk";

			clocks = <&clock_gcc clk_cnoc_clk>,
@@ -108,7 +128,6 @@ 
			label = "fab-mnoc";

			qcom,fab-dev;

			qcom,base-name = "mnoc-base";

			qcom,bypass-qos-prg;

			qcom,bus-type = <1>;

			qcom,qos-off = <4096>;

			qcom,base-offset = <16384>;
@@ -116,6 +135,25 @@ 
			clock-names = "bus_clk", "bus_a_clk";

			clocks = <&clock_gcc clk_mmssnoc_axi_clk>,

				<&clock_gcc clk_mmssnoc_axi_a_clk>;

			qcom,node-qos-clks {

				clock-names =

				"clk-noc-cfg-ahb-no-rate",

				"clk-mnoc-ahb-no-rate",

				"clk-mdss-ahb-no-rate",

				"clk-mdss-axi-no-rate",

				"clk-camss-ahb-no-rate",

				"clk-video-ahb-no-rate",

				"clk-video-axi-no-rate";

				clocks =

				<&clock_gcc clk_gcc_mmss_noc_cfg_ahb_clk>,

				<&clock_mmss clk_mmss_mnoc_ahb_clk>,

				<&clock_mmss clk_mmss_mdss_ahb_clk>,

				<&clock_mmss clk_mmss_mdss_axi_clk>,

				<&clock_mmss clk_mmss_camss_ahb_clk>,

				<&clock_mmss clk_mmss_video_ahb_clk>,

				<&clock_mmss clk_mmss_video_axi_clk>;

			};



		};



		fab_snoc: fab-snoc {
@@ -123,7 +161,6 @@ 
			label = "fab-snoc";

			qcom,fab-dev;

			qcom,base-name = "snoc-base";

			qcom,bypass-qos-prg;

			qcom,bus-type = <1>;

			qcom,qos-off = <4096>;

			qcom,base-offset = <20480>;
@@ -169,7 +206,7 @@ 
			qcom,buswidth = <16>;

			qcom,agg-ports = <1>;

			qcom,ap-owned;

			qcom,qport = <3>;

			qcom,qport = <2>;

			qcom,qos-mode = "fixed";

			qcom,connections = <&slv_a1noc_snoc>;

			qcom,prio1 = <1>;
@@ -198,7 +235,7 @@ 
			label = "mas-blsp-2";

			qcom,buswidth = <16>;

			qcom,agg-ports = <1>;

			qcom,qport = <3>;

			qcom,qport = <4>;

			qcom,qos-mode = "fixed";

			qcom,connections = <&slv_a1noc_snoc>;

			qcom,bus-dev = <&fab_a1noc>;

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

+56 −0
Original line number Diff line number Diff line
@@ -920,6 +920,14 @@ 
						<&tpda_out_funnel_qatb>;

				};

			};

			port@2 {

				reg = <3>;

				funnel_qatb_in_funnel_dlet_qatb: endpoint {

					slave-mode;

					remote-endpoint =

					    <&funnel_dlet_qatb_out_funnel_qatb>;

				};

			};

		};

	};
@@ -1473,4 +1481,52 @@ 
			};

		};

	};



	funnel_dlet_qatb: funnel@7225000 {

		compatible = "arm,primecell";

		arm,primecell-periphid = <0x0003b908>;



		reg = <0x7225000 0x1000>;

		reg-names = "funnel-base";



		coresight-name = "coresight-funnel-dlet-qatb";



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;

		clock-names = "apb_pclk", "core_a_clk";



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				funnel_dlet_qatb_out_funnel_qatb: endpoint {

					remote-endpoint =

					    <&funnel_qatb_in_funnel_dlet_qatb>;

				};

			};

			port@1 {

				reg = <1>;

				funnel_dlet_qatb_in_tpdm_wcss: endpoint {

					slave-mode;

					remote-endpoint =

					      <&tpdm_wcss_out_funnel_dlet_qatb>;

				};

			};

		};

	};



	dummy-tpdm-wcss {

		compatible = "qcom,coresight-dummy";



		coresight-name = "coresight-tpdm-wcss";



		port{

			tpdm_wcss_out_funnel_dlet_qatb: endpoint {

				remote-endpoint =

					<&funnel_dlet_qatb_in_tpdm_wcss>;

			};

		};

	};

};