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

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

Promotion of kernel.lnx.4.4-161219. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1101906   Idc51070e2bb36d1a757d2714d2875a99901321a7   clk: qcom: add common clock framework support for MDSS P
1098508   Ib0a2361f854ae01d0d8090cdd48cfa96308daf93   msm: kgsl: Add Bind objects to dispatcher draw queue
1099255   Ib32d40351179a687eca38228c4503e4a9a88c28d   ARM: dts: msm: Move boot_rom_ahb_clk to proxy voted for
1095243   I18f549102e626dc788e8fa56d6bb1ea28efe4f88   soc: qcom: pil: Initialize variable to avoid invalid acc
1101152   I9f2cb058a7e59b573fc64662ee7b5bff49b18ea7   soc: qcom: pil-q6v5: Update the reset sequence for qdspv
1101152   Id5b8aaae0783893290e95626b394841a7d3808a3   ARM: dts: msm: Remove write of acc register for MSMFalco

Change-Id: If07ab3394784f1dcb31098e5d4737265f136883f
CRs-Fixed: 1099255, 1101906, 1098508, 1101152, 1095243
parents e76a0211 2d28ff09

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

+3 −5
Original line number Diff line number Diff line
@@ -2037,10 +2037,9 @@ 
		clock-names = "xo", "iface_clk", "bus_clk",

			      "mem_clk", "gpll0_mss_clk", "snoc_axi_clk",

			      "mnoc_axi_clk", "qdss_clk";

		qcom,proxy-clock-names = "xo", "qdss_clk";

		qcom,active-clock-names = "iface_clk", "bus_clk", "mem_clk",

					  "gpll0_mss_clk", "snoc_axi_clk",

					  "mnoc_axi_clk";

		qcom,proxy-clock-names = "xo", "qdss_clk", "mem_clk";

		qcom,active-clock-names = "iface_clk", "bus_clk",

			"gpll0_mss_clk", "snoc_axi_clk", "mnoc_axi_clk";



		interrupts = <0 448 1>;

		vdd_cx-supply = <&pm8998_s1_level>;
@@ -2051,7 +2050,6 @@ 
		qcom,pil-self-auth;

		qcom,sysmon-id = <0>;

		qcom,ssctl-instance-id = <0x12>;

		qcom,override-acc;

		qcom,qdsp6v62-1-2;

		status = "ok";

		memory-region = <&modem_mem>;

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

+0 −1
Original line number Diff line number Diff line
@@ -1372,7 +1372,6 @@ 
		qcom,pil-self-auth;

		qcom,sysmon-id = <0>;

		qcom,ssctl-instance-id = <0x12>;

		qcom,override-acc;

		qcom,qdsp6v62-1-5;

		memory-region = <&modem_fw_mem>;

		qcom,mem-protect-id = <0xF>;

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

+0 −1
Original line number Diff line number Diff line
@@ -902,7 +902,6 @@ 
		qcom,pil-self-auth;

		qcom,sysmon-id = <0>;

		qcom,ssctl-instance-id = <0x12>;

		qcom,override-acc;

		qcom,qdsp6v62-1-5;

		memory-region = <&modem_fw_mem>;

		qcom,mem-protect-id = <0xF>;

drivers/clk/qcom/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -218,3 +218,5 @@ config QCOM_A53 
	  Support for the A53 clock controller on MSM devices.

	  Say Y if you want to support CPU frequency scaling on devices

	  such as MSM8916.



source "drivers/clk/qcom/mdss/Kconfig"

drivers/clk/qcom/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -37,3 +37,5 @@ obj-$(CONFIG_KRAITCC) += krait-cc.o 
obj-$(CONFIG_QCOM_A53) += clk-a53.o

obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o

obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o



obj-y += mdss/