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

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

Promotion of kernel.lnx.4.4-160910. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1063870   I535ec77009a73f6ea95e4060177ca7b8e6a2c8d1   soc: qcom: remoteqdss: Fix build error on 32bit
1057143   Ie6f19319b75f3bf389ddd5a8168fd3bcd3efbc8b   diag: Clear masks upon logging exit
1059153   I1682481dfe22deef300ea9bd1db558ae634c9129   clk: msm: clock-osm: Add measurement support for CPU clo
1046961   If5abca579e264cc7799310628c4e379ac4368e7e   input: ft5x06: Add support for clocks for secure touch o
1046961 974549   Ibf873594722c6f299eb4cacf81804cb6548824a4   input: ft5x06: add secure touch support for Focaltech on
1065319   Ide59d8c2753364840f8a2b304ef0c169870c8509   drivers: GICv3: remove the rtb logs of gic write and rea
1060274   Ie817970cb10c879d04ffe5e2a853ada8bf8a1f88   icnss: Enhance debugging capabilities
1059091   I334c1d17b7b63baeb7a36cc26e513b28b106002b   usb: gadget: u_ether: Add missing rx work initialization
1032875   I881f18217b703a497efa4799288dee39a28ea8ab   msm-core: debug: Fix the number of arguments for sysfs n
1064318   I08a385b360d9d0184fd7339194630d8f75a6676f   ARM: dts: msm: update corner switch delay time for msmco
1060274   I690e7af912ce3aee5f0a2817e20f00d6a0ec9608   icnss: Separete IPC logging for register access
1064802   I3c3eebca86062f11b80af93ba3716695eb787376   sched: Move data structures under CONFIG_SCHED_HMP
1064536   Ib410cae212afb067f5df2e5d25f4f23f583ed1f2   soc: qcom: pil: allow to set subsystem firmware name
1063870   I4f8302385010cf2e5c3d9baa717bd2d7d1237853   defconfig: msm: Enable CONFIG_QCOM_REMOTEQDSS for 32-bit
1057024   If7f8233a0eb2644e5534a51a4a4f65212d448382   usb: dwc3-msm: Only set vbus_draw for SDP type
1056669   I67a6ad6d2bc036a63714403e2eed8c0577ef0246   usb: pd: Fix unbalanced vconn regulator disable
1046961   Ib36e9d7661ee3d2ce7b229d8692e6212e33cbf36   input: ft5x06: check return value of kobject_create_and_
1048826   I824d980b208da3a15d35f74970755c8f18500263   video: adf: zero out mapping data on adf_buffer_map() fa
1064242   I7e670e6cf1583e5cd97add65106d9964509f2686   clk: msm: clock-osm: update register initialization for
1062502   I58b05ae64706865a16cc52a1f81e484c396cc6f0   icnss: Add IO reset logic
1060274   I0c594ca4db2a39078a480e45e422c24aa5afba04   defconfig: msmcortex: Enable CONFIG_ICNSS_DEBUG
1056821   I6845ed3863ab98a06829372ff1a3d460680def30   ARM: dts: msm: Add stub regulator devices for msmfalcon
1054344   I30492b79b96356177cdcc72e4e2ee656317de500   msm-core: debug: Update the number of supported pstates
1060407   I577dbff1cf2ee3711e1879aaa6dc48c72f98b98c   soc: qcom: glink: Reduce code under spinlock
1046961   I4bc156de12a8b41c3640c4f1fb2d32ca3d8b5b43   input: ft5x06: create secure touch sysfs files

Change-Id: Ie1d9b8865157350eb26741557ea668c043301d69
CRs-Fixed: 1057143, 1059091, 1032875, 1064318, 1064242, 1056669, 1060274, 1064802, 1065319, 1056821, 1059153, 1063870, 1046961, 1048826, 1057024, 1054344, 1064536, 1060407, 1062502, 974549
parents a196e7fb 8bd9feaf

Documentation/devicetree/bindings/arm/msm/qcom,osm.txt

+7 −5
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ Properties: 
- compatible

	Usage:      required

	Value type: <string>

	Definition: must be "qcom,cpu-clock-osm".

	Definition: must be "qcom,cpu-clock-osm-msmcobalt-v1" or

		    "qcom,cpu-clock-osm-msmcobalt-v2".



- reg

	Usage:      required
@@ -22,7 +23,7 @@ Properties: 
	Usage:      required

	Value type: <stringlist>

	Definition: Address names. Must be "osm", "pwrcl_pll", "perfcl_pll",

		    and "apcs_common". Optionally, "pwrcl_efuse" or

		    "apcs_common" and "debug". Optionally, "pwrcl_efuse" or

		    "perfcl_efuse".

		    Must be specified in the same order as the corresponding

		    addresses are specified in the reg property.
