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

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

Promotion of kernel.lnx.4.4-160912. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1051911   I6ebea0fb935dc8fb0fdce11e9c9a19213da2685c   ARM: dts: msm: add parallel charger io channels for MSMC
1063752   Icb72c488c30ee7c2414409b93fd40f3862b11f77   ARM: dts: msm: Add bus scaling for venus PIL for MSMCOBA
1063236   I0b6e273b846a8e07c5b36d03a20edddfd895e9c0   pinctrl: qcom: spmi-mpp: Set drive-strength for sink fun
1058737   If517747243a605eacd1f6ffd6d1f7c0d45d06c1b   input: synaptics_2.6: add pinctrl support for Synaptics
1056669   I118d4e1dbd1aa26c2637e5ea4f4ba5b6006bebff   ARM: dts: msm: Fix vconn-supply typo in PMICOBALT
1010945   Iafe90078721766bc0afb5bd2dd525c9d425e6bd7   cfg80211: Define macro to indicate support for cfg80211
1059737   Ia4c287cc76543228038653f3179946782bb859e2   ASoC: msm: qdsp6v2: Fix excessive logging from VOIP driv
1055880   I90457b5dec2e8f2105f37978de57954cdaf9aa08   msm: ipa: fix memory leak on QMI
1062478   Ib0d3c22810fa691c9036a9ab57df7bf8562c7fb9   ARM: dts: msm: Add support for DATA1 GLink channel in MS
1056572   I817b716624445db57047100716d253bb867f8a77   msm: ipa: mhi: add perf vote
1060783   Iae89ce7b26453f9a0ff3214bd5598ee11e181857   icnss: Add ICNSS utility file
930859   I071841cfea5b0da72f70032d0d99b05678d3d747   cfg80211: Add support for aborting an ongoing scan
1063236   I52ce5ad8a5c4a79187dc94403dc0704d83f0549c   pinctrl: qcom: pmic-gpio/mpp: of_irq_count() == npins
1063236   I34cfc11feb2fbc2acc41e3697006d86a3cad3445   driver-core: platform: Add platform_irq_count()
1063236   I7bcf4347adce6ba9892d2e57a413d407d35fbc26   pinctrl: qcom: spmi-gpio: Add support for GPIO LV/MV sub
1058737   I12b5075d484cd397bfb423479589e159a2193f31   input: synaptics_dsx_2.6: correct secure_touch_init func
1044351   If53a034c3c5ee39a95b2501ee495e572f60d6b56   mdss: display-port: add new sysfs node for 3D mode
1063505   I06ac83ce0145bf641905d00edb8bc09fb5cbe635   ARM: dts: msm: Add missing glink_pkt devices for MSMCOBA
1063236   Ic9666576d191e9dd0e267e96d5b4fc5a97c5b077   pinctrl: qcom: spmi-gpio: Correct power_source range che
1063236   I05b253147677ca66d926eaeaa680bd09e31247a5   pinctrl: qcom: spmi-gpio: Add dtest route for digital in
1049230   I7676d11747083eb35826c52abaa0de47f50032fc   ASoc: msm: qdsp6v2: Fix timestamp glitch during gapless
1063236   Ia2d8a0fc303af5ce6d34703f63bc61dfa0e5d148   pinctrl: qcom: Use platform_irq_count() instead of of_ir
1063809   Icf09bd8005d22cb7e711ccff92ef4bcd5af37e64   ARM: dts: msm: update the sound node for msmcobalt QRD
1063582   Icc11117c34c3c45bdaa6a05444c933e6fba4f6b8   defconfig: msm: sde: Add config for SDE rotator EVTLOG d
1063236   I9e1ae5a64d633c7cdc6a1eb710932ca19ef5fe85   pinctrl: qcom: spmi-mpp: Add dtest route for digital inp
1063236   I4ea4c511108f37cbfae0a5ccaaaeadadcae37254   pinctrl: qcom: Add generic ssbi and spmi GPIO/MPP bindin
1058737   Ifb5b134d0fbeb2f55f16af8806abb9c8e51c35e0   input: synaptics_dsx_2.6: not reinit when spontaneous re
1051911   I43e73b3056386cf97b37652eeed3a4761e248711   smb138x-charger: expose charger temperature
1063236   Ia09aa072116d244abdd7ad0d92cc55e0aeba8efc   pinctrl: qcom: spmi-mpp: Correct DTEST rail calculation
1052720   I7d600648281d2f4375307b0e0dd1bf121d0e6e4f   ARM: dts: msm: Add support for GDSCs for MSMfalcon
1063582   I5ad406187ba590d2fa57d998e9ad79b8a32810ee   msm: sde: Add EVTLOG and REG dump support for SDE rotato

Change-Id: I5f871d793904765446bb04db8154f318e609741b
CRs-Fixed: 1063236, 1052720, 1049230, 1060783, 1044351, 1010945, 1055880, 1063809, 1062478, 1056669, 1058737, 1051911, 930859, 1063752, 1063505, 1059737, 1063582, 1056572
parents 68bb6ac2 9c8924db

Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt

+39 −9
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ PMIC's from Qualcomm. 
		    "qcom,pm8941-gpio"

		    "qcom,pma8084-gpio"



		    And must contain either "qcom,spmi-gpio" or "qcom,ssbi-gpio"

		    if the device is on an spmi bus or an ssbi bus respectively



