gpu: msm: remove device-specific adreno directory
video: msm: remove msm_8x60 directory
include: linux: msm_vidc_enc: revert HTC's weird pbuffer definition
genlock: undo HTC genlock changes
various: compilation fixes for gcc 4.6

These changes are required to compile successfully with
gcc version 4.6.

The -Wno-address option is applied to some files to
bypass a warning triggered by an rcu macro. The
warning is fixed cleanly upstream, but that fix is too
risky to backport, so it is better to just silence it
this way.

Change-Id: I787ad2db6e649d29874b7b624c2b28f686236466
Signed-off-by: Steve Muckle <smuckle@codeaurora.org>

Conflicts:
	arch/arm/mach-msm/board-8930.c
	arch/arm/mach-msm/scm.c
various: fix warnings for kernel compile

These changes suppress or fix warnings, in particular
-Wno-cpp, -Wenum-compare, -Wunused-value
arm: Allow CPU-supported unaligned accesses

This change reconfigures the CPU to allow CPU-supported aligned
accesses, which are generally faster than software-only fixups,
resulting in fewer alignment exceptions.

Signed-off-by: Brent DeGraaf <bdegraaf@codeaurora.org>
msm: acpuclock-8960: allow 192MHz minimum voltage
drivers: usb: reset USB drivers back to CAF

Undo HTC changes to the Android USB gadget driver, reset back to CAF at
initial import of HTC drivers. This brings Android USB gadget driver
back in line with CAF at commit id:
8987911c69d7e3e79da6f9b53d733d7d74f20775
"msm: video: Update macros to use readl/writel".
usb: core: remove dangling reference to undefined variable
base: genlock: Use a signed long for the result from wait_timeout

interruptible_wait_timeout returns a signed long, so make sure that
we use a signed long to hold the result. Using an unsigned value would
horribly misinterpet an error such as -ERESTARTSYS.

CRs-Fixed: 341347
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
(cherry picked from commit be669bc92358653a46c63f2352e6d981f9ed3bdf)

Change-Id: Ifcf555f8719f9c74fdb6d8b5cf2a32582988335b
Signed-off-by: Ram Kumar Chakravarthy Chebathini <rcheba@codeaurora.org>
base: genlock: allow synchronization with a single gralloc handle

In order to support synchronization in a process with a single
gralloc handle we require the ability to write lock a buffer
while it is already read locked by the same handle. This change
extends the concept of an exclusive write lock or recursive read
locks to a genlock handle (rather than the genlock lock).
Genlock cannot provide deadlock protection because the same
handle can be used simultaneously by a producer and consumer.
In practice an error will still be generated when the timeout
expires.

CRs-fixed: 356263

Signed-off-by: Jeff Boody <jboody@codeaurora.org>
(cherry picked from commit 6d9076fe46bcba71986a25cf357e71a4d83958c1)

Change-Id: I5d02591586023f4b622915522e2e038c16c9f2f2
Signed-off-by: Ram Kumar Chakravarthy Chebathini <rcheba@codeaurora.org>
base: genlock: remove BIT macro usage

The BIT macro is not defined for !_KERNEL_ resulting in compile errors.

CRs-fixed: 356263
Signed-off-by: Jeff Boody <jboody@codeaurora.org>
(cherry picked from commit 0977510e0f72b2f1a24f41d5154c2f1b80c96d9a)

Change-Id: Iaf188a1af838c98ca30ce216d7be8ddf85db700c
Signed-off-by: Ram Kumar Chakravarthy Chebathini <rcheba@codeaurora.org>
base: genlock: protect kref counting with spinlock

A race condition exists where the attach may not kref_get
before the kref_put finished. The genlock_file_lock was
originally added to protect against this case however it
was not protecting the kref.

CRs-fixed: 359649
Signed-off-by: Jeff Boody <jboody@codeaurora.org>
(cherry picked from commit d6f534fc51eb5fc23d08dacceecd42a4b98747a6)

Change-Id: I4115ea1cc39ebe38ad0032ebf86871ac9d23a312
Signed-off-by: Ramakrishna Prasad N <crpn@codeaurora.org>
base: genlock: add magic to protect attach from non-genlock file

It is possible for user space to attempt to attach a valid fd that
does not correspond to a genlock file. This change adds a magic to
the kernel private data that is used for validation.

CRs-fixed: 359649
Signed-off-by: Jeff Boody <jboody@codeaurora.org>
(cherry picked from commit 507a9d3354b24e7cc7f22e9695339de6df317fc1)

Change-Id: Ice93bfc904f61431688f03027a4090ceb7b9289a
Signed-off-by: Ramakrishna Prasad N <crpn@codeaurora.org>
msm-pcm-lpa: 8960: Issue EOS to DSP after playback is complete

Issue an EOS command to ensure that dsp is completely flushed
before closing the stream. This command is only issued if the
the routing is still enabled.

Change-Id: Id36f2b1a2e5e3fef5dcde759277f3ca4417c17e7
CRs-Fixed: 331532
Signed-off-by: Tejas Shikhare <tshikhar@codeaurora.org>
(cherry picked from commit 6fd0e00adcfe46b5b6a82d215e39a70e7b9af612)

Conflicts:
	sound/soc/msm/msm-pcm-lpa.c
	sound/soc/msm/msm-pcm-routing.c
	sound/soc/msm/msm-pcm-routing.h
ASoC: msm: remove ADM dependency

ADM management logic has been moved to PCM routing
driver. Clean up CPU driver not to call adm_close
as it would have been called by routing driver.

Change-Id: I520414d2e84c963e9c3b40e2c0d8eb6e3bb0d554
Signed-off-by: Patrick Lai <plai@codeaurora.org>
(cherry picked from commit a70d369a8c341d9067cfc4fa09a9b40a696ce3ed)
ASoc: msm: Fix calibration memory map

Fix the ADM & AFE calibration code so that
if the calibration data is larger then the
block previously mapped to the Q6 unmap the
previous block and remap with the new block
size.

CRs-fixed: 339184
Signed-off-by: Ben Romberger <bromberg@codeaurora.org>
(cherry picked from commit 9e79256095b5fff1811ba6e9452588de8cdbf869)

Change-Id: I6f3f3fcd86461c18094b82f1f8f1e87018046aa6
Signed-off-by: Ramakrishna Prasad N <crpn@codeaurora.org>

Conflicts:
	sound/soc/msm/qdsp6/q6adm.c
ASOC: msm: close AUX PCM when both RX and TX are closed.

AUX PCM RX and TX interfaces have to opened together and closed
together for AUX PCM HW interface to work correctly. Currently
as soon AUX PCM RX interface is closed AUX PCM TX is also closed.
Correct this by opening AUX PCM HW interface as soon one of
AUX PCM RX and TX is opened and close the AUX PCM HW interface
when both AUX PCM  RX and AUX PCM TX  interfaces are closed.

Change-Id: I5e6ec64f62ad31cd6369bccb66ea549e7f62d004
CRs-Fixed: 337425
Signed-off-by: Kiran Kandi <kkandi@codeaurora.org>
ASoC: msm: Send a write done in paused state

Send a write done event as timer interrupt in paused state to
resolve the concurrency between between pausing and completion of
buffer

CRs-Fixed: 340469
Signed-off-by: Tejas Shikhare <tshikhar@codeaurora.org>
(cherry picked from commit 394dc966e3031f30c26403b879169f8ccec0f2f7)

Change-Id: Iaac0b70bda1b490cf2e79a99471ab0c2c3840d29
Signed-off-by: Yen-Pin Hsiao <yphsiao@codeaurora.org>