Commit graph

582875 commits

Author SHA1 Message Date
Linux Build Service Account
45ad5727c9 Merge "ASoC: msm: qdsp6v2: Add INT3 Tx port for LSM" 2017-02-10 06:46:05 -08:00
Linux Build Service Account
1f2a86994e Merge "drivers: soc: add mutex to prevent response being processed twice" 2017-02-10 06:46:05 -08:00
Linux Build Service Account
af6d354a11 Merge "ARM: dts: msm: add SMB1351 charger node for SDM660 MTP" 2017-02-10 06:46:04 -08:00
Linux Build Service Account
564ead6a58 Merge "qpnp-smb2: support POWER_SUPPLY_PROP_CTM_CURRENT_MAX" 2017-02-10 06:46:02 -08:00
Linux Build Service Account
1a78d46209 Merge "power_supply: add DIE_HEALTH and CONNECTOR_HEALTH properties" 2017-02-10 06:46:01 -08:00
Linux Build Service Account
2283a0e090 Merge "defconfig: arm64: msm-perf: Enable MSM_TZ_LOG" 2017-02-10 06:46:00 -08:00
Linux Build Service Account
9cfe21ae68 Merge "soc: qcom: Add support for Cx iPeak limit driver" 2017-02-10 06:45:59 -08:00
Linux Build Service Account
00b3ef62c0 Merge "USB: qc_rndis: Fix aggregation parameters settings issue" 2017-02-10 06:45:58 -08:00
Linux Build Service Account
9be7e2fad6 Merge "ARM: dts: msm: Add APC0/1 CPR instances for sdm630" 2017-02-10 06:45:56 -08:00
Linux Build Service Account
1603ea92b1 Merge "defconfig: msm: Enable CONFIG_MMC_RING_BUFFER for sdm660" 2017-02-10 06:45:56 -08:00
Linux Build Service Account
c8fbebb199 Merge "driver-core: cpu: Make isolate node read-only" 2017-02-10 06:45:55 -08:00
Linux Build Service Account
d01d82d616 Merge "qpnp-smb2: Make CURRENT_MAX property writeable for usb_psy" 2017-02-10 06:45:54 -08:00
Linux Build Service Account
f85e7d3750 Merge "ASoC: msm: qdsp6v2: Add endianness control for USB devices" 2017-02-10 06:45:53 -08:00
Linux Build Service Account
ddb5ca1fc6 Merge "msm: rndis_ipa: Fix to incorrect state transition" 2017-02-10 06:45:52 -08:00
Linux Build Service Account
1dc780eb62 Merge "clk: qcom: Add qpnp clock divider support" 2017-02-10 06:45:46 -08:00
Govind Singh
9133dafdff ath10k: converge TLV and HL1.0 params and API
HL1.0 wmi type configuration is overlapped with wmi
TLV type configuration.

converge TLV and HL1.0 params and API to remove
redundant code.

Change-Id: Ia41b300ca810495acfdab9f014f59d8cfa839ae3
Signed-off-by: Govind Singh <govinds@codeaurora.org>
2017-02-10 06:15:17 -08:00
Amit Nischal
ca6532efe2 tracing: Add clock trace events only for COMMON_CLK_MSM
Clock trace events related to msm clock framework are
not required to be part of available events other that
CLK_MSM config so add the support for the same by
adding a config check.

Change-Id: I93e8d9604a58c0cb48be723d5845591e7a4b7861
Signed-off-by: Amit Nischal <anischal@codeaurora.org>
2017-02-10 18:59:48 +05:30
Tirupathi Reddy
b2a1e066fc defconfig: Enable FG GEN3 and QNOVO configs for sdm660 32-bit
Enable the GEN3 Fuel Gauge driver and Qnovo pulse charging engine
for sdm660 32-bit platform.

CRs-Fixed: 2005232
Change-Id: Ib6a158e7e6ee55fb348dc2ef7e4eb7d40f3051a5
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
2017-02-10 18:20:56 +05:30
Tirupathi Reddy
5e090adb96 qcom: qnovo: fix 32-bit compilation
Make division operations in qpnp-qnovo 32-bit compatible.

CRs-Fixed: 2005232
Change-Id: I3dd5eed9cad8b2d054993305f1c737bc81418b5f
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
2017-02-10 18:19:32 +05:30
Tirupathi Reddy
6e2aa6379c qpnp-fg-gen3: fix 32-bit compilation
Make division operations in qpnp-fg-gen3 32-bit compatible.

CRs-Fixed: 2005232
Change-Id: I33215147d093aef3f04c46912bddd5aef284d7c4
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
2017-02-10 18:18:41 +05:30
Shantanu Jain
eaaf79250d input: keyboard: correct suspend/resume for gpio_keys
Execute pinctrl operations at correct place in
suspend/resume procedure of gpio_keys driver.

