Merge "ion: Skip zeroing on secure buffers"
Merge "msm: mdss: set default value of panel mode gpio to -EINVAL"
Merge "coresight: stop copying etf contents when buffer size is reached"
Merge "input: misc: Kconfig: Fix misplaced endif"
Merge "msm: mdss: Calculate plane size correctly for H2V1/H1V2 rotation"
Merge "msm: mdss: check for fb node refcount before calling null commit"
Merge "msm: display: only release kickoff when no cleanup pipe"
cfg80211: avoid restoring the regulatory during disconnect

Driver configures the default country code during bootup.
When STA disconnects,cfg80211 restore the regulatory setting
to world domain.cfg80211 should remain in the default country
code and not restore to world reg domain.

Change-Id: I01ccdc4d2831cf252a4b35f9f856f3256d9b7429
CRs-Fixed: 630014
Signed-off-by: Sachin Ahuja <sahuja@codeaurora.org>
Merge "msm: camera: Fix various small issues in Actuator driver"
usb: msm_otg: Fix timeout during usb disconnect with hvdcp charger

Once DCP is detected, ext_chg_active is set to true and DCP uevent
reached to user space. The hvdcp main thread mark dcp_connected to
true and wakesup the detector thread to do hvdcp detection. But before
the detector thread gets a chance to run, DCP is removed. The disconnect
uevent reached the user space and the hvdcp main thread marks the
dcp_connected to false and it will not call any ioctl call. As
ext_chg_active is still set to true, it is waiting for 3 seconds while
processing usb disconnect.

Also it is possible that DCP uevent is reached to the user space much
before ext_chg_active flag is set to true in otg state machine work which
later leads to timeout of 3 seconds later while processing usb disconnect.

Fix these issues by maintaining different states for ext_chg_active. Upon
DCP disconnect, if the ext_chg_active value is still default, mark it to
inactive. This avoid the 3 seconds wait timeout while processing the usb
disconnect.

CRs-Fixed: 671181
Change-Id: Ic4aa6745e994a007bd6bd2e75d4f44fb8f7ac9c1
Signed-off-by: Saket Saurabh <ssaurabh@codeaurora.org>
msm: mdss: fix the pack alignment of MDP output for RGB666 format

Currently for RGB666 format, the MDP output is set as LSB aligned
and banding artifacts are observed due to this. Set the MDP output
to be MSB aligned to avoid these artifacts and for the display
to show up fine with RGB666 format.

Change-Id: Id8b7bf03218dd0ea70ada34912afd092e239b89f
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
Merge "cma: Allow option to use strict memblock_reserved memory"
ASoC: wcd9320: Wait for enough time for Line PAs to get settled

During fast switching of audio playback, we need to wait
for 5ms for the LINE PAs to get settled down before enabling
them again for playback. Same delay is also required after PA
is enabled. Add the required delays after LINE PAs are enabled
or disabled.

CRs-Fixed: 668339
Change-Id: Ie51a88c7a3359660aa416bb23131ca4ac0c49b7a
Signed-off-by: Phani Kumar Uppalapati <phaniu@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>
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
Merge "msm: ultrasound: add support for stream parameters"
Merge "nl80211: Correct the usage of command NL80211_CMD_VENDOR"
ARM: dts: msm: use auto mode for MSM8974ProAC

PMA8084 ganged regulator's auto mode meets the load transient spec.
Enable auto mode for MSM8974ProAC.

CRs-Fixed: 674236
Change-Id: Ibb66e29c7912d63ddfe44f743918c4c48172e8d3
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Merge "cma: Allow option to use strict memblock_reserved memory"
msm: thermal: Add support for cpu temp limit recommendation for SoC

Add support in KTM to get SoC parts info by reading appropriate
efuse bits and recommend default cpu temperature limit based on
efuse value temperature map to userspace through sysfs interface
'/sys/module/msm_thermal/default_cpu_temp_limit'. Efuse data
to be read such as address, row number, starting bit number
of the row, number of bits for identifying parts etc, default core
temperature and efuse temperature value map are read from dt.
The default cpu temperature information is exported in the format
<temperature in degree celsius>.

Change-Id: Icbf43c3fd56e95d49a886d309e613d2fe146a506
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>
ARM: dts: msm: Add default cpu temp limit info entry for MSM8610

Add efuse data for identifying SoC parts and cpu temperature limit
information for different parts to thermal for MSM8610.

Change-Id: I1b50280c7c8092544165b26b95e235e5571a63d3
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>