@@ -299,13 +300,14 @@ Properties: 
Example:



	clock_cpu: qcom,cpu-clock-cobalt@179c0000 {

		compatible = "qcom,cpu-clock-osm";

		compatible = "qcom,cpu-clock-osm-msmcobalt-v1";

		reg = <0x179C0000 0x4000>,

		      <0x17916000 0x1000>,

		      <0x17816000 0x1000>,

		      <0x179D1000 0x1000>;

		      <0x179D1000 0x1000>,

		      <0x1791101c 0x8>;

		reg-names = "osm", "pwrcl_pll", "perfcl_pll",

			    "apcs_common";

			    "apcs_common", "debug";



		vdd-pwrcl-supply = <&apc0_pwrcl_vreg>;

		vdd-perfcl-supply = <&apc1_perfcl_vreg>;

Documentation/devicetree/bindings/input/touchscreen/ft5x06-ts.txt

+7 −0
Original line number Diff line number Diff line
@@ -72,6 +72,9 @@ Optional properties: 
 - focaltech,psensor-support	: specify whether support the proximity sensor

 - focaltech,gesture-support	: specify whether support gesture feature

 - focaltech,resume-in-workqueue : specifiy whether to defer the resume to workqueue

 - clock-names:               : Clock names used for secure touch. They are: "iface_clk", "core_clk"

 - clocks                        : Defined if 'clock-names' DT property is defined. These clocks

				   are associated with the underlying I2C bus.



Example:

	i2c@f9923000{
@@ -109,5 +112,9 @@ Example: 
			focaltech,fw-auto-cal;

			focaltech,psensor-support;

			focaltech,gesture-support;

			/* Underlying clocks used by secure touch */

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

			clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,

			<&clock_gcc clk_gcc_blsp1_qup3_i2c_apps_clk>;

		};

	};

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

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
};