- reg:

	Usage: required

	Value type: <prop-encoded-array>
@@ -93,7 +96,11 @@ to specify in a pin configuration subnode: 
			"dtest1",

			"dtest2",

			"dtest3",

		    "dtest4"

			"dtest4",

		    And following values are supported by LV/MV GPIO subtypes:

			"func3",

			"func4",

			"analog"



- bias-disable:

	Usage: optional
@@ -178,10 +185,33 @@ to specify in a pin configuration subnode: 
	Value type: <none>

	Definition: The specified pins are configured in open-source mode.



- qcom,atest:

	Usage: optional

	Value type: <u32>

	Definition: Selects ATEST rail to route to GPIO when it's configured

		    in analog-pass-through mode by specifying "analog" function.

		    Valid values are 0-3 corresponding to PMIC_GPIO_AOUT_ATESTx

		    defined in <dt-bindings/pinctrl/qcom,pmic-gpio.h>.



- qcom,dtest-buffer:

	Usage: optional

	Value type: <u32>

	Definition: Selects DTEST rail to route to GPIO when it's configured

		    as a digital input.

		    For LV/MV GPIO subtypes, the valid values are 0-3

		    corresponding to PMIC_GPIO_DIN_DTESTx defined in

		    <dt-bindings/pinctrl/qcom,pmic-gpio.h>. Only one

		    DTEST rail can be selected at a time.

		    For 4CH/8CH GPIO subtypes, supported values are 1-15.

		    4 DTEST rails are supported in total and more than 1 DTEST

		    rail can be selected simultaneously. Each bit of the

		    4 LSBs represent one DTEST rail, such as [3:0] = 0101

		    means both DTEST1 and DTEST3 are selected.



Example:



	pm8921_gpio: gpio@150 {

		compatible = "qcom,pm8921-gpio";

		compatible = "qcom,pm8921-gpio", "qcom,ssbi-gpio";

		reg = <0x150 0x160>;

		interrupts = <192 1>, <193 1>, <194 1>,

			     <195 1>, <196 1>, <197 1>,

Documentation/devicetree/bindings/pinctrl/qcom,pmic-mpp.txt

+15 −2
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ of PMIC's from Qualcomm. 
		    "qcom,pm8941-mpp",

		    "qcom,pma8084-mpp",



		    And must contain either "qcom,spmi-mpp" or "qcom,ssbi-mpp"

		    if the device is on an spmi bus or an ssbi bus respectively.



- reg:

	Usage: required

	Value type: <prop-encoded-array>
@@ -139,7 +142,7 @@ to specify in a pin configuration subnode: 
- qcom,dtest:

	Usage: optional

	Value type: <u32>

	Definition: Selects which dtest rail to be routed in the various functions.

	Definition: Selects which dtest rail to be routed for digital output.

		    Valid values are 1-4



- qcom,amux-route:
@@ -153,10 +156,20 @@ to specify in a pin configuration subnode: 
	Value type: <none>

	Definition: Indicates that the pin should be operating in paired mode.



- qcom,dtest-buffer:

	Usage: optional

	Value type: <u32>

	Definition: Selects which dtest rail to be routed for digital input.

		    It's also valid when the pin is configured as digital

		    input and output.

		    4 dtest rails supported in total and more than one rail

		    could be selected simultaneously. Each bit of the 4 LSBs

		    represent one dtest rail, such as [3:0] = 0101 means both

		    dtest1 and dtest3 are selected. Valid values are 1-15.

Example:



	mpps@a000 {

		compatible = "qcom,pm8841-mpp";

		compatible = "qcom,pm8841-mpp", "qcom,spmi-mpp";

		reg = <0xa000>;

		gpio-controller;

		#gpio-cells = <2>;

Documentation/devicetree/bindings/power/qcom-charger/smb138x-charger.txt

+16 −0
Original line number Diff line number Diff line
@@ -52,6 +52,22 @@ Charger specific properties: 
  Value type: <u32>

  Definition: Specifies the DC input current limit in micro-amps.



- io-channels

  Usage:      optional

  Value type: List of <phandle u32>

  Definition: List of phandle and IIO specifier pairs, one pair

		for each IIO input to the device. Note: if the

		IIO provider specifies '0' for #io-channel-cells,

		then only the phandle portion of the pair will appear.



- io-channel-names

  Usage:      optional

  Value type: List of <string>

  Definition: List of IIO input name strings sorted in the same

		order as the io-channels property. Consumer drivers

		will use io-channel-names to match IIO input names

		with IIO specifiers.



================================================

Second Level Nodes - SMB138X Charger Peripherals

================================================

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

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ 
			reg = <0x1700 0x100>;

			vdd-pdphy-supply = <&pmcobalt_l24>;

			vbus-supply = <&smb2_vbus>;

			vcon-supply = <&smb2_vconn>;

			vconn-supply = <&smb2_vconn>;

			interrupts = <0x2 0x17 0x0 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x1 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x2 IRQ_TYPE_EDGE_RISING>,

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

+5 −0
Original line number Diff line number Diff line
@@ -285,6 +285,11 @@ 
			compatible = "qcom,smb138x-parallel-slave";

			qcom,pmic-revid = <&smb138x_revid>;

			reg = <0x1000 0x700>;



			io-channels = <&smb138x_tadc 2>,

				      <&smb138x_tadc 12>;

			io-channel-names = "charger_temp",

					   "charger_temp_max";

		};

	};

};