Change-Id: Ic393778e35f52859512bd32ccbf6c4d1079a7e37
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
2017-02-10 17:30:08 +05:30
Shantanu Jain
c26a324755 input: gpio_keys: Add support for pinctrl framework
Add pinctrl framework support for gpio configuration
to gpio_keys driver.

Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
Change-Id: I50c46caca0a65f8906f816e04f89610497956eea
2017-02-10 17:29:50 +05:30
Padmanabhan Komanduru
21e7c25c87 clk: qcom: mdss: update the clk_ops for dp_vco_divided_clk_src_mux
The fractional divider values for DP pixel clock RCG needs to be
determined dynamically. Add the recalc_rate operation for the DP
PLL mux clock dp_vco_divided_clk_src_mux which is the parent of
DP pixel clock RCG. This enables the RCG clock to calculate the
fractional dividers correctly. Modify the determine rate op for the
mux clock to also set the new parent after performing the determine
rate operation.

Change-Id: Id931a60677380ecee28eb9aec6468548898b812b
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
2017-02-10 16:44:58 +05:30
Jayant Shekhar
c170aec689 ARM: dts: msm: add mdss node for sdm630
Add mdss node for sdm630 which is used by
display driver.

Change-Id: Ie5b6448a9a6da59ea1a134db3c700e35f89da50b
Signed-off-by: Jayant Shekhar <jshekhar@codeaurora.org>
Signed-off-by: Sandeep Panda <spanda@codeaurora.org>
2017-02-10 16:40:56 +05:30
Shantanu Jain
b9c5295a4d ARM: dts: msm: add camera focus and snapshot device nodes for SDM630
MSM GPIO 64 is connected to camera focus button and MSM GPIO 113 is
connected to camera snapshot button. Add the device nodes for these
buttons for SDM630 devices.

Change-Id: I7f58f3ed6e7cfa49f03ebea23cff4eae417a071b
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
2017-02-10 16:34:49 +05:30
Tirupathi Reddy
55a4a605c9 regulator: cpr4-mmss-ldo: Add GFX LDO CPR support for sdm630
GPU subsystem in sdm630 is supplied by either LDO300(VDD_GFX)
in LDO mode or VDD_CX in BHS mode. This LDO300 is CPR managed
and supports CPR closed-loop operation.

CRs-Fixed: 2000929
Change-Id: I94d6739f9abbdba3918b118eaa29fc0bc5cbd6e7
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
2017-02-10 15:18:29 +05:30
Nicholas Troast
578f8f6a7c qpnp-smb2: support POWER_SUPPLY_PROP_CTM_CURRENT_MAX
CTM needs to vote for USB ICL. Add support for it.

Change-Id: I88b146000f7327cf5dc7310fb721309f08dc3035
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
2017-02-10 12:52:15 +05:30
Nicholas Troast
fcc57cd62f power_supply: add CTM_CURRENT_MAX property
POWER_SUPPLY_PROP_CTM_CURRENT_MAX is needed by CTM to limit USB input
current. Add it.

Change-Id: I8aac65a91959300676cf7e1c2685a557f322c509
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
2017-02-10 12:52:15 +05:30
Nicholas Troast
683a347835 power: supply: qcom: implement die and connector health property
The die and connector health properties expose the comparator output of
the thermal regulation. If both die and skin temperature regulation is
enabled then the output of the comparator will be the higher of the two.
The property values can be one of: Unknown, Cool, Warm, Hot, Overheat.

Change-Id: Ic92c9cb08ec42fd2c2f26a54687a17e3b05b388f
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
2017-02-10 12:52:14 +05:30
Nicholas Troast
e93616b414 power_supply: add DIE_HEALTH and CONNECTOR_HEALTH properties
The DIE_HEALTH and CONNECTOR_HEALTH properties are used to show the
output of the thermal regulation TEMP_RANGE.

Change-Id: Ice3f159b7775084bdd0099047d4660a1e5edce98
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
2017-02-10 12:52:13 +05:30
Abhijeet Dharmapurikar
3a3c5fd62e smb-lib: add support of ICL voting based on charger
Add support to vote for ICL based on charger type.
Following are the current limit for chargers:
Legacy adapters:
CDP: 1500mA, DCP: 1800mA, HVDCP: 3000mA

TypeC Adapters:
Based on the current advertised by the adapter.