&clock_cpu {

	compatible = "qcom,cpu-clock-osm-msmcobalt-v2";

	/delete-property/ qcom,llm-sw-overr;

	qcom,pwrcl-speedbin0-v0 =

		<   300000000 0x0004000f 0x01200020 0x1 >,

		<   364800000 0x05040013 0x01200020 0x1 >,
@@ -222,6 +224,7 @@ 


&apc0_cpr {

	compatible = "qcom,cprh-msmcobalt-v2-kbss-regulator";

	qcom,cpr-corner-switch-delay-time = <1042>;

};



&apc0_pwrcl_vreg {
@@ -367,6 +370,7 @@ 


&apc1_cpr {

	compatible = "qcom,cprh-msmcobalt-v2-kbss-regulator";

	qcom,cpr-corner-switch-delay-time = <1042>;

};



&apc1_perfcl_vreg {

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

+7 −5
Original line number Diff line number Diff line
@@ -803,14 +803,15 @@ 
	};



	clock_cpu: qcom,cpu-clock-cobalt@179c0000 {

		compatible = "qcom,cpu-clock-osm";

		compatible = "qcom,cpu-clock-osm-msmcobalt-v1";

		reg = <0x179c0000 0x4000>,

		      <0x17916000 0x1000>,

		      <0x17816000 0x1000>,

		      <0x179d1000 0x1000>,

		      <0x00784130 0x8>;

		      <0x00784130 0x8>,

		      <0x1791101c 0x8>;

		reg-names = "osm", "pwrcl_pll", "perfcl_pll",

			    "apcs_common", "perfcl_efuse";

			    "apcs_common", "perfcl_efuse", "debug";



		vdd-pwrcl-supply = <&apc0_pwrcl_vreg>;

		vdd-perfcl-supply = <&apc1_perfcl_vreg>;
@@ -943,10 +944,11 @@ 
		reg = <0x162000 0x4>;

		reg-names = "cc_base";

		clock-names = "debug_gpu_clk", "debug_gfx_clk",

				"debug_mmss_clk";

				"debug_mmss_clk", "debug_cpu_clk";

		clocks = <&clock_gpu clk_gpucc_gcc_dbg_clk>,

			 <&clock_gfx clk_gfxcc_dbg_clk>,

			 <&clock_mmss clk_mmss_debug_mux>;

			 <&clock_mmss clk_mmss_debug_mux>,

			 <&clock_cpu clk_cpu_debug_mux>;

		#clock-cells = <1>;

	};

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

0 → 100644
+358 −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.

 */



/* Stub regulators */



/ {

	/* PM660A S1 - VDD_APC0 supply */

	pm660_s1a: regulator-pm660-s1a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_s1a";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <565000>;

		regulator-max-microvolt = <1170000>;

	};



	/* PM660A S2 + S3 = VDD_APC1 supply */

	pm660_s2a: regulator-pm660-s2a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_s2a";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <565000>;

		regulator-max-microvolt = <1170000>;

	};



	pm660_s4a: regulator-pm660-s4a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_s4a";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <1805000>;

		regulator-max-microvolt = <2040000>;

	};



	pm660_s5a: regulator-pm660-s5a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_s5a";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <1350000>;

		regulator-max-microvolt = <1350000>;

	};



	pm660_s6a: regulator-pm660-s6a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_s6a";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <504000>;

		regulator-max-microvolt = <992000>;

	};



	pm660_s1b: regulator-pm660-s1b {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_s1b";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <1125000>;

		regulator-max-microvolt = <1125000>;

	};



	pm660_s2b: regulator-pm660-s2b {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_s2b";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <1050000>;

		regulator-max-microvolt = <1050000>;

	};



	/* PM660B S3 + S4 - VDD_CX supply */

	pm660_s3b_level: regulator-pm660-s3b-level {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_s3b_level";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;

		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;

	};



	pm660_s3b_floor_level: regulator-pm660-s3b-floor-level {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_s3b_floor_level";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;

		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;

	};



	pm660_s3b_level_ao: regulator-pm660-s3b-level-ao {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_s3b_level_ao";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;

		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;

	};



	/* PM660B S5 - VDD_MX supply */

	pm660_s5b_level: regulator-pm660-s5b-level {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_s5b_level";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;

		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;

	};



	pm660_s5b_floor_level: regulator-pm660-s5b-floor-level {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_s5b_floor_level";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;

		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;

	};



	pm660_s5b_level_ao: regulator-pm660-s5b-level-ao {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_s5b_level_ao";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;

		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;

	};



	pm660_l1a: regulator-pm660-l1a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l1a";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1150000>;

		regulator-max-microvolt = <1250000>;

	};



	pm660_l2a: regulator-pm660-l2a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l2a";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <950000>;

		regulator-max-microvolt = <1010000>;

	};



	pm660_l3a: regulator-pm660-l3a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l3a";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <950000>;

		regulator-max-microvolt = <1010000>;

	};



	/* TODO: remove if ADRASTEA CX/MX not voted from APPS */

	pm660_l5a: regulator-pm660-l5a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l5a";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <525000>;

		regulator-max-microvolt = <950000>;

	};



	pm660_l6a: regulator-pm660-l6a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l6a";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <1370000>;

	};



	pm660_l7a: regulator-pm660-l7a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l7a";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <1200000>;

	};



	pm660_l8a: regulator-pm660-l8a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l8a";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1750000>;

		regulator-max-microvolt = <1900000>;

	};



	pm660_l9a: regulator-pm660-l9a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l9a";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1750000>;

		regulator-max-microvolt = <1900000>;

	};



	pm660_l10a: regulator-pm660-l10a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l10a";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1780000>;

		regulator-max-microvolt = <1950000>;

	};



	pm660_l11a: regulator-pm660-l11a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l11a";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1780000>;

		regulator-max-microvolt = <1950000>;

	};



	pm660_l12a: regulator-pm660-l12a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l12a";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1780000>;

		regulator-max-microvolt = <1950000>;

	};



	pm660_l13a: regulator-pm660-l13a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l13a";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1750000>;

		regulator-max-microvolt = <1950000>;

	};



	pm660_l14a: regulator-pm660-l14a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l14a";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1710000>;

		regulator-max-microvolt = <1900000>;

	};



	pm660_l15a: regulator-pm660-l15a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l15a";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1650000>;

		regulator-max-microvolt = <2950000>;

	};



	pm660_l17a: regulator-pm660-l17a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l17a";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1650000>;

		regulator-max-microvolt = <2950000>;

	};



	pm660_l19a: regulator-pm660-l19a {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l19a";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <3200000>;

		regulator-max-microvolt = <3400000>;

	};



	pm660_l1b: regulator-pm660-l1b {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l1b";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <800000>;

		regulator-max-microvolt = <925000>;

	};



	pm660_l2b: regulator-pm660-l2b {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l2b";

		qcom,hpm-min-load = <5000>;

		regulator-min-microvolt = <350000>;

		regulator-max-microvolt = <3100000>;

	};



	pm660_l3b: regulator-pm660-l3b {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l3b";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1710000>;

		regulator-max-microvolt = <3600000>;

	};



	pm660_l4b: regulator-pm660-l4b {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l4b";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1700000>;

		regulator-max-microvolt = <2950000>;

	};



	pm660_l5b: regulator-pm660-l5b {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l5b";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1721000>;

		regulator-max-microvolt = <3600000>;

	};



	pm660_l6b: regulator-pm660-l6b {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l6b";

		qcom,hpm-min-load = <5000>;

		regulator-min-microvolt = <1700000>;

		regulator-max-microvolt = <3300000>;

	};



	pm660_l7b: regulator-pm660-l7b {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l7b";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <2700000>;

		regulator-max-microvolt = <3125000>;

	};



	pm660_l8b: regulator-pm660-l8b {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l8b";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <3200000>;

		regulator-max-microvolt = <3400000>;

	};



	/* PM660B L9 = VDD_SSC_CX supply */

	pm660_l9b_level: regulator-pm660-l9b-level {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l9b_level";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;

		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;

	};



	pm660_l9b_floor_level: regulator-pm660-l9b-floor-level {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l9b_floor_level";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;

		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;

	};



	/* PM660B L10 = VDD_SSC_MX supply */

	pm660_l10b_level: regulator-pm660-l10b-level {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l10b_level";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;

		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;

	};



	pm660_l10b_floor_level: regulator-pm660-l10b-floor-level {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660_l10b_floor_level";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;

		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;

	};



	/* GFX Supply */

	gfx_vreg_corner: regulator-gfx-corner {

		compatible = "qcom,stub-regulator";

		regulator-name = "gfx_corner";

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <7>;

	};

};