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

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

Promotion of kernel.lnx.4.4-160526. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
972519   I35151c460b4350ebd414b67c655684c2019f799f   trace: prevent NULL pointer dereference
1013947   I7df9aeb55a95185077c679a217ed8772eb83c8b9   arm64: defconfig: update config options for msm-perf_def
1021612   I312444176373f73f02aa0ceddf5e114a39702641   ARM: msm: dts: fix register dump offsets/ranges for msmc
1019272   I38c637936b398f2fb1665c8233ed5e49e83bf296   thermal: qpnp-temp-alarm: update thermal callback parame
1020529   Ia4f54bfee8111f9f039f772a8bcc7c9a0400d5aa   edac: cortex: Update the error strings to reflect Kryo2x
1005061   I4ed9f1c6ad089f80dcd19762fda151ce1572f471   msm: ipa3: WA for incorrect state retention for GSI chan
1019256   I87cca1215134e6d406f60d54f6d0430978eeae9c   icnss: Add API to return the CE IRQ number
1015545   I5aad7032f3f8048216a41765f1cf91fde98f6ade   msm: ipa3: fix odu debugfs
1006937   Ib8cb979136def6696861a7835bcde763dabe874f   net: Warn for cloned packets in ingress path on SMP syst
1008023   Id9949bef91835318a7b344753983eea0aeab7bdc   msm: ipa3: add support for TX of sk_buff's with paged da
1021612   I4fbc9aa1f30d36d35a9ad181185761e697cbbef7   msm: mdss: Fix qseed3 clk calculation overflow
1019188   Ib52e6551ac67215dab2bc5770ddcf037568f8b77   net: rmnet_data: Fix use after free when sending MAP com
989851   Ifa42fbd475665a0ca581c907ce5432584ea0e7ed   msm: mdss: fix possible out-of-bounds and overflow issue
1016956   I906005680b4cc90cc38dc3d403beebf7aa515ad7   usb: dwc3: Add support handle type-c plug orientation
1019798   I7bccd68866457bb0635ae5166ec935f9e82ba760   soc: qcom: print raw data for gladiator error registers
1017182   I32f312f11fcbebbff0799120448d6e8f0d9ec98d   ARM: dts: msm: Add v4l2 rotator node to msm8996
1020265   Id19733e6e075a427c4aa745b5bedc93f29a2dd4f   ARM: dts: msm: Add nfc device to msmcobalt
988990   I19aa5983316bec4a87811c8aa8b54f770001c45f   msm: mdss: Adding support for destination scaler
993024   I32b0e57c8e958b7e5f1d647e37e46fda052b3d1e   ARM: dts: msm: Support partial goods for msmcobalt
1013948   If024f55095a951329976b6c2736ad5760eae1f4f   arm64: defconfig: update config options for msmcortex-pe
1020515   I2c1fb7dcc698142f9ce42f40164521b8a78268e1   defconfig: msm: Remove incorrect ISPIF version
1013147   Iae6804bcb3121e0852ec5d14d0939623b97a6e67   qcom-charger: Don't automatically set USB_PD type when P
988990   I9a4b9701e078fa39783f33f023eef2da75c1c162   ARM: dts: msm: add extra destination scaler properties f
1020505   I87d18778fef81671c5e7cc261cc70ce07c662933   regulator: cpr3-regulator: support corner bands with no
1019888   I1a8241c1e0a349394351be2ef98381e24f0c4ff4   defconfig: msmcortex: enable qrng drivers
1003367   I75089e210a6fc72683dcf98cdd4da9d6ab3e6fcf   msm: kgsl: Correction of VBIF debug bus data in snapshot
1005061   Id849055526bf70e0cc8161239b4530a7fc575744   ARM: dts: msm: enable WA for IPA channel 20 for msmcobal
1002974   Ic0dedbadc0dd2125bd2a7bcc152972c0555e07f8   msm: kgsl: Defer adding the mem entry to a process
1017182   I6fc5f90512d8024439d56d7c72ae2160df460f7a   defconfig: msm: sde: Add config for v4l2 sde rotator dri
1006067   I6add3800c40cd09f6e6e0cf2720e69059bd83cbc   msm: kgsl: Avoid race condition in ioctl_syncsource_dest
1013147   I77c5875ee8514395a82fac0109b7cff1d507250b   usb: pd: Update power_supply type to USB_PD after PD is
1021612   I62a3bd31997be05181de98307089e2a69d98ab7b   msm: mdss: fix amortized prefill calculations
1019888   I2c808713aaac42345b97665a8990f5bbb9b9145e   ARM: dts: Add qrng driver support for msmcobalt
1013913   I9a17c83d6613ff37cede4a7bb52612465e4d0101   regulator: labibb: Fix slew rate calculation in LAB/IBB
1016956   Idd236136c9f0a9163b4ae7a8405c412f1d69ca9e   usb: pd: Add support to notify plug orientation via extc
1016956   I893c0b729015cd22791d168453309168246961e2   usb: phy: qmp: Configure phy lane based on plug orientat
972998   I6a99fa6961e9205d7d9ccb470873c26adde8a91f   ARM: dts: msm: Change csi clock voting from ispif node
1020505   I6b9d663b44c96dafba26ad25bcfc4b61c8c86d56   regulator: cpr3-regulator: support step quot for CPRh co
977896   I71e6047620066323721c6d542034ddd4b2950e7f   sched: Aggregate for frequency
992942   Iaf90ab4c1d17f903d03458d76cab1b4c0a5c8836   msm: camera: isp: Fix warning and errors based on static
1013787   Ieb0a7aa1b1b5f23220854092dcc2119d29c57146   msm: camera: sensor: Add support for 3B read
1017182   If634894768b02d124ceab071a9eca1c36f258600   msm: mdss: Export rotator interrupt and share rotator sm