Change-Id: Ia5dbf73c29949a94e096ca6233a33c40da744140
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-02-10 12:52:07 +05:30
Matt Wagantall
86325cf591 defconfig: arm64: msm-perf: Enable MSM_TZ_LOG
The tz_log driver is responsible for allocating the memory for the
'qsee_log' buffer. If tz_log driver is disabled and some part of the
bootchain has set the qsee_log address before Linux booted, then that
previous address will continue being used. If that address overlaps
with memory used for some other purpose, logging to qsee_log may
scribble on memory and cause a crash.

Change-Id: I10d69355beeb252115a0d91cfabfa8b9e729c969
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
2017-02-10 12:45:46 +05:30
Ashay Jaiswal
f1ec8989c4 ARM: dts: msm: add SMB1351 charger node for SDM660 MTP
Add SMB1351 charger node in parallel charger configuration
for SDM660.

Change-Id: Ia36a352f2728c25605b4a4a730493b99f83c8c12
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2017-02-10 12:45:18 +05:30
Tirupathi Reddy
7dc754709a ARM: dts: msm: Update MEM ACC corner mapping for APC0/1 for sdm630
Use NOM ACC settings up to TURBO voltage corner for APC0/1 for
sdm630.

CRs-Fixed: 2005083
Change-Id: Ifa50b62c5b8ae46a691d260f3517a4bc410d19c3
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
2017-02-10 12:39:30 +05:30
Sandeep Panda
b453831da8 clk: qcom: add MDSS PLL support for sdm630
Add the sdm630 compatible string to MDSS PLL driver
of_device_id table list, so that initialization of
MDSS PLL driver takes place for sdm630 platform.

Change-Id: I284ff9c07a4a971260ade399a2f7a605003ccf1d
Signed-off-by: Sandeep Panda <spanda@codeaurora.org>
2017-02-10 12:14:48 +05:30
Linux Build Service Account
487ff740cb Merge "power: qcom-charger: add support for USBIN-USBIN parallel configuration" 2017-02-09 22:09:29 -08:00
Linux Build Service Account
3252149cd2 Merge "power: smb1351-charger: update drive to support parallel architecture" 2017-02-09 22:09:28 -08:00
Linux Build Service Account
fa12840e3d Merge "icnss: For WDOG bite, shutdown after FW ready" 2017-02-09 22:09:27 -08:00
Linux Build Service Account
0e39052658 Merge "sched: remove sched_new_task_windows tunable" 2017-02-09 22:09:26 -08:00
Linux Build Service Account
3bbac5a6d9 Merge "ARM: dts: msm: Add alias name for secondary GPU sensor in MSM8998" 2017-02-09 22:09:25 -08:00
Linux Build Service Account
ae8d5f9081 Merge "ARM: dts: msm: Update tsens for cluster0 mitigation profile for sdm630" 2017-02-09 22:09:24 -08:00
Linux Build Service Account
cbbf109dc4 Merge "icnss: Avoid DOMAIN_ATTR_ATOMIC setting during S1 bypass" 2017-02-09 22:09:23 -08:00
Linux Build Service Account
d8d3d2d37d Merge "usb: host: xhci: Fix bound check for interrupter number" 2017-02-09 22:09:22 -08:00
Linux Build Service Account
dbba2248a3 Merge "clk: qcom: update post div bits to be cleared for MMCC/GPU clocks" 2017-02-09 22:09:21 -08:00
Linux Build Service Account
c2ae92ed42 Merge "ARM: dts: msm: Add audio support for SDM630, SDA630/660" 2017-02-09 22:09:20 -08:00
Linux Build Service Account
6f3ba0cb90 Merge "defconfig: mfd: Enable REGMAP_ALLOW_WRITE_DEBUGFS for 8998" 2017-02-09 22:09:14 -08:00
Linux Build Service Account
9eaf6b101b Merge "msm: regmap: configure REGMAP debugfs write optional" 2017-02-09 22:09:14 -08:00
Linux Build Service Account
95811d0d4d Merge "msm: mdss: enable dest_scaler data protection" 2017-02-09 22:09:13 -08:00
Tirupathi Reddy
b691575140 ARM: dts: msm: Add APC0/1 CPR instances for sdm630
Add CPR device nodes with required configuration for supporting
closed-loop operation for APC0/1 CPR instances in sdm630.

CRs-Fixed: 1117353
Change-Id: I206ef602a78802ddd15b568b1d5d1043ddfc44c0
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
2017-02-10 11:21:54 +05:30
Ashay Jaiswal
504aeb1158 power: qcom-charger: add support for USBIN-USBIN parallel configuration
Add support for USBIN-USBIN configuration based parallel charging. This
involves splitting Input Current Limit(ICL) between the main and the
parallel charger, ICL re-split is done when the settled AICL of the main
charger changes by 300mA.

Change-Id: I5b916f1503a2267ca1e73b24096cb60a304e3c19
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-02-10 10:33:31 +05:30