Merge "rtc: alarm: Set power-on alarm 120 sec before actual alarm time"
coresight: enable flush-on-flushin for periodic flush to usb

Periodic flushing for ETR to USB uses ETR flush-on-FLUSHIN
external input. Hence, enable flush-on-FLUSHIN by default when
enabling ETR to USB transfers and work around the manual flush
failure by skipping it during ETR to USB disable. Adjust the
periodic flush threshold to the maximum value in order to
reduce the overhead when there is no data to be transferred.

CRs-Fixed: 461885
Change-Id: Ie3a1bbc80e017f187af56fcfdfb52297ba9aa72d
Signed-off-by: Pratik Patel <pratikp@codeaurora.org>
msm: mdss: Modify the calibration register address check range

Include address 0x0 to the valid address list for calibration ioctl,
so that user space can read the MDP version.

Change-Id: I128dbf6d9febf7fcd745b350933502984ab2fe24
Signed-off-by: Ping Li <quicpingli@codeaurora.org>
msm: camera: Exit gracefully while camera daemon crashes

Add camera daemon shutdown handling in all camera
sub devices to exit camera gracefully and it helps
to restart camera.

Change-Id: I39643a16f100b873275efe3a0c6184fe54e52830
Signed-off-by: Suresh Vankadara <svankada@codeaurora.org>
msm: wlan: Add db.txt for regulatory support.

db.txt is required for the kernel to process regulatory
hints sent by driver.If db.txt is empty then driver callback
(wiphy->reg_notifier) will not be called so updating db.txt
from upstream kernel. With this change any driver using
regulatory_hint API need to register wiphy->reg_notifier
callback which will be called by cfg layer.This file would
be updated monthly from upstream respository.

Git-commit: bb99560ff69c44c30e47416501639e37014689c3
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-regdb.git
Author: John W. Linville <linville@tuxdriver.com>
Date:   Wed Feb 13 14:36:58 2013 -0500
wireless-regdb: update regulatory.bin based on preceding changes.
CRs-Fixed: 472846
Change-Id: Ic2467894e6af3c5df9f6236e5c28c17636dd08f6
Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>
Merge "ARM: dts: msm: Config i2c cntrl on BLSP1 QUP2 for Krypton"
Merge "coresight: enable flush-on-flushin for periodic flush to usb"
power: qpnp-charger: fix JEITA implement issue

When configure JEITA threshold with 0C, checking
condition will fail and JEITA parameters reading
be skipped. Fix this by replacing logic AND with
OR.

CRs-Fixed: 523702
Change-Id: I239d3a3d47b80b48c1fae0d2f2ba32919f56a449
Signed-off-by: Zhenhua Huang <zhenhuah@codeaurora.org>
Merge "ARM: dts: msm: enable FT5336 touch panel driver for skug"
input: ft5x06_ts: Parse board specific parameters from pdata

To support all models supported by focaltech push necessary
parameters to platform data.

Change-Id: I00b0e8ba7cfc8d8fbd48aa910bd3d0010283ed00
Signed-off-by: Mohan Pallaka <mpallaka@codeaurora.org>
misc: kxtj9 change accelerometer start up time

There's reported test show that the kxtj9 can't bootup in 20ms.
Change the msleep time to 80ms as vendor suggested.

CRs-fixed: 523240
Change-Id: Iaea2c098eb52334c68b030f6a7077babedd0bcf7
Signed-off-by: Oliver Wang <mengmeng@codeaurora.org>
ASoC: msm: qdsp6v2: Fix read error using mmap

When capture session is started in mmap mode then
read commands are issued to ADSP after close command
is issued. This causes read failure as ADSP will not
process the successive read commands after issuing
close command. This change prevents issuing read
command to ADSP when capture session is not in running
state.

Crs-Fixed: 518008
Change-Id: I780fd42dffcd5ee4c051314aaf5f5b537815d8fe
Signed-off-by: Venkat Sudhir <vsudhir@codeaurora.org>
msm: pil: Move all WCNSS clock and regulator proxy votes to PIL ops

The voting for clocks and regulators during WCNSS boot up/restart
was split across the WCNSS platform driver and the PIL ops. Move
all the proxy voting to PIL ops to consolidate the code and remove
unnecessary code. This also allows for future clean up patches that
consolidate the start/powerup and stop/shutdown subsystem ops.

Change-Id: I9808185b6b941228cdc4bb0f5293bedd04aed84d
Signed-off-by: Deepak Katragadda <dkatraga@codeaurora.org>
msm: use dma_alloc_coherent for L1/L2 cache dump buffers

Currently buffers for L1 and L2 cache dump are allocated using
allocate_contiguous_ebi_nomap() api. On devices with more than
2GB of memory, debug image crashes since these buffers end up
being allocated above 2GB address space which the debug image
currently does not support.Hence, use the dma api so as to
have these buffers be allocated below 2GB address space.

CRs-Fixed: 515701
Change-Id: Iaf862753e63fd9f42256c820b3e3ba08b6894bf3
Signed-off-by: Pushkar Joshi <pushkarj@codeaurora.org>
ARM: dts: msm: remove ebi cache dump reservation for 8974

The cache dump driver no longer uses the deprecated ebi memory
reservation api to reserve memory. As such, remove the
reservation from the device tree.

Change-Id: Ib016094da95c0dbc4520b9e3ed657487b180c853
Signed-off-by: Pushkar Joshi <pushkarj@codeaurora.org>
gpu: ion: Ensure zeroed memory gets written to RAM

When zeroing buffers, we need to make sure the zeroed data actually
gets written back to RAM. Otherwise, it may be possible for a buffer
to be reallocated with data still needing to be written back to RAM.
This may lead to corruption from userspace allocators expecting zero'd
buffers and a potential leak of kernel data to user space. Considering
the mapping is short lived and we need to write back the data, use a
writecombine mapping to write the data directly to ram and avoid the
cost of flushing the cache. If the mapping is cached, invalidate the
kernel side mappings as well.

Change-Id: I26a49908bde411469f3b8f143a1581fb4e2c3b56
CRs-Fixed: 520044
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
ARM: dts: msm: Update memory hole for msm9625

Update memory hole for msm9625 2.0 memory map

Change-Id: I9f72a16edef015dd969647766fbcf23f34323f5f
Signed-off-by: Smita Ghosh <smitag@codeaurora.org>
mdss: hdmi: HDCP Topology

This change provides a mechanism to communicate with HDCP manager
to share the downstream KSVs to upstream HDMI devices.

Change-Id: Ib0d772d157af65b2f35c9b7e7cebe8d0e1670735
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>
cma: Allow option to use strict memblock_reserved memory

Despite all the performance optimizations, some clients are
still unable to use CMA because of the allocation latency.
Rather than make those clients use a separate set of APIs,
extend the CMA code to allow clients to keep the memory out of
the buddy allocator. Since the pages never actually go to the
buddy allocator, allocation and freeing is only based on the bitmap
allocator to find the appropriate region.

Change-Id: Ia31bb1212fd7b19280361128453c8d25369ce592
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
drivers: Add option to reserve default CMA region

CMA provides good utilization of memory but for some use cases, the
allocation time is too costly. Add a Kconfig option to allow the
default region to be permanently set aside for contiguous use cases.

Change-Id: I1eef508d37cf6ae3b7b7a652fc59391b186fc122
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>