Change-Id: I15d2c47b635d84cffdac17adffff8274b6f8e3f4
CRs-Fixed: 1005061, 993024, 989851, 1017182, 1020505, 1021612, 1020529, 1019256, 1003367, 1006937, 1019798, 1016956, 1019272, 1013913, 972519, 1019888, 1013787, 1006067, 1015545, 1019188, 1020515, 1013147, 977896, 1008023, 1002974, 988990, 1013947, 992942, 972998, 1013948, 1020265
parents 89c198ac cd9403e9

Documentation/devicetree/bindings/fb/mdss-mdp.txt

+6 −0
Original line number Diff line number Diff line
@@ -396,6 +396,10 @@ Optional properties: 
				to mdp block. Xin id property is not valid for mdp

				internal blocks like ctl, lm, dspp. It should set

				to 0xff for such blocks.

- qcom,max-dest-scaler-input-width: This 32 bit value provides

				maximum width to the input of destination scaler.

- qcom,max-dest-scaler-output-width: This 32 bit value provides

				maximum width to the output of destination scaler.



Fudge Factors:			Fudge factors are used to boost demand for

				resources like bus bandswidth, clk rate etc. to
@@ -691,6 +695,8 @@ Example: 


		qcom,max-mixer-width = <2048>;

		qcom,max-pipe-width = <2048>;

		qcom,max-dest-scaler-input-width = <2048>;

		qcom,max-dest-scaler-output-width = <2560>;

		qcom,max-clk-rate = <320000000>;

		qcom,vbif-settings = <0x0004 0x00000001>,

				     <0x00D8 0x00000707>;

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

+3 −1
Original line number Diff line number Diff line
@@ -65,7 +65,9 @@ memory allocation over a PCIe bridge 
- qcom,use-rg10-limitation-mitigation:	Boolean context flag to activate

					the mitigation to register group 10

					AP access limitation



- qcom,do-not-use-ch-gsi-20:	Boolean context flag to activate

				software workaround for IPA limitation

				to not use GSI physical channel 20

- qcom,tethered-flow-control:   Boolean context flag to indicate whether

                                apps based flow control is needed for tethered

                                call.

Documentation/devicetree/bindings/regulator/cprh-kbss-regulator.txt

+10 −0
Original line number Diff line number Diff line
@@ -97,6 +97,16 @@ KBSS specific properties: 
                    voltage may be increased as the result of a single

		    CPR measurement.



- qcom,cpr-step-quot-fixed

	Usage:      optional

	Value type: <u32>

	Definition: Fixed step quotient value used by controller for applying

		    the SDELTA margin adjustments on the programmed target

		    quotient values. The step quotient is the number of

		    additional ring oscillator ticks observed for each

		    qcom,voltage-step increase in vdd-supply output voltage.

		    Supported values: 0 - 63.



- qcom,cpr-voltage-settling-time

	Usage:      optional

	Value type: <u32>

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

+12 −8
Original line number Diff line number Diff line
@@ -256,18 +256,22 @@ 
			"vfe0_clk_src", "camss_vfe_vfe0_clk", "camss_csi_vfe0_clk",

			"vfe1_clk_src", "camss_vfe_vfe1_clk", "camss_csi_vfe1_clk";

		qcom,clock-rates = <0 0 0 0

			200000000 0 0 0

			200000000 0 0 0

			200000000 0 0 0

			200000000 0 0 0

			0 0 0 0

			0 0 0 0

			0 0 0 0

			0 0 0 0

			0 0 0

			0 0 0>;

		qcom,clock-control = "NO_SET_RATE", "NO_SET_RATE",

			"NO_SET_RATE", "NO_SET_RATE",

			"SET_RATE", "NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"SET_RATE", "NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"SET_RATE", "NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"SET_RATE", "NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"INIT_RATE",

			"NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"INIT_RATE",

			"NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"INIT_RATE",

			"NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"INIT_RATE",

			"NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"INIT_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"INIT_RATE", "NO_SET_RATE", "NO_SET_RATE";

		status = "ok";

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

+53 −12
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
		      <0x009b8000 0x1040>;

		reg-names = "mdp_phys", "vbif_phys", "vbif_nrt_phys";

		interrupts = <0 83 0>;

		interrupt-controller;

		#interrupt-cells = <1>;

		vdd-supply = <&gdsc_mdss>;



		#address-cells = <1>;
