Merge "power: pm8921-bms: fix override mode causes sleep current increase"
Merge "power: pm8921-bms: Enable batt alarm"
Merge "power: pm8921-bms: correct even after faking 100%"
Conflicts:
	drivers/power/pm8921-bms.c
Merge "power: pm8921-bms: add capacitive resistance"
ASoC: wcd9xxx: Fix MBHC irq handler deadlock scenario

There is a chance to encounter deadlock when either electrical mbhc irq
or mechanical mbhc irq releases resource lock to let polling thread finish
its job.  This is due to the possibility of one irq handler can preempt
already running the other type of irq handler.
Introduce a new mutex to avoid this preemption.

CRs-fixed: 428653
Change-Id: Idf24c62224026c9c061de12c31e248c05b47de9d
Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org>
Merge "power: pm8921-charger: don't reject all the chg current requests"
wcnss: Log CCPU registers in reset interrupt API

Reset interrupt is sent to Riva when host drivers fail to communicate
with Riva over SMD. So logging these CCPU registers helps to know the
failure reason at Riva.

Change-Id: Icccf6a5b0644fd75137602cc96b25dc8d392260a
CRs-Fixed: 418813
Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>
power: pm8921-charger: get rid of using LPM

The LPM is causing a lot of regression on various test cases
1. Writes to charger have become complex
2. There is uncertainty about whether battery insertion/removal could be
detected reliably.

LPM was introduced to prevent lockups from happening when the charger
was running in hw based clock switching while it was suspended. UVLO
lockups were not seen if the charger was running from 19.2Mhz.

Instead activate LPM mode only while the system is suspended and always
force 19.2Mhz when not suspended. This way we avoid the complexities
with writes, can detect battery insertion/removal as long as the system
is not suspended and more importantly fix the UVLO issue since we will
never be running in hw clk switching mode.

Change-Id: I94510311b503c21ec659a96982010435abdbcfaf
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
net: usb: Add MUX support in embedded rmnet driver

Due to limited number of HSIC endpoints, to support
more than existing number of control and data channels,
driver needs to MUX all the data channels as well as
the control channels into one HSIC interface. MUX
support is enabled on PID 0x9075. MUX header is added
to IP/control packet based on the channel id while
transmitting to mdm device. Similarly, while receiving
driver removes and parses the MUX header and based on
channel id it forwards IP/control packet to appropriate
network interface/control channel.

Change-Id: If37c672347ab47be6e02d4efd33a70c46486b5f1
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
cfg80211: enable TDLS on P2P client interfaces

There's no reason TDLS should be prevented on P2P client
interfaces, and most of the code already handles it, so
allow adding stations for it.

CRs-fixed: 458139
Change-Id: Id5bdde87aa6988731c91176cb5d54ffde975577c

Reported-by: Jouni Malinen <j@w1.fi>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
mobicore: New branch incorporating QC code review suggestions.

Solved various naming issues, removed comments.
Many of the changes already present in master.

Signed-off-by: Lukas Hänel <lukas.haenel@gi-de.com>
Change-Id: I7c068154e5af5ae40dc2675afb67a5f6835d9d05
[hnamgund@codeaurora: align platform.h with other branches,
 reformat commit text, resolve trivial merge conflicts]
Signed-off-by: Hariprasad Dhalinarasimha <hnamgund@codeaurora.org>
Acked-by: Tony Hamilton <tonyh@qti.qualcomm.com>
mobicore: MobiCore 1.2 kernel module Changes to MC11

Split up of /dev/mobicore into daemon and TLC part /dev/mobicore-user.
Refactored memory management to use locking and refcounting.
Use new data structures for managing world shared memory.
Split up functionality into different source files.
Shorter names for various identifiers.

Signed-off-by: Lukas Hänel <lukas.haenel@gi-de.com>
Change-Id: I6e239c061403500b74707feca31785237158f93b
[hnamgund@codeaurora.org: Drop executable permission for arm.h,
 drop changes to platform.h to align with other branches,
 reformat commit text]
Signed-off-by: Hariprasad Dhalinarasimha <hnamgund@codeaurora.org>
Acked-by: Tony Hamilton <tonyh@qti.qualcomm.com>
mobicore: t-base-200 Engineering Release

 - Improve the smc work by not using work_on_cpu anymore
which in later linux versions spawns a new thread.
 - Unmap memory from TLC when freeing.
 - Enable mapping of contigous buffers to trustlets.
 - Logging set up by th IOCTL.
 - Compliant with the 3.4 Linux Kernel Version.

Change-Id: Ied8f024c4dd7e101b23e3ba842fcc47f9ab583fe
Signed-off-by: Oana Medvesan <medvesan.oana@gmail.com>
[hnamgund@codeaurora.org: Modify mobicore_kernelapi/main.c for 3.4
kernel compatibility, reformat commit text]
Signed-off-by: Hariprasad Dhalinarasimha <hnamgund@codeaurora.org>
Acked-by: Tony Hamilton <tonyh@qti.qualcomm.com>
mobicore: statically assign minor device numbers

Temporarily assign static minor device numbers to the gud driver
since the dynamic allocation table is exhausted.

Change-Id: Ied42639cb362b0fcac6e9516174c691f57406677
Signed-off-by: Hariprasad Dhalinarasimha <hnamgund@codeaurora.org>
Acked-by: Tony Hamilton <tonyh@qti.qualcomm.com>
Merge "slimbus: Callback to indicate device report present message"
Conflicts:
	drivers/slimbus/slimbus.c
Merge "slimbus: Allow controller to override default scheduling algorithm"
Conflicts:
	include/linux/slimbus/slimbus.h
Merge "slimbus: Allow controller to specify logical addresses"
Merge "slimbus: Populate slimbus device's logical address during assignment"
Merge "power: pm8921-charger: get rid of using LPM"
Conflicts:
	drivers/power/pm8921-charger.c
ASoC: wcd9310: Update compander configuration sequence

Update compander configuration sequence for headphone path
to prevent the concurreny of ANC and compander in addition
to bypass the delay buffer for ANC and class G to avoid the
audio delay change between class G enabled and disable modes.

CRs-fixed: 456565
Change-Id: I561cb878906b9e31d8c1b04c145c533090f80f1f
Signed-off-by: Kuirong Wang <kuirongw@codeaurora.org>