Commit graph

590235 commits

Author SHA1 Message Date
Abhijeet Dharmapurikar
86e1155676 smb-lib: ignore disconnects during power role swap
During a power_role swap, the CC lines get disconnected for a bit.
This causes the charger driver to prematurely declare a disconnection
and it resets back to disconnected state.

Update the code to distinguish a disconnect caused during PR_SWAP vs
a real disconnect.
Avoid
- resetting the CC line to HW control
- switching DRP mode
- enabling the crude sensor workaround
- enabling APSD
during a discconnet caused by PR_SWAP

Note that PR_SWAP setting/unsetting needs to done regardless of the
connected state of the CC line. When PR_SWAP is notified to be
completed and the CC lines are still seen disconnected call the real
disconnect code.

While at it Vconn can be disabled too in the real disconnect code path.

Change-Id: I97ab7ee343c5b2bcf25797e6acbb1de37f5ba00a
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-26 14:29:13 -07:00
Linux Build Service Account
15b9da94dd Merge "ARM: dts: msm: enable partial update for dual dsi cmd mode on msm8998" 2017-05-26 14:09:11 -07:00
Linux Build Service Account
0482210d38 Merge "media: dvb-core: Fix possible buffer overflow error" 2017-05-26 14:09:10 -07:00
Linux Build Service Account
881828b004 Merge "msm: kgsl: Deal with a NULL pointer when creating default pagetable" 2017-05-26 14:09:09 -07:00
Abhijeet Dharmapurikar
e91e2202ec power_supply: introduce PR_SWAP property
Introduce POWER_SUPPLY_PROP_PR_SWAP to notify if the device is in
power role swap.

Change-Id: I8d0cb3a71ec1a646b7ec37405e66cb00ddc40e0d
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-26 11:29:38 -07:00
Abhijeet Dharmapurikar
85d191129e smb-lib: reset SDP draw to 100mA
The driver could leave SDP's current draw to a higher value
once its removed. This is because the code to reset the
current limit needs the type to be SDP to reset it which is
not going to be the case after removal.

So reset SDPs current limit back to 100mA in the code path
for non-SDP chargers.

Change-Id: Idfb9df1b72a17f1db63265b85f6546cbb77c4018
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-26 11:29:37 -07:00
Utkarsh Saxena
fd92093b0a msm: ipa: Fix to use GFP_DMA flag
IPAv2 hardware works with 32 bit addressing,
so allocate a kernel memory using GFP_DMA flag
which is processed by IPA hardware. Added code
changes to free correct tx_pkt pointer in fail_dma_map condition.

Change-Id: I5f7005c3bf89275fd56af648ee5bf1b3d06afc38
Acked-by: Ashok Vuyyuru <avuyyuru@qti.qualcomm.com>
Acked-by: Mohammed Javid <mjavid@qti.qualcomm.com>
Signed-off-by: Utkarsh Saxena <usaxena@codeaurora.org>
2017-05-26 19:28:56 +05:30
Linux Build Service Account
33a94f46e5 Merge "ASoC: APR: Fix missing APR deregister from asm" 2017-05-26 06:31:12 -07:00
Linux Build Service Account
38814e7f31 Merge "ASoC: msm: qdsp6v2: Add 144k sample rate to compress driver" 2017-05-26 06:31:11 -07:00
Linux Build Service Account
50ef4cd0a6 Merge "ASoc: msm: Support SEC_MI2S_TX Port ASM Loopback" 2017-05-26 06:31:09 -07:00
Linux Build Service Account
3daa107c23 Merge "ASoc: msm: Add dai link MultiMedia20 for custom card" 2017-05-26 06:31:07 -07:00
Linux Build Service Account
4267fd253d Merge "usb: gadget: Fix synchronization issue between f_audio_source" 2017-05-26 06:31:06 -07:00
Linux Build Service Account
b52ce7f7b9 Merge "msm: kgsl: Update QoS settings for A508 VBIF as recommended" 2017-05-26 06:31:06 -07:00
Linux Build Service Account
5db69d4782 Merge "ais: increase CCI timeout value to 600 msec" 2017-05-26 06:31:05 -07:00
Linux Build Service Account
87d91c5565 Merge "ARM: dts: msm: add clock-cntl-support for msm8996 ispif" 2017-05-26 06:31:03 -07:00
Linux Build Service Account
d469953378 Merge "ARM: dts: msm: correct voltage range values for msm8996 ADP camera" 2017-05-26 06:31:02 -07:00
Linux Build Service Account
fabfb34ce9 Merge "irqchip: gic(-v3): Mask PPIs during disable_percpu_irq()" 2017-05-26 06:31:01 -07:00
Linux Build Service Account
86552b6a63 Merge "ASoC: msm: Convert ALSA to ADSP format" 2017-05-26 06:30:48 -07:00
Linux Build Service Account
3ac136c40b Merge "drm/msm: profile submit_time in nanosecond resolution" 2017-05-26 06:30:47 -07:00
Lynus Vaz
5ea16d78cc msm: kgsl: Deal with a NULL pointer when creating default pagetable
Return an appropriate error code if the default pagetable is NULL.

Change-Id: Ic88b066c40a8f840d95fd3fbc9ee9274c428b66a
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>
2017-05-26 05:37:37 -07:00
Hareesh Gundu
92ef644eb6 adreno_tz: Remove unnecessary devfreq NULL check in tz_handler()
Caller of tz_handler() is having the NULL check for devfreq,So
we don’t need unnecessary NULL pointer check.