@@ -87,14 +89,12 @@ 
		qcom,mdss-pipe-cursor-clk-ctrl-offsets = <0x3A8 16 15>,

							 <0x3B0 16 15>;





		qcom,mdss-ctl-off = <0x00002000 0x00002200 0x00002400

				     0x00002600 0x00002800>;

				     0x00002600>;

		qcom,mdss-mixer-intf-off = <0x00045000 0x00046000

					0x00047000 0x0004A000>;

		qcom,mdss-mixer-wb-off = <0x00048000 0x00049000>;

		qcom,mdss-dspp-off = <0x00055000 0x00057000>;

		qcom,mdss-wb-off = <0x00065000 0x00065800 0x00066000>;

		qcom,mdss-wb-off = <0x00066000>;

		qcom,mdss-intf-off = <0x0006B000 0x0006B800

					0x0006C000 0x0006C800>;

		qcom,mdss-pingpong-off = <0x00071000 0x00071800
@@ -103,6 +103,7 @@ 
		qcom,mdss-ppb-ctl-off = <0x00000330 0x00000338>;

		qcom,mdss-ppb-cfg-off = <0x00000334 0x0000033C>;

		qcom,mdss-has-pingpong-split;

		qcom,mdss-has-separate-rotator;



		qcom,mdss-ad-off = <0x0079000 0x00079800 0x0007a000>;

		qcom,mdss-cdm-off = <0x0007a200>;
@@ -111,7 +112,6 @@ 
		qcom,mdss-has-source-split;

		qcom,mdss-highest-bank-bit = <0x2>;

		qcom,mdss-has-decimation;

		qcom,mdss-has-rotator-downscale;

		qcom,mdss-idle-power-collapse-enabled;

		clocks = <&clock_mmss clk_mdss_ahb_clk>,

			 <&clock_mmss clk_mdss_axi_clk>,
@@ -530,11 +530,15 @@ 
	};



	mdss_rotator: qcom,mdss_rotator {

		compatible = "qcom,mdss_rotator";

		qcom,mdss-wb-count = <2>;

		qcom,mdss-has-downscale;

		qcom,mdss-has-ubwc;

		qcom,mdss-has-reg-bus;

		compatible = "qcom,sde_rotator";

		reg = <0x00900000 0x90000>,

		      <0x009b8000 0x1040>;

		reg-names = "mdp_phys",

			"rot_vbif_phys";

		qcom,mdss-wb-count = <1>;

		qcom,mdss-wb-id = <1>;

		qcom,mdss-ctl-id = <4>;

		qcom,mdss-highest-bank-bit = <0x2>;

		/* Bus Scale Settings */

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

		qcom,msm-bus,num-cases = <3>;
@@ -550,7 +554,44 @@ 
		qcom,supply-names = "rot-mmagic-mdss-gdsc", "rot-vdd";



		clocks = <&clock_mmss clk_mmss_misc_ahb_clk>,

			<&clock_mmss clk_mdss_rotator_vote_clk>;

		clock-names = "iface_clk", "rot_core_clk";

			<&clock_mmss clk_mdss_rotator_vote_clk>,

			<&clock_mmss clk_mdss_ahb_clk>,

			<&clock_mmss clk_mdss_axi_clk>,

			<&clock_mmss clk_mdp_clk_src>,

			<&clock_mmss clk_mdss_mdp_vote_clk>;

		clock-names = "iface_clk", "rot_core_clk",

			"mdss_ahb_clk", "mdss_axi_clk", "mdp_clk_src",

			"mdss_mdp_vote_clk";



		interrupt-parent = <&mdss_mdp>;

		interrupts = <32 0>;



		/* VBIF QoS remapper settings*/

		qcom,mdss-rot-vbif-qos-setting = <1 1 1 1>;



		qcom,mdss-default-ot-rd-limit = <32>;

		qcom,mdss-default-ot-wr-limit = <16>;



		smmu_rot_unsecure: qcom,smmu_rot_unsec_cb {

			compatible = "qcom,smmu_sde_rot_unsec";

			iommus = <&rot_smmu 0>;

			gdsc-mdss-supply = <&gdsc_mmagic_mdss>;

			clocks = <&clock_mmss clk_smmu_rot_ahb_clk>,

				<&clock_mmss clk_mmagic_mdss_axi_clk>,

				<&clock_mmss clk_smmu_rot_axi_clk>;

			clock-names = "rot_ahb_clk", "mmagic_mdss_axi_clk",

				"rot_axi_clk";

		};



		smmu_rot_secure: qcom,smmu_rot_sec_cb {

			compatible = "qcom,smmu_sde_rot_sec";

			iommus = <&rot_smmu 1>;

			gdsc-mdss-supply = <&gdsc_mmagic_mdss>;

			clocks = <&clock_mmss clk_smmu_rot_ahb_clk>,

				<&clock_mmss clk_mmagic_mdss_axi_clk>,

				<&clock_mmss clk_smmu_rot_axi_clk>;

			clock-names = "rot_ahb_clk", "mmagic_mdss_axi_clk",

				"rot_axi_clk";

		};

	};

};