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

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

Promotion of kernel.lnx.4.4-161124.1. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1090535   Ib1fdb0454c6e1d770ea6ec11a6032f8553d56c06   ARM: dts: msm: change UFS/SDHC2 power supply for msmcoba
1078936   I24f0958f97ca04916b8c6845f3122732e1928e6c   [media] xc2028: avoid use after free
1088324   I2e8ffab214106c01557446e00dbebe2cc2a52bd1   ARM: dts: msm: Add venus device nodes for starlord
1087922   Iec536bcdf4ed95e3d796324fd8bf5df259b340b0   cfg80211: validate beacon int as part of iface combinati
1091347   I9d180e4aedb17692eb2e48f98461239d29bbf975   clk: qcom: Add set_flags ops for the clk_gate2_ops
1091186   Ica381b0b73bd59a10ac8fd876bda5c21678dfddb   defconfig: msm: Add support for GPUCC clocks
1087922   I2f38b8ba1ddbe6041a4189f5d9b72c982f0fb367   cfg80211: make wdev_list accessible to drivers
1078921   I02fda1eb5173f5cf4db999147c623720892da529   block: fix use-after-free in sys_ioprio_get()
1092432   Ifd9f97f8595daac67c733e6120cdb3c89e5a02a4   ARM: dts: msm: Add RTB support for msmfalcon
1093492   Id30415ce0ea73012125ced35771b9aae9f941c22   msm: kgsl: Add support for A512 GPU
1092432   I6d55bf454cd629cd4894b60e40e9266d7e8b5bb9   ARM: dts: msm: Add RTB support for msmtriton
1092430   I32fb4c9a9be83a4448754bffde798432e417b17c   ARM: dts: msm: Add mpm2-sleep-counter device for msmfalc
633497   I3e43b8a704367aff7fe8dd88159315aef811c51c   USB: gagget: f_fs: Return error if TX req is queued duri
1078950   Idc6b27fb0b73b9057541ecc02c6c2aac46b50ffc   tty: Prevent ldisc drivers from re-using stale tty field
1078959   I0fa3cd8d4a0d9ea76d085bba6020f1eda073c09b   cgroup: prefer %pK to %p
959695   I57aa3e8b4987cb1adf9fad514a1fd1e84d44ac3f   msm: vidc: Update mbs per second calculation
1091194   I96406588062da4997851eff8524c53699f1063eb   ASoC: msm: Update supported sample rates for USB Backend
1092561   I13258295e9ae9c8607586ed5686e97276823d08c   clk: qcom: Add support for rf clk1 for msmfalcon
1087922   I282300533dcd80f65c9ba366246d028a6130ffff   cfg80211: identically validate beacon interval for AP/ME
1092425   I97a28cccc0494ea5ff45ccade9721da0c85edef7   ARM: dts: msm: add perf-events support for msmfalcon and
1090894   I42978f2230e95456e4b4e932365e5b2c83445f56   msm: gsi: fix interrupt processing
1086284   I8043a13d366fcb20a8a819c4739177258ad508ac   msm: vidc: fix mutex lock issue
1086805   Id92eabf03c8dace1c0ff801504b8591e9121782d   msm: sde: Correct max downscale factor for SDE rotator
1091186   If3c707877f2a0da04065b57a1c2fd44d256a5303   ARM: dts: msm: Update clock gfx node for MSMfalcon/Trito
1091731   I9c751d777d8402cdea3cdfb27da1a19a98a250e2   ARM: dts: msm: add charger/fg device nodes for PMFALCON
1087922   Ib1ae7221291b8176d61d58e756a3814c80d98d27   cfg80211: fix beacon interval in interface combination i
1072607   If8aa0b094af5ff82fe66c95e3ef2f13632950d2e   clk: qcom: Add support for MMCC clock for MSMFalcon
1078951   I3b04131079a27f0b1cd60df03c793e8d9ffe5e91   HID: core: prevent out-of-bound readings
1092428   Ic72005ca76ceea377154e4b11dceccd7c8dc5ab5   ARM: dts: msm: Add restart node and imem entries for msm
1081961   I242158975f212426268fd6eaf45378826d56d094   clk: qcom: Add snapshot of OSM CPU clock driver
1078920   Ia3c791c6cf81a6c156561106230cbf5e8dfad0bc   block: fix use-after-free in seq file
1091110   I4f8070e7fd0aa39664208cfab2448b5a95ab2326   ARM: dts: msm: Add DT for mediabox variant of apqcobalt
1078915   Iba5975e360eb2b2729b6f958b7cb00bfc469e51b   tcp: fix use after free in tcp_xmit_retransmit_queue()
1078960   Id91de0fcfc4a94f0c6282b59f96cea7cd0fea64c   netfilter: nfnetlink: correctly validate length of batch
1077422   Ideeaa89f15b8895ce7256fed9f614d5c39ef105f   msm: ipa: add api for getting IPA pdev
1093029   I2e657f3237c7ed38111b7bc6bddbf07ef4420924   arm: qcom: correct description for MSMTRITON and MSMFALC
1086284   Id158e5c6d89fc8b761d8cfe92afbf3592877c556   msm: vidc: fix the interrupt miss issue from video hardw
1092430   I2c8ffe10b650777f6c0b697c33e958300c9dbe66   ARM: dts: msm: Add mpm2-sleep-counter device for msmtrit
1092428   I48e84889b0867d98d70056eecae07becebae4c00   ARM: dts: msm: Add restart node and imem entries for msm
1087798   I7e3655be5c3ea0800499cf24c05899f3d518bbd6   msm: vidc: parse 10-bit bus entries for msmfalcon