CRs-Fixed: 2046922
Change-Id: I42eb70ab19b4a5af193521d77bca86447a1ecdb8
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
2017-05-26 17:44:28 +05:30
ChandanaKishori Chiluveru
a510e932e4 usb: gadget: Fix synchronization issue between f_audio_source
Race is happening when both audio_pcm_close() and audio_send()
executes in parallel.
When the PCM session is closed, the substream attribute of the
audio_dev structure is set to NULL in audio_pcm_close().
As there is no synchronization protection for the audio_dev subtream
attributes in audio_send(), it is causing NULL pointer dereference.
Hence fixing the issue by adding proper synchronization protection
for the audio_dev subtream attributes in audio_send().

CRs-Fixed: 613498
Change-Id: Id9ab0d4e347b8bb2f551f9033829e541bdcaf0e8
Signed-off-by: ChandanaKishori Chiluveru <cchilu@codeaurora.org>
Signed-off-by: Tarun Gupta <tarung@codeaurora.org>
2017-05-26 03:29:37 -07:00
Udaya Bhaskara Reddy Mallavarapu
3bf3c6154d media: dvb-core: Fix possible buffer overflow error
Added check to avoid buffer overflow error.

CR's-Fixed: 2043689
Change-Id: I38dd770e0b469dd3ccce3339d7c46957c012cbdd
Signed-off-by: Udaya Bhaskara Reddy Mallavarapu <udaym@codeaurora.org>
2017-05-26 15:53:15 +05:30
Linux Build Service Account
a2ab165607 Merge "genirq: Use irq_set_affinity_locked to change irq affinity" 2017-05-26 00:10:43 -07:00
Linux Build Service Account
18c1ad4d51 Merge "mmc: core: retune after un-gating the clocks" 2017-05-26 00:10:42 -07:00
Linux Build Service Account
22412a0523 Merge "icnss: Free regread buffer before allocating new one" 2017-05-26 00:10:41 -07:00
Linux Build Service Account
4fae1bf22a Merge "ARM: dts: msm: Change version bit to match TP 800S used for HDK660/630" 2017-05-26 00:10:40 -07:00
Linux Build Service Account
88d0f2244b Merge "ARM: dts: msm: add proxy voter for QRD SDM660" 2017-05-26 00:10:39 -07:00
Linux Build Service Account
c78cb70a36 Merge "ARM: dts: msm: configure interrupt types for charger for pm660" 2017-05-26 00:10:38 -07:00
Linux Build Service Account
12896a6fc6 Merge "mmc: core: extend SDR104 workaround for other paths" 2017-05-26 00:10:37 -07:00
Linux Build Service Account
f5b9a7e270 Merge "icnss: create debugfs entries when CONFIG_ICNSS_DEBUG is enabled" 2017-05-26 00:10:35 -07:00
Linux Build Service Account
66a27a3a8f Merge "mhi: core: fix potential buffer overflow" 2017-05-26 00:10:34 -07:00
Linux Build Service Account
aa6325414f Merge "usb: pd: policy_engine: Disable vconn first upon disconnect" 2017-05-26 00:10:34 -07:00
Linux Build Service Account
761009ddd7 Merge "defconfig: msmcortex: Enable hardened user copy" 2017-05-26 00:10:33 -07:00
Linux Build Service Account
bd5238c5e7 Merge "cnss: save the cc source to platform driver" 2017-05-26 00:10:30 -07:00
Linux Build Service Account
c5a3a7fe46 Merge "Revert "arm: cpu: read all address cells in dt for cpuid"" 2017-05-26 00:10:29 -07:00
Linux Build Service Account
7d371c9315 Merge "soc: qcom: glink: Add new APIs to toggle RX thread priority" 2017-05-26 00:10:29 -07:00
Linux Build Service Account
5c161901b2 Merge "ASoC: msm: qdsp6v2: set voc type according to stream type" 2017-05-26 00:10:28 -07:00
Linux Build Service Account
cf2d68fe6a Merge "msm: pcie: add IOMMU_DEVICE for MMIO mapping" 2017-05-26 00:10:27 -07:00
Linux Build Service Account
a24cba4428 Merge "drm/msm: add irq mapping for cec in hdmi driver" 2017-05-26 00:09:47 -07:00
Linux Build Service Account
03da53eca2 Merge "msm_11ad: define ops_keep_radio_on_during_sleep as static" 2017-05-26 00:09:47 -07:00
Linux Build Service Account
34672d4fb7 Merge "ARM: dts: msm: add audio support for HDK660/630 boards" 2017-05-26 00:09:46 -07:00
Linux Build Service Account
187608370f Merge "soc: qcom: msm_bus: add rt mutex lock for cllist data" 2017-05-26 00:09:45 -07:00
Linux Build Service Account
7e32d73762 Merge "ARM: dts: msm: Specify SC interrupts for LAB/IBB in pmi8998" 2017-05-26 00:09:43 -07:00
Linux Build Service Account
b56ec29b40 Merge "qpnp: smb2: fix ICL recovery mechanism" 2017-05-26 00:09:37 -07:00
Linux Build Service Account
21dd810c7c Merge "qpnp-smb2: update AICL rerun logic for PM660" 2017-05-26 00:09:36 -07:00
Linux Build Service Account
b7e32b139c Merge "soc: qcom: pil: Use subsys_set_error to indicate firmware errors" 2017-05-26 00:09:35 -07:00
Linux Build Service Account
b4f36ef221 Merge "leds: qpnp-flash-v2: Add support for LPG strobe" 2017-05-26 00:09:34 -07:00
Linux Build Service Account
a5a24462df Merge "ARM: dts: msm: Enable the quat mi2s in slave mode on apq8098 mediabox" 2017-05-26 00:09:33 -07:00
Linux Build Service Account
972dd643bf Merge "ARM: dts: msm: update tuning parameters for QMP PHY for SDM660" 2017-05-26 00:09:32 -07:00