Commit graph

586915 commits

Author SHA1 Message Date
Linux Build Service Account
078448a790 Merge "Input: stm: optimize the laser sensor driver" 2017-04-05 04:05:36 -07:00
Linux Build Service Account
e81f37a9e5 Merge "ARM: dts: msm: Update camera clock sources for sdm630" 2017-04-05 04:05:35 -07:00
Linux Build Service Account
61aa6bdf98 Merge "ARM: dts: msm: Add flash and OIS node to camera sensor mtp for msm8998" 2017-04-05 04:05:34 -07:00
Lynus Vaz
341934ba38 msm: kgsl: Use legacy PM4 check instead of adreno version
Check for legacy PM4 commands instead of adreno version to calculate
ringbuffer space for PM4 commands that write to memory.

Change-Id: I5d1d4cfbc70bc73ddee9ee752de24aae154a04dc
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>
2017-04-05 03:07:24 -07:00
Sarada Prasanna Garnayak
d5782299b7 ARM: dts: msm: add regulators and clk in icnss device node for sdm630
During recovery, there are cases where in WLAN driver running on
APPS can access WLAN copy engine register causing exceptions
because of WLAN hardware in reset state.

Add voltage regulator and clk in icnss device node to vote for WLAN
hardware resources by the icnss platform driver during WLAN recovery.

CRs-Fixed: 2029173
Change-Id: I00bbad40ee152c8dac187ff1f541e34b254589cb
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
2017-04-05 01:57:47 -07:00
Sarada Prasanna Garnayak
66656b0732 ARM: dts: msm: add regulators and clk in icnss device node for sdm660
During recovery, there are cases where in WLAN driver running on
APPS can access WLAN copy engine register causing exceptions
because of WLAN hardware in reset state.

Add voltage regulator and clk in icnss device node to vote for WLAN
hardware resources by the icnss platform driver during WLAN recovery.

CRs-Fixed: 2029102
Change-Id: Iba785acc391fb56ea068199598ddc14d20bb3481
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
2017-04-05 01:57:43 -07:00
Maya Erez
52174c7752 wil6210: prevent access to 11AD device if resume fails
In case wil6210 resume fails, wil6210 suspend function will try
to access the suspended device in the next kernel suspend.
To prevent that, add wil_status_suspended flag to indicate if the
device is already suspended and clear it only if the resume succeeds.

Change-Id: I548e5b516cfa62389ce5f6cafcf1568206f7c2a9
Signed-off-by: Maya Erez <merez@codeaurora.org>
2017-04-05 11:26:45 +03:00
Neeraj Soni
adc03ee05b crypto: msm: Use appropriate logging function
Dynamic debug can be used to get the logs

Change-Id: I6510da111019022149190fd753a5da1cc816fffa
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2017-04-05 11:57:57 +05:30
Tharun Kumar Merugu
f31aa2780c msm: ADSPRPC: Unmap remote heap buffer only for ADSP SSR
Unmap remote heap buffer only for ADSP SSR

Change-Id: I9abff20cfdcc4588a3a377e73d38d3ea91316d25
Acked-by: Himateja Reddy <hmreddy@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-04-04 22:04:41 -07:00
Ashay Jaiswal
0b6793543b qcom: smb1351: update CHARGING_ENABLE reporting logic
In case of parallel charging mode "parallel_charger_suspended"
variable tracks the charging enable state, update CHARGING_ENABLE
reporting to use the same.

CRs-Fixed: 2014572
Change-Id: Ib7246f407ad103343b7587b9de3ac938fb63767d
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2017-04-05 10:19:49 +05:30
Ashay Jaiswal
eb367740c8 qcom: smb2: disable parallel in restricted/thermal conditions
Add voting to disable parallel charger in case of restricted
charging and when system temperature level changes from normal.
Parallel charger gets re-enabled once thermal condition/FCC
restrictions are removed.

CRs-Fixed: 2014572
Change-Id: Ic26b3d93f2f3d582a2eb3c7b9ea0d27bbad24a50
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2017-04-05 10:19:49 +05:30
Abhijeet Dharmapurikar
347cdf228a qcom: battery: update parallel algorithm for ICL change
Update the parallel algorithm for ICL change request.
Following steps are performed for every ICL change:
- disable parallel charger using ICL_CHANGE_VOTER
- update the new ICL and re-run AICL.
- re-enable parallel charger by removing vote of
  ICL_CHANGE_VOTER.