Change-Id: I634056c9eabd17bcc5ecbf0617d988585be6535a
CRs-Fixed: 1090894, 1091110, 1078959, 1078951, 1078950, 1092428, 1081961, 1092425, 1091731, 1091186, 1087922, 633497, 1090535, 1078920, 959695, 1072607, 1078960, 1086805, 1092430, 1092432, 1091347, 1086284, 1093492, 1092561, 1087798, 1077422, 1093029, 1078915, 1078921, 1078936, 1091194, 1088324
parents 1289f983 bee27471

Documentation/devicetree/bindings/clock/qcom,mmcc.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties : 
			"qcom,mmcc-msm8960"

			"qcom,mmcc-msm8974"

			"qcom,mmcc-msm8996"

			"qcom,mmcc-msmfalcon"



- reg : shall contain base register location and length

- #clock-cells : shall contain 1

Documentation/devicetree/bindings/media/video/msm-vidc.txt

+16 −0
Original line number Diff line number Diff line
@@ -183,6 +183,9 @@ Optional properties: 
- qcom,bus-rage-kbps : an array of two items (<min max>) that indicate the

  minimum and maximum acceptable votes for the bus.

  In the absence of this property <0 INT_MAX> is used.

- qcom,ubwc-10bit : UBWC 10 bit content has different bus requirements,

  this tag will be used to pick the appropriate bus as per the session profile

  as shown below in example.



Example:
@@ -270,4 +273,17 @@ Example: 
			qcom,bus-governor = "msm-vidc-ddr";

			qcom,bus-range-kbps = <1000 3388000>;

		};

		qcom,profile-dec-ubwc-10bit {

			qcom,codec-mask = <0xffffffff>;

			qcom,ubwc-10bit;

			qcom,load-busfreq-tbl =

				<979200 2446336>,  /* UHD30D     */

				<864000 2108416>,  /* 720p240D   */

				<489600 1207296>,  /* 1080p60D   */

				<432000 1058816>,  /* 720p120D   */

				<244800 616448>,   /* 1080p30D   */

				<216000 534528>,   /* 720p60D    */

				<108000 271360>,   /* 720p30D    */

				<0 0>;

		};

	};

arch/arm/boot/dts/qcom/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -113,7 +113,9 @@ dtb-$(CONFIG_ARCH_MSM8998) += msm8998-sim.dtb \ 
	msm8998-v2-cdp.dtb \

	msm8998-v2-qrd.dtb \

	msm8998-qrd-skuk.dtb \

	msm8998-v2-qrd-skuk.dtb \

	msm8998-qrd-vr1.dtb \

	msm8998-v2-qrd-vr1.dtb \

	apq8998-mtp.dtb \

	apq8998-cdp.dtb \

	apq8998-v2-mtp.dtb \
@@ -125,6 +127,7 @@ dtb-$(CONFIG_ARCH_MSM8998) += msm8998-sim.dtb \ 
	apq8998-v2.1-mtp.dtb \

	apq8998-v2.1-cdp.dtb \

	apq8998-v2.1-qrd.dtb \

	apq8998-v2.1-mediabox.dtb \

	msm8998-v2.1-interposer-msmfalcon-cdp.dtb \

	msm8998-v2.1-interposer-msmfalcon-mtp.dtb \

	msm8998-v2.1-interposer-msmfalcon-qrd.dtb

