Merge "msm: power: update power drivers to msm-3.4 tip"
Conflicts:
	drivers/power/pm8921-bms.c
	drivers/power/pm8921-charger.c
	drivers/usb/otg/msm_otg.c
	include/linux/mfd/pm8xxx/ccadc.h
Merge "msm: power: update power drivers to msm-3.4 tip"
Conflicts:
	arch/arm/mach-msm/board-8960.c
	drivers/char/diag/diag_debugfs.c
	drivers/char/diag/diag_masks.c
	drivers/char/diag/diagchar_core.c
	drivers/video/msm/mipi_lgit_video_wxga_pt.c
Merge "msm: board-8064: Increase MFC ION heap size by 256KB"
Conflicts:
	arch/arm/mach-msm/lge/mako/board-mako-pmic.c
	drivers/power/pm8921-bms.c
	drivers/power/pm8921-charger.c
Merge "msm: vidc: Separate meta buffers support in secure mode"
Conflicts:
	arch/arm/mach-msm/lge/mako/board-mako-pmic.c
	drivers/power/pm8921-bms.c
	drivers/power/pm8921-charger.c
Merge "msm:vidc: Add support for MP2 sequence end code"
Merge "msm:vidc: Add support for MP2 sequence end code"
Conflicts:
	arch/arm/mach-msm/board-8960.c
	arch/arm/mach-msm/lge/mako/board-mako-pmic.c
	drivers/char/diag/diag_debugfs.c
	drivers/char/diag/diag_masks.c
	drivers/char/diag/diagchar_core.c
	drivers/power/pm8921-bms.c
	drivers/power/pm8921-charger.c
	drivers/video/msm/mipi_lgit_video_wxga_pt.c
	drivers/video/msm/vidc/common/dec/vdec.c
USB: ks_bridge: Fix PM usage counter mismatch

The runtime PM is disabled for a device during suspend.  It is
enabled again just before resuming  the device.  The resume method
of USB interface drivers are called while resuming a USB device.  As
USB device is the parent of an interface, the interface resume is
blocked till USB device resume is completed.  If interface driver
call any runtime PM API before interface runtime PM is enabled, it
fails with -EACCESS error.

The USB runtime wrapper usb_autopm_get_interface() decrements PM usage
counter when get_sync() is failed.  The current code is decrementing
the PM usage counter even when an error code is returned from
usb_autopm_get_interface().  Due to this double decrementing, the KS
bridge interface PM usage counter is becoming negative after several
suspend and resume cycles.  Once the PM usage counter becomes negative,
the interface runtime PM state will never become active.  That means,
USB device suspend can happen even when a Tx URB is pending from ks
bridge driver.

The fix is trivial.  Don't decrement PM usage counter when error code
is returned from usb_autopm_get_interface().

(cherry picked from commit 361d9af92470ebeeb0a42f73e6eb457ab279b282)

Conflicts:

	drivers/usb/misc/ks_bridge.c

CRs-Fixed: 437214
Change-Id: I96c9e1797c137cd158c424ebf6342f607cee6d78
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>

Conflicts:
	drivers/usb/misc/ks_bridge.c
revert "msm: 8064: Add regulator supply for DDR3 memory"

This reverts commit 994ff121f0c2e3ff00fa38ae2f8dfde4bda1b332.
PM8921 MPP7 no longer must be kept high at all times for targets
using PCDDR3 memory because newer hardware ensures that memory is
always powered when necessary.

Change-Id: I4919abceb875b9ea22e6b2c0bd617280deb7e65b
Signed-off-by: David Collins <collinsd@codeaurora.org>
Signed-off-by: Ajay Dudani <adudani@codeaurora.org>

Conflicts:
	arch/arm/mach-msm/board-8064.c
USB: ci13xxx_udc: Avoid flushing endpoint twice during disable

The ep_disable() function nukes all pending requests before
disabling the endpoint in hardware.  The endpoint is flushed
during nuking.  Don't flush the endpoint again.

(cherry picked from commit a89f80f9942e5dc2796ad742f9d01f6aa68e1267)

CRs-Fixed: 445916
Change-Id: I84020dceef751dbdde1233068a414a72d1c1b609
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
USB: ci13xxx_udc: Don't flush inactive endpoints

The endpoint must be flushed prior to retiring pending requests.
This is done during disabling an endpoint.  Don't flush an endpoint
if there are no pending requests.  According databook flushing
endpoint may take large amount of time.  This optimization will
make USB disconnect/reset processing a little bit faster.

(cherry picked from commit 58db2c1f94451d7a352d2ad1a1b1e9732f4f0a11)

CRs-Fixed: 445916
Change-Id: I2a8b185d7f6f295485bc1d1b1794f42471149491
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
USB: ci13xxx_udc: Skip flushing endpoints upon failure

Flushing an endpoint involve polling ENDPTFLUSH and ENDPTSTAT
registers.  The worst case timeout is 100 msec for each endpoint.
The reason for failure is unknown.  When flushing an endpoint
fails, successive flushing of remaining endpoints are also failing.
Hence skip flushing remaining endpoints.  Reset this condition
upon USB bus reset.

(cherry picked from commit 2a630fb9b83b31e607ef61f3b61959cc1b095349)

CRs-Fixed: 445916
Change-Id: I54cf860c0d290ffa3fc0d7e41af32b4be48937ef
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
msm: display: Fix blend configuration for video layer with MDP composition

With video layer in MDP composition, there is no need to apply destination
over blend rule, as z-order of layers take care of proper staging of layers
by default. Apply constant blend to the video layer when in MDP composition

CRs-fixed: 437965
Change-Id: I7476659f12cdf06018bf6ace829a836c86ae97e8
Signed-off-by: Mayank Chopra <makchopra@codeaurora.org>