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

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

Promotion of kernel.lnx.4.4-160616. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1022772   I24f3b01ae40d1242e64bfc87177142b0d64ac123   msm: mdss: hdmi: enable additional clocks for register a
1027010   I5e192c4d850bb040983024cfe163714fbebbb199   coresight: make 'coresight-name' a required property
1027807   I044ca5209c364d4bfb4f3bd504cdcb87021fd010   clk: msm: clock: Include logic to treat votable clocks/G
1027031   Id3c7c2627bdf37524067512db51d3180c570106d   usb: gadget: f_diag: Decrement counter if zero length pa
1028203   I8f549a48efe19f66e3a336a21b75903f7800ed86   soc: qcom: msm_glink_pkt: Set transport field for device
1027875   If3ca0161923fcd73fdde77984aa5d80bfaec79a1   msm: mdss: enable ref count based PM_QOS request for DSI
1028328   I52761b04c594b10202a3823d49324a4991ecf3e4   msm: ipa3: fix condition tested on ipahal wrapper
1028032   Ie30158592fca057454152f3f46a5d8b89ae36b88   clk: qcom: gcc-msm8996: Add missing BCR for USB3 and PCI
1021499   Ia64afa3adb769674f6a9a60fde2c7397b7e4fe49   usb: gadget: gsi: Fix reporting of USB device's usage co
1028800   Id2625cd71b4c204ce10bc6dd007939834d2b9e10   ARM: dts: msm: Add codec reset gpio device node for msmc
1027443   If04e11b9e44aabb7c9389dbf79ed9c80c66c877e   msm: ipa: fix static analysis issues
1027820   I9f804a122090ea4340f7873a5aa276dff00cbcb7   msm: ipa3: fix qmap deaggregation issue
1029606   If65b653137b5c0f69fb66d77389bd71e6c3a0259   ARM: dts: msm: update attributes for dfps memory for msm

Change-Id: I4f0cf57b1331183a8159ace78586746d20119e31
CRs-Fixed: 1028328, 1028032, 1027443, 1027875, 1027010, 1021499, 1022772, 1027820, 1028203, 1027031, 1027807, 1028800, 1029606
parents fa22bff0 c72e42a4

Documentation/devicetree/bindings/arm/coresight.txt

+4 −1
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ its hardware characteristcs. 
	  layout using the generic DT graph presentation found in

	  "bindings/graph.txt".



	* coresight-name: unique descriptive name of the component.



* Required properties for devices that don't show up on the AMBA bus, such as

  non-configurable replicators:
@@ -54,8 +56,9 @@ its hardware characteristcs. 


	* port or ports: same as above.



* Optional properties for all components:

	* coresight-name: unique descriptive name of the component.



* Optional properties for all components:

	* reg-names: names corresponding to each reg property value.



* Optional properties for ETM/PTMs:

arch/arm/boot/dts/qcom/msm-gdsc-cobalt.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
		regulator-name = "gdsc_hlos1_vote_lpass_adsp";

		reg = <0x17d034 0x4>;

		qcom,no-status-check-on-disable;

		qcom,gds-timeout = <500>;

		status = "disabled";

	};
@@ -47,6 +48,7 @@ 
		regulator-name = "gdsc_hlos1_vote_lpass_core";

		reg = <0x17d038 0x4>;

		qcom,no-status-check-on-disable;

		qcom,gds-timeout = <500>;

		status = "disabled";

	};
@@ -125,6 +127,7 @@ 
		      <0x5066008 0x4>;

		reg-names = "base", "hw_ctrl_addr";

		qcom,no-status-check-on-disable;

		qcom,gds-timeout = <500>;

		status = "disabled";

	};

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

+0 −2
Original line number Diff line number Diff line
@@ -220,8 +220,6 @@ 
		};



		dfps_data_mem: dfps_data_mem@83400000 {

		       compatible = "shared-dma-pool";

		       no-map;

		       reg = <0 0x83400000 0 0x1000>;

		       label = "dfps_data_mem";

		};

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

+9 −4
Original line number Diff line number Diff line
@@ -138,6 +138,14 @@ 
		qcom,node_has_rpm_clock;

		#clock-cells = <1>;

	};



	wcd_rst_gpio: wcd_gpio_ctrl@64 {

		compatible = "qcom,wcd-gpio-ctrl";

		qcom,cdc-rst-n-gpio = <&tlmm 64 0>;

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_reset_active>;

		pinctrl-1 = <&cdc_reset_sleep>;

	};

};



&slim_aud {
@@ -155,10 +163,7 @@ 
			      17 18 19 20 21 22 23 24 25 26 27 28 29

			      30>;



		qcom,cdc-reset-gpio = <&tlmm 64 0>;

		pinctrl-names = "default", "idle";

		pinctrl-0 = <&cdc_reset_active>;

		pinctrl-1 = <&cdc_reset_sleep>;

		qcom,wcd-rst-gpio-node = <&wcd_rst_gpio>;



		clock-names = "wcd_clk", "wcd_native_clk";

		clocks = <&clock_audio clk_audio_pmi_clk>,

drivers/clk/msm/clock-gcc-cobalt.c

+4 −0
Original line number Diff line number Diff line
@@ -1594,6 +1594,7 @@ static struct branch_clk gcc_bimc_gfx_clk = { 
	.cbcr_reg = GCC_BIMC_GFX_CBCR,

	.has_sibling = 1,

	.check_enable_bit = true,

	.no_halt_check_on_disable = true,

	.base = &virt_base,

	.c = {

		.dbg_name = "gcc_bimc_gfx_clk",
@@ -1642,6 +1643,7 @@ static struct branch_clk gcc_gpu_bimc_gfx_clk = { 
	.cbcr_reg = GCC_GPU_BIMC_GFX_CBCR,

	.has_sibling = 1,

	.check_enable_bit = true,

	.no_halt_check_on_disable = true,

	.base = &virt_base,

	.c = {

		.dbg_name = "gcc_gpu_bimc_gfx_clk",
@@ -1664,6 +1666,8 @@ static struct branch_clk gcc_gpu_bimc_gfx_src_clk = { 
static struct branch_clk gcc_gpu_cfg_ahb_clk = {

	.cbcr_reg = GCC_GPU_CFG_AHB_CBCR,

	.has_sibling = 1,

	.check_enable_bit = true,

	.no_halt_check_on_disable = true,

	.base = &virt_base,

	.c = {

		.dbg_name = "gcc_gpu_cfg_ahb_clk",