mdss_dsi_panel: Clean up panel reset

We didn't properly merge qcom's changes here

Change-Id: I726dbc156fd793162d4e4dc1e206c1eab88ce141

Conflicts:
	drivers/video/msm/mdss/mdss_dsi_panel.c
Revert "msm: mdss: Dynamic FPS using VFP."

This reverts commit 043d680b4f6f9093a0fff361da87bee894886cf0.

Conflicts:
	drivers/video/msm/mdss/mdss_dsi_host.c
msm: mdss: fix DCS backlight control when broadcast mode is enabled

When broadcast mode is enabled, we trigger DCS commands when cmds_tx
is done on controller 1. This call is missing in the path of
backlight control using DCS commands. Add this call to fix DCS
backlight issues for broadcast mode.

Change-Id: I18193375e180a42fb1db42fb1d52a976b660ae1c
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
msm8974: Update config for JDI dual-DSI panel
* 60 FPS (dynamic)
Merge branch 'test1' of https://github.com/kejar31/android_kernel_oppo_find7 into kk4.4
Revert "Revert "input: touch: synaptics: Reset the device when blanking display""

This reverts commit 8b9e61d3021d5a2398587aa1bf00b3ecee25b3da.

Change-Id: Ia60a6602fd8568bf7562f2ca8cc535befb9976ce
Find7: fix headset detection and button

Change-Id: Ic6d1cf0ff2bcea5128f00ff31cc1bd6adbbf2440
staging: binder: add vm_fault handler

An issue was observed when a userspace task exits.
The page which hits error here is the zero page.
In binder mmap, the whole of vma is not mapped.
On a task crash, when debuggerd reads the binder regions,
the unmapped areas fall to do_anonymous_page in handle_pte_fault,
due to the absence of a vm_fault handler. This results in
zero page being mapped. Later in zap_pte_range, vm_normal_page
returns zero page in the case of VM_MIXEDMAP and it results in the
error.

BUG: Bad page map in process mediaserver  pte:9dff379f pmd:9bfbd831
page:c0ed8e60 count:1 mapcount:-1 mapping:  (null) index:0x0
page flags: 0x404(referenced|reserved)
addr:40c3f000 vm_flags:10220051 anon_vma:  (null) mapping:d9fe0764 index:fd
vma->vm_ops->fault:   (null)
vma->vm_file->f_op->mmap: binder_mmap+0x0/0x274
CPU: 0 PID: 1463 Comm: mediaserver Tainted: G        W    3.10.17+ #1
[<c001549c>] (unwind_backtrace+0x0/0x11c) from [<c001200c>] (show_stack+0x10/0x14)
[<c001200c>] (show_stack+0x10/0x14) from [<c0103d78>] (print_bad_pte+0x158/0x190)
[<c0103d78>] (print_bad_pte+0x158/0x190) from [<c01055f0>] (unmap_single_vma+0x2e4/0x598)
[<c01055f0>] (unmap_single_vma+0x2e4/0x598) from [<c010618c>] (unmap_vmas+0x34/0x50)
[<c010618c>] (unmap_vmas+0x34/0x50) from [<c010a9e4>] (exit_mmap+0xc8/0x1e8)
[<c010a9e4>] (exit_mmap+0xc8/0x1e8) from [<c00520f0>] (mmput+0x54/0xd0)
[<c00520f0>] (mmput+0x54/0xd0) from [<c005972c>] (do_exit+0x360/0x990)
[<c005972c>] (do_exit+0x360/0x990) from [<c0059ef0>] (do_group_exit+0x84/0xc0)
[<c0059ef0>] (do_group_exit+0x84/0xc0) from [<c0066de0>] (get_signal_to_deliver+0x4d4/0x548)
[<c0066de0>] (get_signal_to_deliver+0x4d4/0x548) from [<c0011500>] (do_signal+0xa8/0x3b8)

Add a vm_fault handler which returns VM_FAULT_SIGBUS, and prevents the
wrong fallback to do_anonymous_page.

CRs-Fixed: 673147
Change-Id: I43730a51b6c819538b46c5e4dc5c96c8a384098d
Signed-off-by: Vinayak Menon <vinayakm.list@gmail.com>
Patch-mainline: linux-arm-kernel @ 06/02/14, 18:17
Signed-off-by: Vignesh Radhakrishnan <vigneshr@codeaurora.org>
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
ASoC: wcd9306: fix the NULL pointer dereference in the tapan codec

During the close of the AFE port the AIF1 PB widget will be closed
which access the core variable.
If the core is not initialized yet it will result in the kernel panic.
Fix by adding the check for the core structure to be initialized.

CRs-Fixed: 635790
Change-Id: Ic057e2eb75b25dbc55aa06cbce2b49aca0b1b25f
Signed-off-by: Aviral Gupta <aviralg@codeaurora.org>
defconfig: Enable ESP match target

Configuration change to enable ESP match target in iptables to
provide the ability to match packets based on the SPI (Security
Parameters Index) value in the ESP (Encapsulating Security Payload)
header.

CRs-Fixed: 700799
Change-Id: Iee635760d79946c480342d30e73d44f9756c0324
Acked-by: Sireesh Gavini <sgavini@qti.qualcomm.com>
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
find7/op defconfig: Enable ESP match target

Configuration change to enable ESP match target in iptables to
provide the ability to match packets based on the SPI (Security
Parameters Index) value in the ESP (Encapsulating Security Payload)
header.

Change-Id: Id7178a6342acefae2a8120f2b9ceef2c0676513f
Add back dai links accidentally removed in 8f5df7bace2bfd2453ab9b57105edf675eccbfb3

Change-Id: Ie5b44d97c107637d10eb48aa7a7d7d076aaa5bc5
platform: msm: Fix compile when CONFIG_PFT is not set

Change-Id: Ib8ef7bca7b07fa5c34c64a2828a18be22b3775d9
update defconfig

Change-Id: Ifbfb5488f2ba9edc7f0255d1eb3f15f447820e04
Remove '+' symbol from kernel version string

Change-Id: I169942394a1a0bfd1b95b299168e95715cc3340b
Signed-off-by: Francisco Franco <franciscofranco.1990@gmail.com>
ASoC: wcd9xxx: Use CM headset detection code"

Change-Id: Ib2375fe19ec02735ca27d29fe9fc7e03b7c48403
asoc: msm: Adjust MBHC thresholds

 * Revert Oppo damage- these are wrong after revert to QC version
 * Reduce delta to 10mV for correct detection when headphone is active

Change-Id: I6611ebeb09f60fb4cda48ba042bc1623544d688f
ASoC: wcd9xxx: Enable current source support for 2nd mic detection

Use current source to detect presence of second mic if MICBIAS
for primary and secondary mic is not shared. If MICBIAS is shared,
do not use detection with current source.

Change-Id: I25009bd15cf5a593761d8b182ed4bcb6c2c210a2
Signed-off-by: Simmi Pateriya <simmip@codeaurora.org>
ASoC: wcd9xxx-mbhc: Avoid flipping current source setting

In some cases, the current source switch on codec is disabled and
enabled again where it could have been left in enabled state. This
flipping of current source setting is causing a pop on the headphones.
Add fix to avoid this unnecessary flipping of current source switch.

Change-Id: I36055218230034b14a2c9536e176d1c6f8a1881e
CRs-fixed: 675563
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
asoc: msm: Untangle the external micbias control for wcd9320

 * Use standard on-demand supply for external micbias and
   clean up the code a bit.

Change-Id: Ia334ba6354cbb5c315bf9a8f374235732b9325c3