While at it, update the 'smblib_get_prop_usb_online'
function to use voter library's locked API to get
the usb_icl_vote, this fixes the lockup that happens
when charging is enabled/disabled from usb_icl_votable's
callback function.

CRs-Fixed: 2014572
Change-Id: I7deb6a50d67471ab1aa5e1db6fff880574b4bafb
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-04-05 10:19:20 +05:30
Abhijeet Dharmapurikar
69d321dcee qcom: battery: remove ICL_REDUCTION support
Make battery library to directly update the split current
of the main charger via power_supply framework's set_property
API using CURRENT_MAX property. ICL_REDUCTION property
is no longer required.

Note that we are not doing initial ICL vote for USBIN USBIN,
instead when time comes to split aicl, we will read the input
current limit and if nothing is set, check what the hw determined
as the max limit and use that.

For a PD charger case where the apsd result will be unknown,
the current limit is expected to be set by the time aicl settled is
called. The 30 second delaying of parallel enabling, should give
PD engine ample time to set the current limits.

While at it clean up the way settled current change is tracked. Create
a variable that specifically indicates the total settled current seen
last time settled current was adjusted. This makes compare to an updated
settled current value easy.

CRs-Fixed: 2014572
Change-Id: I040b65e6380f2c12350ea44bf32e6981ff126f18
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-04-05 10:18:49 +05:30
Ashay Jaiswal
17d9f0383d power_supply: add HW_CURRENT_MAX power_supply property
Add support for HW_CURRENT_MAX property which returns maximum
input current that can be set for an adapter. This property will
be specifically used by parallel charger to cast an initial ICL
vote.

CRs-Fixed: 2014572
Change-Id: I49e80e6b25f40791d9035bc1567fdf881914b1e8
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-04-05 10:02:54 +05:30
Ashay Jaiswal
7ddef0d5e4 qpnp: smb-lib: move usb_icl_votable to battery library
Move usb_icl_votable creation and it's callback in the
battery.c file, in preparation for an upcoming change where
usb_icl_votable callback will be able to
disable parallel charger when a low input current
request is set.

The new callback uses CURRENT_MAX property to be set on main
psy to set the ICL limit of primary charger.

The limit setting code in main charger path where the votable
call resides currently relies a lot on client being present or not.
Since the votable is being moved away, it won't have information
about the client. So use the current parameter of INT_MAX to
indicate no clients present.

Also it could be that main psy is not instantiated by the time first
icl vote comes in. Ensure that we rerun_election on usb_icl_votable
the instant main psy is seen.

CRs-Fixed: 2014572
Change-Id: Ie449af086ed9218b40ea83158b69e8f8e73edda3
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-04-05 10:02:46 +05:30
Ashay Jaiswal
ef45c30bc8 qcom: smb2: disable h/w autonomous parallel control
The charger driver ensures that parallel charging remains
disabled as long as AICL is below threshole (1400mA) using
it's software voting mechanism(USBIN_I_VOTER), thus disable
hardware's autonomous control of input current based parallel
charging.

CRs-Fixed: 2014572
Change-Id: Ie991e0c1d16d63b6def6fb3379019114d20d60f7
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-04-05 10:02:39 +05:30
Ashay Jaiswal
f521128115 qcom: smb-lib: add delay for parallel enable
Currently, the driver enables parallel charger as soon
as a favorable charger is seen. This causes many, unnecessary
splits of AICL results as AICL runs for the first time. Besides
the detection logic could further update charger type and rerun
AICL.

Its best to simply delay enabling parallel charger for 30 seconds.
This ensures that type detection and its AICL run to completion and
parallel charging starts with a stable AICL result.

To realize this
- implement a workqueue which will be scheduled/cancelled 30 seconds
  later when vbus plugin interrupt happens.
- The workqueue signifies that 30 seconds have elapsed and parallel
  charging should be enabled by PL_DELAY_VOTER.
