Commit graph

581744 commits

Author SHA1 Message Date
Linux Build Service Account
22369c78bc Merge "usb: gadget: Add snapshot of CCID function driver" 2017-01-31 04:42:33 -08:00
Linux Build Service Account
1480b6a1a1 Merge "ARM: dts: msm: Add Nfc device to sdm660" 2017-01-31 04:42:32 -08:00
Linux Build Service Account
0a7b7fc131 Merge "mmc: sdhci-msm: Disable controller clocks in suspend" 2017-01-31 04:42:31 -08:00
Linux Build Service Account
b2179ceb0e Merge "msm_vidc: Disable DCVS in thumbnail mode" 2017-01-31 04:42:30 -08:00
Linux Build Service Account
c00bc44b4b Merge "msm: vidc: Disable port reconfig for thumbnail session" 2017-01-31 04:42:30 -08:00
Linux Build Service Account
f2ab5923b1 Merge "ASoC: wcd: Fix ADSP based SVA mode detection failures" 2017-01-31 04:42:29 -08:00
Linux Build Service Account
7949ac69d2 Merge "ASoC: wcd9xxx: check gpio pinctrl state in wcd9xxx_reset" 2017-01-31 04:42:28 -08:00
Linux Build Service Account
ac0b19ff2c Merge "ARM: dts: msm: modify sound node for sdm660 qrd skus" 2017-01-31 04:42:27 -08:00
Sayali Lokhande
283e8d1b93 mmc: sdhci-msm: Disable controller clocks in suspend
Generally, during card suspend we call mmc_power_off
and disable controller clocks.
Now consider below sequence of events :
suspend -> resume -> suspend.
1) During first platform suspend, mmc_power_off will
be called and clocks would be disabled.
2) As a part of platform resume, we enable controller
clocks and defer card resume when
MMC_BUSRESUME_NEEDS_RESUME flag is set.
3) During next suspend we check if card is already
suspended (i.e MMC_BUSRESUME_NEEDS_RESUME is set)
and return without doing actual suspend (where we
call mmc_power_off and disable controller clocks).

So in this scenario, controller clocks will remain ON
even though card state is SUSPENDED.

Fix this by disabling controller clocks during suspend
if controller clock was ON.

CRs-Fixed: 1088893
Change-Id: Id54a15d7f6a7131dab609eec1db158c64ada83ce
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2017-01-30 22:03:09 -08:00
Linux Build Service Account
42e1251b38 Merge "smb-lib: disable APSD run on CC while APSD is disabled" 2017-01-30 20:16:01 -08:00
Linux Build Service Account
15632ada36 Merge "msm: isp: Recover VFE when epoch mismatch happens" 2017-01-30 20:16:00 -08:00
Linux Build Service Account
9787f5c3c1 Merge "ARM: dts: msm: update cpufreq node for SDM660 target" 2017-01-30 20:15:59 -08:00
Nicholas Troast
88b334d041 smb-lib: disable APSD run on CC while APSD is disabled
CC can debounce several times while VBUS is present and if APSD is
disabled the APSD result will be unknown. Disable APSD run on CC
debounce when APSD is disabled so the APSD result will not be reset in
this case.

