Commit graph

582699 commits

Author SHA1 Message Date
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
Linux Build Service Account
dd6494d94e Merge "ASoC: codecs: fix out of bounds copy" 2017-02-09 03:12:04 -08:00
Linux Build Service Account
f357214ebe Merge "ASoC: jack: Fix buttons enum value" 2017-02-09 03:12:03 -08:00
Linux Build Service Account
1746e61595 Merge "ASoC: msm: add FE DAIs for HFP for SDM660" 2017-02-09 03:12:03 -08:00
Linux Build Service Account
71339e56bd Merge "ASoC: msm: Add support for 128KHz in the compress driver" 2017-02-09 03:12:02 -08:00
Linux Build Service Account
387bc274f5 Merge "soundwire: Add support to disable smart boost data port" 2017-02-09 03:12:01 -08:00
Linux Build Service Account
23d7f4b613 Merge "ASoC: wsa881x: Fix boost enable sequence" 2017-02-09 03:12:00 -08:00
Linux Build Service Account
38b12d2ace Merge "ASoC: msm: add support for multi-copps for multiple BEs" 2017-02-09 03:11:59 -08:00
Linux Build Service Account
8eb99b68e4 Merge "clk: msm: clock-mmss-8998: Park the MMNOC AHB RCG at XO when its disabled" 2017-02-09 03:11:58 -08:00
Linux Build Service Account
6db651f50d Merge "msm: mdss: share MDP smmu device mappings with other mdss clients" 2017-02-09 03:11:57 -08:00
Linux Build Service Account
acea118806 Merge "msm: mdss: dp: add null check for token value" 2017-02-09 03:11:56 -08:00
Linux Build Service Account
ad45b2895a Merge "msm: mdss: fix frame rate calculation for DP interface" 2017-02-09 03:11:55 -08:00
Linux Build Service Account
c91b3261ec Merge "usb: dwc3: Set core clk rate to default upon device remove notification" 2017-02-09 03:11:54 -08:00
Linux Build Service Account
d171a06e11 Merge "arm: dma-mapping: map_page map to nearest page" 2017-02-09 03:11:52 -08:00
Linux Build Service Account
91b231673d Merge "qpnp: smb2: Add charger frequency config for PM660" 2017-02-09 03:11:51 -08:00
Linux Build Service Account
2d3372a5f8 Merge "diag: dci: Check for valid dci client entry" 2017-02-09 03:11:50 -08:00
Linux Build Service Account
e5508c550c Merge "icnss: Fix error check of athdiag read data_len" 2017-02-09 03:11:45 -08:00
Linux Build Service Account
fb2f6ae8ed Merge "ARM: dts: msm: Update GFX LDO CPR target quotient table for sdm660" 2017-02-09 03:11:44 -08:00
Linux Build Service Account
aee3872566 Merge "ARM: dts: msm: Add TLB dump entries for sdm660 and sdm630" 2017-02-09 03:11:43 -08:00
Linux Build Service Account
9bd945a3bf Merge "msm: gsi: use reinit_completion" 2017-02-09 03:11:39 -08:00
Linux Build Service Account
6d22c66f20 Merge "memshare: Add EXEC permission to MSA0 memory" 2017-02-09 03:11:38 -08:00
Linux Build Service Account
6aa70da703 Merge "ath10k: Add support for BASE MAC ADDRESS CMD" 2017-02-09 03:11:36 -08:00
Linux Build Service Account
a6135288c3 Merge "ARM: dts: msm: add support for NO jacktype for SDM660" 2017-02-09 03:11:36 -08:00
Linux Build Service Account
521046c118 Merge "ath10k: Skip reading of firmware-5.bin file" 2017-02-09 03:11:35 -08:00
Linux Build Service Account
33112fe182 Merge "clk: qcom: Remove gcc_rx2_qlink_clkref_clk for sdm660" 2017-02-09 03:11:34 -08:00
Linux Build Service Account
a9b0d6b409 Merge "clk: qcom: keep gcc_bimc_gfx_clk always on for SDM660" 2017-02-09 03:11:33 -08:00
Linux Build Service Account
15c1baa2c2 Merge "ARM: dts: msm: change gpio channel for sdm660" 2017-02-09 03:11:33 -08:00
Linux Build Service Account
40b46a5069 Merge "ARM: dts: msm: Add GFX CPR device configuration for sdm630" 2017-02-09 03:11:31 -08:00
Linux Build Service Account
87bd99f179 Merge "wil6210: protect list of pending wmi events during flush" 2017-02-09 03:11:31 -08:00
Linux Build Service Account
74755245cd Merge "defconfig: msm8998: enable kaslr support" 2017-02-09 03:11:30 -08:00
Linux Build Service Account
99e6ec4c60 Merge "msm: rmnet_ipa: do not release resource on pending data" 2017-02-09 03:11:29 -08:00
Linux Build Service Account
f05fb24257 Merge "ARM: dts: msm: enable 180deg panel orientation for msm8998 QRD device" 2017-02-09 03:11:28 -08:00
Linux Build Service Account
569f3627a1 Merge "msm: ipa3: changes to suspend/disable for WDI 2" 2017-02-09 03:11:27 -08:00
Linux Build Service Account
cfeddd50f8 Merge "usb: diag: Set interface protocol to represent diag" 2017-02-09 03:11:26 -08:00
Linux Build Service Account
a8d184bf06 Merge "msm: ipa3: fix freeze vote for SSR" 2017-02-09 03:11:25 -08:00
Linux Build Service Account
d7d6ecc840 Merge "bluetooth: Fix free data pointer routine" 2017-02-09 03:11:25 -08:00
Linux Build Service Account
4789471d3e Merge "regulator: gfx-ldo: Add GFX LDO support for sdm630" 2017-02-09 03:11:13 -08:00
Linux Build Service Account
27fda51032 Merge "Revert "usb: xhci: Set interrupt moderation for host mode to 4000(1ms)"" 2017-02-09 03:11:12 -08:00
Linux Build Service Account
72bf78f05a Merge "stm: laser: STM laser sensor driver." 2017-02-09 03:11:11 -08:00
Linux Build Service Account
ee652ca24e Merge "ARM: dts: msm: Fix VBIF QOS entries in SDM660, 8998" 2017-02-09 03:11:10 -08:00
Linux Build Service Account
3b74b552e9 Merge "mmc: sdhci-msm: Provide module/cmdline parameter for disabling cmdq" 2017-02-09 03:11:09 -08:00
Linux Build Service Account
f487064d89 Merge "msm: ADSPRPC: Buffer length to be copied is truncated" 2017-02-09 03:11:07 -08:00
Linux Build Service Account
d24550bbf5 Merge "ARM: dts: msm: Add slimbus slave device for wcn3990 on sdm630" 2017-02-08 17:48:24 -08:00
Linux Build Service Account
73a606f6a6 Merge "ARM: dts: msm: update wcn3990 wlan module device node for APQ8998" 2017-02-08 17:48:23 -08:00
Linux Build Service Account
4615d1ffcd Merge "arm64: gettimeofday change for timer rollover condition" 2017-02-08 17:48:22 -08:00
Linux Build Service Account
536d517bb1 Merge "msm: isp: enable stream clk separately" 2017-02-08 17:48:21 -08:00