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

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

Promotion of kernel.lnx.4.4.c7-170830. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
2090182   I0671cdd8e0911450bafe4869cb49cc48bd622a81   power: pmic-voter: make debug status more parsable
2096717   Iff673b1626acb2bb83c0b7706b118e24919c3934   ARM: dts: msm: Add device tree support for SDM/A 636
2057237   I15d46f96a8b751f0386677e3b6876eec8bba9a1f   qpnp-qnovo: check ptrain_en in restart work
2086422   I22eae3f818859c8fbd08066f690517d4210c7dd3   power: smb-lib: Add USB notification
2096717   If14654c3fb93a52e4db0270e60cb6e6371ef077f   socinfo: Add support for SDM/A 636 SOCs
2090483   I467c0a19d84658fb33da9677dcb904ebf49e4800   msm: ais: Fix crash when ioctl VIDIOC_MSM_SENSOR_INIT_CF
2099714   Ia3be3f321b53bbbb4c37f5e86e451ca86ec8cdc9   ARM: dts: msm: Add support for speed-bin 3 for SDM660
2094975   I81daf2cec78de5787279daaf98264c5462ba6645   ion: Convert allocation counters to long
2089664   I4ca475f30ca0a564f533b4ed8bcd55cfb5da291f   qpnp-qnovo: disable qnovo for dcin
2097869   I3804d53504c5c41e30f17109d8aad0bbfd0ef954   ARM: dts: qcom: Remove lpm performance index for sdm630
2085339   Icf185763576f65028cf2ef0d1c0bbcf6570460ba   qpnp-qnovo: initialize chg_ready votable
2097334   I8f93246d27f79a7c759b3afc4a4544d9ffca7a80   power: qcom-step-chg: Fix the error return path
2099216   I973a03b7cd0afca2edb584539ea5c69198bfb089   Revert "drivercore: Avoid adding devices without pm_ops
2025812   I3cb5d40034884cdfc35de957fab4dafd42d0697c   ASoc: wcd934x-dsp-cntl: notify online event after clocks
2067859   I9172776d9ffa0af5deb9898125fc6403fdcdee0f   soc: qcom: glink: Initialize dummy xprt with dummy funct
2057237   If3a0a8e9b1d60920cbbedc16af91c05caec8dcb2   qpnp-qnovo: disable while shutting down
2085339   I0a860287b638d20b6a4aa05c7bb25e9b81a980d2   qpnp-qnovo: fix ptrain done handler
2025812   I15c55bf96737e4ffd7e0faf571a1109ba6c38163   ASoC: wcd-dsp-mgr: fix race during subsystem restart

Change-Id: I753d858fe1de4af67a52947ca883232c76d42d90
CRs-Fixed: 2097869, 2097334, 2096717, 2086422, 2099216, 2089664, 2090182, 2085339, 2090483, 2067859, 2094975, 2099714, 2025812, 2057237
parents f5f5da8b b8159cfb

Documentation/devicetree/bindings/arm/msm/msm.txt

+12 −0
Original line number Diff line number Diff line
@@ -110,6 +110,12 @@ SoCs: 
- SDA630

  compatible = "qcom,sda630"



- SDM636

  compatible = "qcom,sdm636"



- SDA636

  compatible = "qcom,sda636"



- MSM8952

  compatible = "qcom,msm8952"
@@ -295,6 +301,12 @@ compatible = "qcom,sda658-mtp" 
compatible = "qcom,sda658-cdp"

compatible = "qcom,sda660-mtp"

compatible = "qcom,sda660-cdp"

compatible = "qcom,sdm636-cdp"

compatible = "qcom,sdm636-mtp"

compatible = "qcom,sdm636-qrd"

compatible = "qcom,sda636-qrd"

compatible = "qcom,sda636-mtp"

compatible = "qcom,sda636-cdp"

compatible = "qcom,sdm630-rumi"

compatible = "qcom,sdm630-mtp"

compatible = "qcom,sdm630-cdp"

Documentation/devicetree/bindings/power/supply/qcom/qpnp-qnovo.txt

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ Required properties: 
Optional Properties:

- qcom,external-rsense:		To indicate whether the platform uses external or

				internal rsense for measuring battery current.

- qcom,enable-for-dc:		To enable qnovo for dc charging path.



Example:

arch/arm/boot/dts/qcom/Makefile

+28 −1
Original line number Diff line number Diff line
@@ -229,7 +229,34 @@ dtb-$(CONFIG_ARCH_SDM660) += sdm660-sim.dtb \ 
	sda658-rcm.dtb \

	sda658-pm660a-mtp.dtb \

	sda658-pm660a-cdp.dtb \

	sda658-pm660a-rcm.dtb

	sda658-pm660a-rcm.dtb \

	sdm636-cdp.dtb \

	sdm636-mtp.dtb \

	sdm636-qrd.dtb \

	sdm636-rcm.dtb \

	sdm636-headset-jacktype-no-cdp.dtb \

	sdm636-headset-jacktype-no-rcm.dtb \

	sdm636-internal-codec-cdp.dtb \

	sdm636-internal-codec-mtp.dtb \

	sdm636-internal-codec-pm660a-cdp.dtb \

	sdm636-internal-codec-pm660a-mtp.dtb \

	sdm636-internal-codec-pm660a-rcm.dtb \

	sdm636-internal-codec-rcm.dtb \

	sdm636-pm660a-headset-jacktype-no-cdp.dtb \

	sdm636-pm660a-headset-jacktype-no-rcm.dtb \

	sdm636-pm660a-cdp.dtb \

	sdm636-pm660a-mtp.dtb \

	sdm636-pm660a-qrd.dtb \

	sdm636-pm660a-rcm.dtb \

	sdm636-usbc-audio-mtp.dtb \

	sdm636-usbc-audio-rcm.dtb \

	sda636-cdp.dtb \

	sda636-mtp.dtb \

	sda636-rcm.dtb \

	sda636-pm660a-cdp.dtb \

	sda636-pm660a-mtp.dtb \

	sda636-pm660a-qrd-hdk.dtb \

	sda636-pm660a-rcm.dtb



dtb-$(CONFIG_ARCH_SDM630) += sdm630-rumi.dtb \

	sdm630-pm660a-rumi.dtb \

arch/arm/boot/dts/qcom/sda636-cdp.dts

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/* Copyright (c) 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

 * 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 "sda636.dtsi"

#include "sdm636-cdp.dtsi"

#include "sdm660-external-codec.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDA 636 PM660 + PM660L CDP";

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

	qcom,board-id = <1 0>;

	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,

			<0x0001001b 0x0201011a 0x0 0x0>;

};



&tavil_snd {

	qcom,msm-mbhc-hphl-swh = <0>;

	qcom,msm-mbhc-gnd-swh = <0>;

};



&tasha_snd {

	qcom,msm-mbhc-hphl-swh = <0>;

	qcom,msm-mbhc-gnd-swh = <0>;

};

arch/arm/boot/dts/qcom/sda636-mtp.dts

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/* Copyright (c) 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

 * 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 "sda636.dtsi"

#include "sdm636-mtp.dtsi"

#include "sdm660-external-codec.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDA 636 PM660 + PM660L MTP";

	compatible = "qcom,sda636-mtp", "qcom,sda636", "qcom,mtp";

	qcom,board-id = <8 0>;

	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,

			<0x0001001b 0x0201011a 0x0 0x0>;

};



&tavil_snd {

	qcom,msm-mbhc-moist-cfg = <0>, <0>, <3>;

};