Commit graph

582778 commits

Author SHA1 Message Date
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
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
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
Ashay Jaiswal
23d22ee4bf power: smb1351-charger: update drive to support parallel architecture
Re-organize SMB1351 charger driver to support new parallel charger
architecture.
- New property "POWER_SUPPLY_PROP_PARALLEL_MODE" exposes the parallel
  charger configuration, in this case it is USBIN-USBIN configuration.
- Property "POWER_SUPPLY_CHARGE_TYPE" is added to report the current
  charge type and is also used for parallel charger chip detection.

Change-Id: I05692b34daef244f89a365e03043ae2ffe42d9da
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-02-10 10:31:37 +05:30
Abhijeet Dharmapurikar
111ee8a2d1 power: qcom-charger: add support to detect parallel charger
Add support to detect presence of parallel charger chip by
requesting a register read via power_supply framework.
If parallel chip is absent then disable parallel charger.

Change-Id: Icfa4a774d344fde4c7d1f4ced772a707be85020d
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-02-10 10:16:15 +05:30
Ashay Jaiswal
bc82c4febc qcom: battery: add support to delay parallel enable
Add support to delay parallel enable until HVDCP detection
and authentication completes. This involves adding a new voter
which enables parallel charger under following condition:
For DCP: enable parallel path after HVDCP detection
times out.
For HVDCP: enable parallel path after HVDCP authentication
completes.

Change-Id: Ib1c740eee5c721a0c267f6a9bc924c58af4b2c1e
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
2017-02-10 10:04:17 +05:30
Abhijeet Dharmapurikar
07b6e5b98f smb-lib: manage override in icl_callback
Currently we have only one path - the pd active setting path -  where
ICL_OVERRIDE gets set.

With the upcoming changes to manage connector temperature
mitigation and usbin-usbin parallel charger, the ICL_OVERRIDE is needed
to be set from these usecases.

So instead of creating a voter for ICL_OVERRIDE and putting the onus
on callsites to set it before calling their icl settings, it is best
to handle it in icl_callback.

Update the icl_callback to manage override and suspend in this way.

- Presence of voter signifies that the driver wants to enforce a
  value different than the hw default. Force an icl override.

- No voters signifies that the hw defaults are good, undo an override.

- For USB types that command a limit aka SDP and CDP, never override.

- never suspend if there are no clients.

Change-Id: I3ed01237b0bb2c028bec572d2905cabb03ce50a3
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-02-10 09:57:37 +05:30
Abhijeet Dharmapurikar
0591184767 smb-lib: Handle icl voter priorities between DCP, SDP and PD type
Cleanup the code such that when PD is activated, DCP_VOTER
and USB_PSY_VOTER (the voter for SDP and CDP types) are disabled.

While at it DCP_VOTER is intended to enforce a different value
from the hw defaults. Set it only when type is confirmed DCP.

Also to handle the situation when the PD profile allows to suspend
based on the phy, use a different voter PD_SUSPEND_SUPPORTED_VOTER
to activate that situation.

Change-Id: I0cb1a0aad9c94fdd233ec3103779e1a13449472e
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-02-10 09:56:36 +05:30
Prashanth Bhatta
b70b942f24 icnss: For WDOG bite, shutdown after FW ready
When there is Modem WDOG bite, Q6 will not get chance to reset
the hardware and if shutdown is called as part of PD down
notification then freeing buffers already submitted to hardware
may cause exceptions as hardware may try to access DDR location
which is already freed.
Fix the issue by delaying the shutdown till FW ready happens and
hardware is reset to clean state this way buffers are freed after
hardware is in reset state.

CRs-fixed: 2000709
Change-Id: Iacea5e8b712dd4ca310e5b502e43f4beb99f6981
Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
2017-02-09 16:41:22 -08:00
Puja Gupta
97daa00ee4 soc: qcom: Add ssr states to service notifier notifications
Add more refined states with service notifier notification for clients
to be able to distinguish between different error scenarios.