Change-Id: Ia0b18605ea7d51aab0426bc7ad7c873152f42dc7
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
2017-01-30 14:52:33 -08:00
Linux Build Service Account
ea4719da1f Merge "ath10k: Add htt tx/rx layer changes for WCN3990 target." 2017-01-30 07:05:36 -08:00
Linux Build Service Account
f9500f4705 Merge "msm: kgsl: Fix incomplete IB2 dump in the snapshot" 2017-01-30 07:05:35 -08:00
Linux Build Service Account
9b80f2b723 Merge "ARM: dts: msm: add truly 1080p panel support for sdm660" 2017-01-30 07:05:34 -08:00
Linux Build Service Account
e3e2337e47 Merge "ARM: dts: msm: Add qrng device node for SDM630" 2017-01-30 07:05:32 -08:00
Linux Build Service Account
ba93fbf5f0 Merge "ufs: add additional sync between ice work queue and pending request" 2017-01-30 07:05:31 -08:00
Linux Build Service Account
d9f73b621e Merge "msm: kgsl: Check GPMU presence before accessing power counters" 2017-01-30 07:05:30 -08:00
Linux Build Service Account
7b317a25ea Merge "wil6210: fix QCA_WLAN_VENDOR_ATTR_FREQ attribute ID" 2017-01-30 07:05:29 -08:00
Linux Build Service Account
e1d0109fdc Merge "adreno_tz: Correct tz_buf pointer type to correct pointer arithmetic" 2017-01-30 07:05:28 -08:00
Linux Build Service Account
520c2d8947 Merge "ARM: dts: msm: change ref threhold to 184K in sdm660" 2017-01-30 07:05:27 -08:00
Linux Build Service Account
f3b8923a2c Merge "ARM: dts: msm: Disable WSA for internal codec SDM660" 2017-01-30 07:05:26 -08:00
Linux Build Service Account
e1e1ad0592 Merge "ath10k: Add host/target CE config and services for WCN3990" 2017-01-30 07:05:24 -08:00
Linux Build Service Account
79e80bf58b Merge "ASoC: msm: Update WCD934X RX and TX Slim channels" 2017-01-30 07:05:24 -08:00
Linux Build Service Account
3ed889b39e Merge "sched: set LBF_IGNORE_PREFERRED_CLUSTER_TASKS correctly" 2017-01-30 07:05:23 -08:00
Linux Build Service Account
564fc4f080 Merge "scsi: ufs: validate input args to queuecommand" 2017-01-30 07:05:22 -08:00
Linux Build Service Account
31a533f0a9 Merge "ARM: dts: msm: Add BCL mitigation configuration for sdm630" 2017-01-30 07:05:21 -08:00
Linux Build Service Account
e0c4785094 Merge "scsi: ufs: check for err state when polling for doorbell" 2017-01-30 07:05:19 -08:00
Linux Build Service Account
165381533f Merge "qpnp-smb2: fix incorrect type detection" 2017-01-30 07:05:18 -08:00
Linux Build Service Account
e90fdbd26f Merge "ARM: dts: msm: Remove SPSS notification for msm8998" 2017-01-30 07:05:13 -08:00
Linux Build Service Account
a3ab00251b Merge "smb-lib: fix unknown APSD result after CC2 workaround" 2017-01-30 07:05:12 -08:00
Linux Build Service Account
f1c56b5374 Merge "msm: mdss: Disable traffic shaper for pipe in command mode" 2017-01-30 07:05:11 -08:00
Linux Build Service Account
51026923d0 Merge "msm: mdss: Fix handling of Doze mode" 2017-01-30 07:05:10 -08:00
Linux Build Service Account
675a5c8af0 Merge "msm: mdss: Add partial update support for dest-scaler" 2017-01-30 07:05:09 -08:00
Linux Build Service Account
b503a4f71e Merge "ARM: dts: msm: Enable APSS-RPM communication for sdm630" 2017-01-30 07:05:08 -08:00
Linux Build Service Account
0f01552919 Merge "memshare: Fix parameters to collect ramdump" 2017-01-30 07:05:07 -08:00
Linux Build Service Account
3f2738720d Merge "cfg80211: Define macro for report better BSS in sched scan" 2017-01-30 07:05:05 -08:00
Linux Build Service Account
50ed1269ef Merge "ARM: dts: msm: Add sdhc1 and sdhc2 for sdm630" 2017-01-30 07:05:04 -08:00
Linux Build Service Account
5779a3e0b9 Merge "ath10k: Add copy engine descriptor for WCN3990 target" 2017-01-30 07:05:03 -08:00
Linux Build Service Account
8a09e46bdb Merge "clk: msm: clock-gcc-8998: Add 60MHz rate for usb3 master clk src" 2017-01-30 07:05:02 -08:00
Linux Build Service Account
0aa66bf039 Merge "icnss: Use right variable in sizeof for allocation" 2017-01-30 07:05:01 -08:00
Linux Build Service Account
f28e77a781 Merge "ARM: dts: msm: Add usb master clock rate in high speed mode for msm8998" 2017-01-30 07:05:00 -08:00
Linux Build Service Account
2026ad674d Merge "usb: dwc3: Reset and initiate lpm while booting up with no usb cable" 2017-01-30 07:04:59 -08:00
Linux Build Service Account
5c307ffbc7 Merge "usb: gadget: f_mass_storage: Add delay before continuing status stage" 2017-01-30 07:04:58 -08:00
Linux Build Service Account
91db9ff3ff Merge "smb138x-charger: enable stacked diode" 2017-01-30 07:04:57 -08:00
Linux Build Service Account
94de58ac69 Merge "ARM: dts: msm: Change pinctrl config for BLSP2 UART1 for sdm660" 2017-01-30 07:04:57 -08:00
Linux Build Service Account
49d5335592 Merge "regulator: cpr4: Support MMSS closed-loop voltage adjustments" 2017-01-30 07:04:56 -08:00
Linux Build Service Account
510fc66816 Merge "regulator: qpnp-labibb: make IBB discharge resistor configuration optional" 2017-01-30 07:04:55 -08:00
Linux Build Service Account
fa18a83d0a Merge "ath10k: Modify htt rx descriptor for WCN3990 target" 2017-01-30 07:04:54 -08:00