- remove PL_DELAY_HDVP_VOTER since PL_DELAY_VOTER will
  ensure parallel gets enabled after 30 seconds of insertion.
- unvote from PL_DELAY_VOTER only when the typeC removal event happens.
  A PR_SWAP during a sink session will keep the PL_DELAY_VOTER's vote
  enabled, we expect CHG_STATE_VOTER to disable parallel since device will
  be supplying VBUS and not charging the battery. This also means that
  when another PR_SWAP happens and the device starts operating in sink mode
  again, PL_DELAY_VOTER's vote will remain enabled and parallel charging
  would begin when other conditions become favorable. IOW PL_DELAY_VOTER
  tracks 30 second after physical insertion and remains unaffected by
  PR_SWAPs.

CRs-Fixed: 2014572
Change-Id: Ibe10768e61c6d2661bc8946f7f6b9be06f0c28e6
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-04-05 10:02:29 +05:30
Ashay Jaiswal
38939b5e92 power: smb-lib: update USBIN_V_VOTER usage
The current code enables parallel charging if a high voltage
charger is seen (QC or PD) or a high current charger is seen.

This means that parallel charger could remain enabled when PD
transitions its voltage even though it has reduced the current
to 500mA. It is desirable to disable parallel charging during
such voltage transition.

So prepare for this change by first ensuring that only a QC
charger votes for USBIN_V_VOTER. The PD charger, even while
operating at higher voltages will need to depend on USBIN_I_VOTER,
just like a simple DCP charger, to enable parallel charger.

CRs-Fixed: 2014572
Change-Id: I03dfcff44b30b06918ebf176043873fb141f485f
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2017-04-05 10:01:08 +05:30
Linux Build Service Account
26db194916 Merge "defconfig: msm: Enable CONFIG_UID_CPUTIME flag" 2017-04-04 20:07:31 -07:00
Linux Build Service Account
617c68c493 Merge "mmc: core: prefer SDR50 mode over DDR50 for SD card" 2017-04-04 20:07:31 -07:00
Linux Build Service Account
b742552ee2 Merge "ASoC: msm: qdsp6v2: Add support for 7 channel mapping" 2017-04-04 20:07:30 -07:00
Linux Build Service Account
0136ee2462 Merge "mmc: core: Increase the runtime PM reference count in try_claim_host" 2017-04-04 20:07:29 -07:00
Linux Build Service Account
7ee506fbe9 Merge "msm: kgsl: Remove incorrect check to cap AB vote to IB vote" 2017-04-04 20:07:28 -07:00
Linux Build Service Account
23b57af0a3 Merge "msm: gsi: continue probe on ipc log failure" 2017-04-04 20:07:27 -07:00
Linux Build Service Account
c0dabb7776 Merge "msm: kgsl: Disable memory retention for core clock before entering SLUMBER" 2017-04-04 20:07:27 -07:00
Linux Build Service Account
8c6ab57348 Merge "mmc: core: Remove unused variable cached_ext_csd" 2017-04-04 20:07:26 -07:00
Linux Build Service Account
54b3c86290 Merge "ARM: dts: msm: Add dt support for platforms with audio over USBC" 2017-04-04 20:07:25 -07:00
Linux Build Service Account
8df5bc2d7e Merge "block: Make del_gendisk() safer for disks without queues" 2017-04-04 20:07:24 -07:00
Linux Build Service Account
0802e8d62f Merge "scsi: ufs: scale up the gear in 2 steps" 2017-04-04 20:07:23 -07:00
Linux Build Service Account
c43712c4db Merge "drivers/base: cpu: Add node for core control isolation" 2017-04-04 20:07:22 -07:00
Linux Build Service Account
fb11ce47de Merge "ASoC: msm: qdsp6v2: add route for TERT_TDM_RX_4 playback" 2017-04-04 20:07:21 -07:00
Tony Truong
23764aabce msm: pcie: support PCIe MSI QGIC with stage 1 SMMU enabled
When Stage 1 SMMU is enabled, the QGIC doorbell address needs to
be mapped or else there will be a translation fault when an endpoint
tries to trigger an interrupt via MSI. PCIe host driver will map
this address on behalf of the client.