arch/arm/boot/dts/qcom/apq8998-v2.1-mediabox.dts

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



/dts-v1/;



#include "apq8998-v2.1.dtsi"

#include "msm8998-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ 8998 V2.1 mediabox";

	compatible = "qcom,apq8998-cdp", "qcom,apq8998", "qcom,cdp";

	qcom,board-id = <8 1>;

};



&pil_modem {

	status = "disabled";

};



&mdss_mdp {

	qcom,mdss-pref-prim-intf = "hdmi";

};

arch/arm/boot/dts/qcom/msm-pmfalcon.dtsi

+190 −0
Original line number Diff line number Diff line
@@ -273,6 +273,135 @@ 
			};

		};



		pmfalcon_charger: qcom,qpnp-smb2 {

			compatible = "qcom,qpnp-smb2";

			#address-cells = <1>;

			#size-cells = <1>;



			qcom,pmic-revid = <&pmfalcon_revid>;



			io-channels = <&pmfalcon_rradc 8>,

				      <&pmfalcon_rradc 10>,

				      <&pmfalcon_rradc 3>,

				      <&pmfalcon_rradc 4>;

			io-channel-names = "charger_temp",

					   "charger_temp_max",

					   "usbin_i",

					   "usbin_v";



			qcom,wipower-max-uw = <5000000>;

			dpdm-supply = <&qusb_phy0>;



			qcom,thermal-mitigation

					= <3000000 1500000 1000000 500000>;



			qcom,chgr@1000 {

				reg = <0x1000 0x100>;

				interrupts = <0x2 0x10 0x0 IRQ_TYPE_NONE>,

					     <0x2 0x10 0x1 IRQ_TYPE_NONE>,

					     <0x2 0x10 0x2 IRQ_TYPE_NONE>,

					     <0x2 0x10 0x3 IRQ_TYPE_NONE>,

					     <0x2 0x10 0x4 IRQ_TYPE_NONE>;



				interrupt-names = "chg-error",

						  "chg-state-change",

						  "step-chg-state-change",

						  "step-chg-soc-update-fail",

						  "step-chg-soc-update-request";

			};



			qcom,otg@1100 {

				reg = <0x1100 0x100>;

				interrupts = <0x2 0x11 0x0 IRQ_TYPE_NONE>,

					     <0x2 0x11 0x1 IRQ_TYPE_NONE>,

					     <0x2 0x11 0x2 IRQ_TYPE_NONE>,

					     <0x2 0x11 0x3 IRQ_TYPE_NONE>;



				interrupt-names = "otg-fail",

						  "otg-overcurrent",

						  "otg-oc-dis-sw-sts",

						  "testmode-change-detect";

			};



			qcom,bat-if@1200 {

				reg = <0x1200 0x100>;

				interrupts = <0x2 0x12 0x0 IRQ_TYPE_NONE>,

					     <0x2 0x12 0x1 IRQ_TYPE_NONE>,

					     <0x2 0x12 0x2 IRQ_TYPE_NONE>,

					     <0x2 0x12 0x3 IRQ_TYPE_NONE>,

					     <0x2 0x12 0x4 IRQ_TYPE_NONE>,

					     <0x2 0x12 0x5 IRQ_TYPE_NONE>;



				interrupt-names = "bat-temp",

						  "bat-ocp",

						  "bat-ov",

						  "bat-low",

						  "bat-therm-or-id-missing",

						  "bat-terminal-missing";

			};



			qcom,usb-chgpth@1300 {

				reg = <0x1300 0x100>;

				interrupts = <0x2 0x13 0x0 IRQ_TYPE_NONE>,

					     <0x2 0x13 0x1 IRQ_TYPE_NONE>,

					     <0x2 0x13 0x2 IRQ_TYPE_NONE>,

					     <0x2 0x13 0x3 IRQ_TYPE_NONE>,

					     <0x2 0x13 0x4 IRQ_TYPE_NONE>,

					     <0x2 0x13 0x5 IRQ_TYPE_NONE>,

					     <0x2 0x13 0x6 IRQ_TYPE_NONE>,

					     <0x2 0x13 0x7 IRQ_TYPE_NONE>;



				interrupt-names = "usbin-collapse",

						  "usbin-lt-3p6v",

						  "usbin-uv",

						  "usbin-ov",

						  "usbin-plugin",

						  "usbin-src-change",

						  "usbin-icl-change",

						  "type-c-change";

			};



			qcom,dc-chgpth@1400 {

				reg = <0x1400 0x100>;

				interrupts = <0x2 0x14 0x0 IRQ_TYPE_NONE>,

					     <0x2 0x14 0x1 IRQ_TYPE_NONE>,

					     <0x2 0x14 0x2 IRQ_TYPE_NONE>,

					     <0x2 0x14 0x3 IRQ_TYPE_NONE>,

					     <0x2 0x14 0x4 IRQ_TYPE_NONE>,

					     <0x2 0x14 0x5 IRQ_TYPE_NONE>,

					     <0x2 0x14 0x6 IRQ_TYPE_NONE>;



				interrupt-names = "dcin-collapse",

						  "dcin-lt-3p6v",

						  "dcin-uv",

						  "dcin-ov",

						  "dcin-plugin",

						  "div2-en-dg",

						  "dcin-icl-change";

			};



			qcom,chgr-misc@1600 {

				reg = <0x1600 0x100>;

				interrupts = <0x2 0x16 0x0 IRQ_TYPE_NONE>,

					     <0x2 0x16 0x1 IRQ_TYPE_NONE>,

					     <0x2 0x16 0x2 IRQ_TYPE_NONE>,

					     <0x2 0x16 0x3 IRQ_TYPE_NONE>,

					     <0x2 0x16 0x4 IRQ_TYPE_NONE>,

					     <0x2 0x16 0x5 IRQ_TYPE_NONE>,

					     <0x2 0x16 0x6 IRQ_TYPE_NONE>,

					     <0x2 0x16 0x7 IRQ_TYPE_NONE>;



				interrupt-names = "wdog-snarl",

						  "wdog-bark",

						  "aicl-fail",

						  "aicl-done",

						  "high-duty-cycle",

						  "input-current-limiting",

						  "temperature-change",

						  "switcher-power-ok";

			};

		};



		pmfalcon_adc_tm: vadc@3400 {

			compatible = "qcom,qpnp-adc-tm-hc";

			reg = <0x3400 0x100>;
@@ -337,6 +466,67 @@ 
			#size-cells = <0>;

			#io-channel-cells = <1>;

		};



		pmfalcon_fg: qpnp,fg {

			compatible = "qcom,fg-gen3";

			#address-cells = <1>;

			#size-cells = <1>;

			qcom,pmic-revid = <&pmfalcon_revid>;

			io-channels = <&pmfalcon_rradc 0>;

			io-channel-names = "rradc_batt_id";

			qcom,fg-esr-timer-awake = <96>;

			qcom,fg-esr-timer-asleep = <256>;

			qcom,cycle-counter-en;

			status = "okay";



			qcom,fg-batt-soc@4000 {

				status = "okay";

				reg = <0x4000 0x100>;

				interrupts = <0x2 0x40 0x0 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x40 0x1 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x40 0x2 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x40 0x3 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x40 0x4 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x40 0x5

							IRQ_TYPE_EDGE_RISING>,

					     <0x2 0x40 0x6 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x40 0x7 IRQ_TYPE_EDGE_BOTH>;

				interrupt-names = "soc-update",

						  "soc-ready",

						  "bsoc-delta",

						  "msoc-delta",

						  "msoc-low",

						  "msoc-empty",

						  "msoc-high",

						  "msoc-full";

			};



			qcom,fg-batt-info@4100 {

				status = "okay";

				reg = <0x4100 0x100>;

				interrupts = <0x2 0x41 0x0 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x41 0x1 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x41 0x2 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x41 0x3 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x41 0x6 IRQ_TYPE_EDGE_BOTH>;

				interrupt-names = "vbatt-pred-delta",

						  "vbatt-low",

						  "esr-delta",

						  "batt-missing",

						  "batt-temp-delta";

			};



			qcom,fg-memif@4400 {

				status = "okay";

				reg = <0x4400 0x100>;

				interrupts = <0x2 0x44 0x0 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x44 0x1 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x44 0x2 IRQ_TYPE_EDGE_BOTH>;

				interrupt-names = "ima-rdy",

						  "mem-xcp",

						  "dma-grant";

			};

		};

	};



	qcom,pmfalcon@1 {