wlan:Disabling BTAMP

Setting CONFIG_PRIMA_WLAN_BTAMP=n

Change-Id: Iec91c285b3387e39427143fbbcdf86e04ec691ca
Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>
msm: kgsl: Check the current interrupt status before power operations

Sometimes the core will go idle before the interrupt can be handled on
the GPU. If that happens then we could go to a lower power state before
cleaning up the pending interrupt and various entities that might be
waiting for it. Consider the current interrupt status when checking
for idle.

CRS-fixed: 449813
Change-Id: Ic0dedbadfd2d40e4411cf3b05e1eb4c4eecf7841
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>

Conflicts:

	drivers/gpu/msm/kgsl_events.c

Signed-off-by: Anil Gahlot <anilg@codeaurora.org>
msm: kgsl: Resolve a potential race in the interrupt handler

In the GPU interrupt handler we attempt to clear the ts_cmp_enable
for the active context so that future interrupts are skipped until
someone needs one again. If for some reason the interrupt handler
is delayed then there is a possiblity that the "current" context in
the GPU isn't the one that fired the interrupt. In that case we
could be accidently clearing a ts_cmp_enable for a context that
needs it. Instead of clearing in the interrupt handler clear it
from the GPU so we can be sure we got the right context.

As a bonus pushing this logic to the GPU side lets us get rid of
some extra register reads/writes in the interrupt handlers.

Change-Id: Ic0dedbadbf350f7c4866092fa0686f9b42f3cd33
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
msm: kgsl: Add event tracepoints

Add tracepoints for tracking the lifespan of GPU events.

Change-Id: Ic0dedbadf99b1efcb650608c6ac664d3c4ddafd5
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
msm: kgsl: Always send fence sync the timestamp it expects

Fence sync seems to react badly when it gets a unexpected timestamp
on a timeline.  When a event expires always send the expected timestamp
even if the event expired because the context was destroyed.

Change-Id: Ic0dedbad770363a00257d62c4940f7743bc33060
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
misc: isa1200: properly disable clocks

Since clk_prepare_enable is being used when enabling clocks,
clk_disable_prepare should be used to disable them.

CRs-fixed: 453579
Change-Id: Ic15c99e1fa82e45a3b9165af60c104a6bb736f92
Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
Bluetooth: Enable  UHID for Bluedroid

Enables uhid for the user space driver required by Bluedroid
HID module.

Change-Id: I629bc8962dbb30bfebf47479237a7eda8cd0c4af
Signed-off-by: Satish kumar sugasi <ssugas@codeaurora.org>
msm: pil: Allow proxy unvoting in error scenario

There are two scenarios where the proxy vote for
a peripheral won't be removed if it fails to boot:

1) When the module parameter does not override
the timeout as specified in the pil descriptor.

2)  When the module parameter is overridden to a
zero value.

So, fix these bugs by changing the pil_proxy_unvote()
function so that it removes the proxy vote when
either of the two above scenarios occur.

Change-Id: Ib796afccca462ff574f6058e93bab747df230ea8
Signed-off-by: Seemanta Dutta <seemanta@codeaurora.org>
Signed-off-by: Stephen Boyd <sboyd@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>

Conflicts:

	drivers/power/pm8921-charger.c

Signed-off-by: Ajay Dudani <adudani@codeaurora.org>