Change-Id: I7fdbe62daeb5dbecc459e4d9bc7832785f5b9fb7
Signed-off-by: Tony Truong <truong@codeaurora.org>
2017-04-04 17:26:19 -07:00
Tony Truong
f83b25b95d msm: pcie: update teardown sequence for PCIe MSI interrupt
Update the teardown sequence for PCIe MSI to support
multiple endpoints.

Change-Id: I1fbdb840bf3677e30d4d27a50503c5cc70ece272
Signed-off-by: Tony Truong <truong@codeaurora.org>
2017-04-04 12:53:35 -07:00
Linux Build Service Account
28e87e960f Merge "pinctrl: lpi: Avoid initial SSR notifications at bootup" 2017-04-04 12:10:28 -07:00
Linux Build Service Account
ede6277d8b Merge "qcom: smb-lib: disable VCONN operations for micro USB mode" 2017-04-04 12:10:27 -07:00
Linux Build Service Account
48912ce0ae Merge "wil6210: remove HALP voting in debugfs ioblob" 2017-04-04 12:10:26 -07:00
Linux Build Service Account
835bd1f84a Merge "ASoC: msm: support 5 and 7 channel for TDM hw param" 2017-04-04 12:10:25 -07:00
Linux Build Service Account
025198c382 Merge "ASoC: msm: Fix mute on speaker in VoWLAN calls" 2017-04-04 12:10:23 -07:00
Rohit Kumar
e90af32a6f ASoC: msm: qdsp6v2: Add support for 7 channel mapping
Add support for 7 channel mapping in asm to support
7 channel playback.

CRs-Fixed: 1114041
Change-Id: I0daf306d4495d3966406d05fc6328b2956a2d11f
Signed-off-by: Rohit Kumar <rohitkr@codeaurora.org>
2017-04-04 11:53:31 -07:00
Veerabhadrarao Badiganti
26e54a44f6 mmc: core: Increase the runtime PM reference count in try_claim_host
Runtime PM reference count is being increased in mmc_claim_host() and
is decreased in mmc_release_host(). This reference count is kept
during the complete cycle of a claim -> release host.

Same need to be done even in mmc_try_claim_host() as well. Increase
the runtime PM reference count by invoking pm_runtime_get_sync() from
mmc_try_claim_host() upon first successful claim.

Without this change the runtime PM reference count goes for a toss
since count is not getting incremented in mmc_try_claim_host() but is
getting decremented in mmc_release_host().

Change-Id: I77836875b4700a4bf3dbde2bf1abdf2ad36c4cac
Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
2017-04-04 17:00:02 +05:30
Linux Build Service Account
4c332132fc Merge "ASoC: mbhc: Modify special headset detection" 2017-04-04 03:08:17 -07:00
Linux Build Service Account
c5537150f9 Merge "ASoC: msm-lsm-client: cleanup ioctl functions" 2017-04-04 03:08:16 -07:00
Linux Build Service Account
4fbb03737f Merge "ASoC: wcd934x: Fix sequence for efuse sensing" 2017-04-04 03:08:15 -07:00
Linux Build Service Account
f0677827e0 Merge "drivers: soc: apr: remove GLINK_TX_REQ_INTENT flag in apr write" 2017-04-04 03:08:14 -07:00
Linux Build Service Account
ac9a1d1c26 Merge "ARM: dts: msm: add support for secondary TDM on msm8996 adp/cdp" 2017-04-04 03:08:13 -07:00
Linux Build Service Account
044432bd42 Merge "ARM: dts: msm: add support for secondary MI2S on msm8996 adp/cdp" 2017-04-04 03:08:13 -07:00
Linux Build Service Account
fb45b11026 Merge "msm: mdss: Validating data values before passing on as operand" 2017-04-04 03:08:11 -07:00
Linux Build Service Account
e62dc3df39 Merge "msm: thermal-dev: Protect IOCTL from race condition" 2017-04-04 03:08:10 -07:00
Linux Build Service Account
be929723bd Merge "msm: ipa3: fix Q6 statuses exception path" 2017-04-04 03:08:09 -07:00
Linux Build Service Account
c07dd44bb6 Merge "mhi: mhi_uci: redesign mhi_uci driver" 2017-04-04 03:08:08 -07:00