CRs-Fixed: 2004229
Change-Id: Ibae1f2b0ba03f8cdcb14398d7d35b007fac1a150
Signed-off-by: Puja Gupta <pujag@codeaurora.org>
2017-02-09 16:40:17 -08:00
Linux Build Service Account
9c9289f600 Merge "msm: rndis_ipa: fix to debug file system init failure" 2017-02-09 13:16:13 -08:00
Linux Build Service Account
29c858c851 Merge "msm: ext_display: increase timeout value to 5 seconds" 2017-02-09 13:16:12 -08:00
Linux Build Service Account
6a319030aa Merge "defconfig: msm: Enable RCU_FAST_NO_HZ for msmcortex" 2017-02-09 13:16:11 -08:00
Linux Build Service Account
43ee8491ea Merge "ASoC: wcd934x: Update master clock sequence for wcd934x codec" 2017-02-09 13:16:09 -08:00
Linux Build Service Account
5a08a180fa Merge "ARM: dts: msm: Add MLCK routing for VI feedback path on msm8998" 2017-02-09 13:16:08 -08:00
Linux Build Service Account
62a0513d39 Merge "ASoC: msm8998: Add support for ANC headset detection" 2017-02-09 13:16:07 -08:00
Linux Build Service Account
1ad52ab53d Merge "ASoC: wcd934x: add DSD support for lineout path" 2017-02-09 13:16:06 -08:00
Linux Build Service Account
cbb135e300 Merge "ARM: dts: msm: Add support for ANC headset detection on MSM8998" 2017-02-09 13:16:05 -08:00
Linux Build Service Account
f95682ab99 Merge "ARM: dts: msm: enable dynamic fps for all video mode panels on sdm660" 2017-02-09 13:16:04 -08:00
Linux Build Service Account
70135dc083 Merge "mmc: block: Fix issue with deferred resume when CQ is enabled" 2017-02-09 13:16:03 -08:00
Linux Build Service Account
bf7be66d87 Merge "spcom: abort server pending rx when SP reset (SSR) detected" 2017-02-09 13:16:02 -08:00
Linux Build Service Account
e208f563ee Merge "ARM: dts: msm: Add fab-id property for PM660" 2017-02-09 13:15:54 -08:00
Linux Build Service Account
7d1b06177e Merge "qpnp-fg-gen3: fix ESR filter configuration" 2017-02-09 13:15:52 -08:00
Linux Build Service Account
dc51fe91f5 Merge "ASoC: qdsp6v2: Clear memory map handle during ADSP SSR" 2017-02-09 13:15:51 -08:00
Linux Build Service Account
12cba4a7d8 Merge "ASoC: Add support for ADIE RTC on SDM660 internal codec" 2017-02-09 13:15:50 -08:00
Linux Build Service Account
5ff85961b7 Merge "ASoC: msm: add Slimbus7 loopback volume mixer control" 2017-02-09 13:15:48 -08:00
Linux Build Service Account
f1fa109c74 Merge "ASoC: qdsp6v2: update afe topology to RTAC driver" 2017-02-09 13:15:47 -08:00
Linux Build Service Account
35f3a9f36e Merge "ASoC: msm: remove wrong return statement" 2017-02-09 13:15:46 -08:00
Linux Build Service Account
fe3ea7ec96 Merge "ASoC: wcd-mbhc: Reduce plug insert/remove pop for USB type-C analog audio" 2017-02-09 13:15:45 -08:00
Linux Build Service Account
6031e930ea Merge "msm: mdss: Fix advertising HDR capability" 2017-02-09 13:15:38 -08:00
Hemant Kumar
4def267067 usb: host: xhci: Fix bound check for interrupter number
Since max_interrupters flag includes primary interrupter as well,
update the bound check when this flag is being used for
secondary event ring clean-up/allocation.

Change-Id: I044c5a89fe17779eb847981cbf27e99b97e37d80
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2017-02-09 11:46:58 -08:00
Ram Chandrasekar
d7bb5b6274 ARM: dts: msm: Add alias name for secondary GPU sensor in MSM8998
Add alias name for the secondary GPU temperature sensor in MSM8998. This
alias information will be used by thermal-engine.

Change-Id: I4d3400efef8886153018435468526f88418ee0a0
Signed-off-by: Ram Chandrasekar <rkumbako@codeaurora.org>
2017-02-09 10:03:07 -07:00
Utkarsh Saxena
219214e306 msm: rndis_ipa: Fix to incorrect state transition
Add a spinlock to protect the state transitions in rndis ipa
driver.

Change-Id: Ia5eab252d9a53e6a2f4db07912967a5f466982a6
Acked-by: Chaitanya Pratapa <cpratapa@qti.qualcomm.com>
Acked-by: Javid Mohammed <mjavid@qti.qualcomm.com>
Signed-off-by: Utkarsh Saxena <usaxena@codeaurora.org>
Signed-off-by: Sridhar Ancha <sancha@codeaurora.org>
2017-02-09 21:41:03 +05:30
Utkarsh Saxena
0948cf59f9 msm: rndis_ipa: fix to debug file system init failure
Do not consider debug file system init failure as
functional failure.

Modify the code to proceed further
driver initialization.

Change-Id: I821af8970b6c2ced55d6464b8a7b56a458fa7d79
Acked-by: Javid Mohammed <mjavid@qti.qualcomm.com>
Signed-off-by: Utkarsh Saxena <usaxena@codeaurora.org>
2017-02-09 21:15:20 +05:30
Hardik Kantilal Patel
969473a9e0 icnss: Avoid DOMAIN_ATTR_ATOMIC setting during S1 bypass
While initializing the SMMU with DOMAIN_ATTR_ATOMIC attribute
iommu driver always vote for aggre2_noc_clk during suspend mode
which result into power penalty. To resolve this issue avoid
configuring DOMAIN_ATTR_ATOMIC attribute in S1_BYPASS mode.

CRs-fixed: 2004562
Change-Id: Ic5d4b2864f58098fd29da48e5f977434e356b1e0
Signed-off-by: Hardik Kantilal Patel <hkpatel@codeaurora.org>
2017-02-09 20:00:28 +05:30