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

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

Promotion of kernel.lnx.4.4-170306.1. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1098549   I3dbdf99d17c7c7036dc09af750bde412865a6cf7   ARM: dts: msm: Add cpp micro reset flag for SDM660
1081654   If8af0805501901a15981bbc6db0c92d2e040eb78   msm: mhi_rmnet: Keep wake when processing transfer
2014778   I98781d33f4e8424660898d5635624b8b891237f8   ARM: dts: msm: Add rpm stats for TZ and SPSS for MSM8998
2013993   I721673b8cc0ef6d974e715ffd405fc1b11e2c9d5   ARM: dts: msm: Change BLSP assignment for APQ8098-mediab
2015025   Idca4149c587e9588fce8ba757fa0b7bf0ca5614d   ARM: dts: msm: change CHG_OK pin to active high for QRD
1027069   I038f9dcb2e9bffb2637d82fb30794f6e6d4c578c   msm: mhi_rmnet: Add support for platform devices
2002731   Ia9e1193f0229df8c552c3ba0287a5a60837ae540   msm: mdss: trigger BTA during active region of display
2012658   I14621a6e4d6273b56c1ad7639baa5e83c058fe63   ARM: dts: msm: add device nodes to support DP on sdm630
2014330   Ic6be160a88be40e94a4a0798646b8aa3f169ab49   leds: qpnp-wled: add support to control PSM dynamically
2002731   I69fdc182342493a54d78ae3ce5f4729e17452155   msm: mdss: update the wait logic for sending DSI command

Change-Id: Ieb902184ff29f92dac280041637d17721bbe4db1
CRs-Fixed: 2013993, 2002731, 1098549, 2015025, 2014330, 1027069, 2014778, 1081654, 2012658
parents 9322dff9 783427f7

Documentation/devicetree/bindings/leds/leds-qpnp-wled.txt

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ Optional properties for WLED: 
- qcom,lcd-auto-pfm-thresh	: Specify the auto-pfm threshold, if the headroom voltage level

				  falls below this threshold and auto PFM is enabled, boost

				  controller will enter into PFM mode automatically.

- qcom,lcd-psm-ctrl	: A boolean property to specify if PSM needs to be

			  controlled dynamically when WLED module is enabled

			  or disabled.



Optional properties if 'qcom,disp-type-amoled' is mentioned in DT:

- qcom,loop-comp-res-kohm	: control to select the compensation resistor in kohm. default is 320.

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

0 → 100644
+25 −0
Original line number Diff line number Diff line 
MSM MHI RMNET interface device



MHI RMNET provides a network interface over PCIe

to transfer IP packets between modem and apps.



Required properties:

- compatible : "qcom,mhi-rmnet"

- At least one of MHI channel

  - qcom,mhi-rx-channel : MHI channel number for incoming data

  - qcom,mhi-tx-channel : MHI channel number for outgoing data

- Default MRU for interface

  - qcom,mhi-mru

- Alias id to identify interface instance



Example:

	aliases {

		mhi_rmnet0 = &mhi_rmnet_0;

	};

	mhi_rmnet_0: qcom,mhi-rmnet@0 {

		compatible = "qcom,mhi-rmnet";

		qcom,mhi-rx-channel = <101>;

		qcom,mhi-tx-channel = <100>;

		qcom,mhi-mru = <8000>;

		status = "okay";

	};

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

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ 
	qcom,board-id = <8 1>;

};



&spi_10 {

	status = "disabled";

};



&msm_ath10k_wlan {

	status = "ok";

};

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

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

/* Copyright (c) 2016-2017, 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
@@ -302,7 +302,7 @@ 
	qcom,rpm-master-stats@778150 {

		compatible = "qcom,rpm-master-stats";

		reg = <0x778150 0x5000>;

		qcom,masters = "APSS", "MPSS", "ADSP", "SLPI";

		qcom,masters = "APSS", "MPSS", "ADSP", "SLPI", "TZ", "SPSS";

		qcom,master-stats-version = <2>;

		qcom,master-offset = <4096>;

	};
@@ -322,7 +322,7 @@ 
		compatible = "qcom,system-stats";

		qcom,rpm-msg-ram = <&rpm_msg_ram>;

		qcom,rpm-code-ram = <&rpm_code_ram>;

		qcom,masters = "APSS", "MPSS", "ADSP", "SLPI";

		qcom,masters = "APSS", "MPSS", "ADSP", "SLPI", "TZ", "SPSS";

	};



	qcom,mpm@7781b8 {

arch/arm/boot/dts/qcom/sdm630-cdp.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -154,6 +154,15 @@ 
	qcom,platform-te-gpio = <&tlmm 59 0>;

};



&mdss_dp_ctrl {

	pinctrl-names = "mdss_dp_active", "mdss_dp_sleep";

	pinctrl-0 = <&mdss_dp_aux_active &mdss_dp_usbplug_cc_active>;

	pinctrl-1 = <&mdss_dp_aux_suspend &mdss_dp_usbplug_cc_suspend>;

	qcom,aux-en-gpio = <&tlmm 55 0>;

	qcom,aux-sel-gpio = <&tlmm 56 0>;

	qcom,usbplug-cc-gpio = <&tlmm 58 0>;

};



&pm660l_wled {

	qcom,led-strings-list = [01 02];

};