Linux 3.0.58

Change-Id: I03dc1133d0c91efda5a0d090d281d290eb8ee9b7
ion: Revert ION updates for proprietary camera HAL

Squashed commit of the following commits:

Revert "msm: ion: Only return Ion flags in ion_handle_get_flags"

This reverts commit d40fd66600da3e866b50af86ce7f3fec8e21a7d4.

Revert "gpu: ion: fix some missing defines for ion mini upgrade"

This reverts commit 5a062fd2f408dd34c5af60e0b9eb3643aa62384c.

Revert "gpu: ion: move msm-specific ioctls to custom_ioctl"

This reverts commit a94c976b1c12ff78e3b9dd760deca00a15102659.

Revert "gpu: ion: repurpose flags field for heap_mask and caching"

This reverts commit 0356cdd2037050a5994d33c703a10f7652281bcf.

Revert "Revert "ion: restore ics ion_allocation_data structure""

This reverts commit b75661b2d89bf5974654b0145f58eb7409301cda.
msm-pcm-q6: Add support for flexible recording period size

- Current implementation supports only fixed buffer size
  of 320 bytes only for audio recording. This results in
  performance overhead for recording at higher sample rate.
- Added support for flexible period size so that user can
  use larger buffers for recording at higher sample rates.

Signed-off-by: SathishKumar Mani<smani@codeaurora.org>
Signed-off-by: Iliyan Malchev <malchev@google.com>

Conflicts:
	sound/soc/msm/msm-pcm-q6.c

Change-Id: Ib061ca0106ea240cf2dfeb1816a25b00520e0c22

Conflicts:
	sound/soc/msm/msm-pcm-q6.c
jewel: add missing display_on DSI command

Missing display_on DSI command caused jewel devices with certain panels
to fail to power on.

Change-Id: I9058c7a5a4ce2bcd4b62661a125768ffb6bb9d16
Linux 3.0.59

Change-Id: I5ff61809fd6771efed8ecdb02aa17e34539f4e68
msm8960: Fixed compilation under GCC 4.7

Various fixes for the GCC 4.7/Linaro compiler. AOSP Master is moving
toward GCC 4.7 so it isn't a bad idea to get compatible with the
toolchain.

Change-Id: I88518ff14cd6fa6e26e2daed4a3a6414e0cd01a0
Signed-off-by: rohan <rohanmathur34@gmail.com>
ion: add hack for HTC IOMMU camera

HTC liboemcamera requests memory from the CAMERA or IOMMU heaps, which
we cannot provide currently. Since we cannot change liboemcamera, remap
to CP_MM heap if CAMERA heap is requested.

Change-Id: I6b965bb56835583c687f0086efcb153c64cf1e25
msm: clock-8960: Change source of DSI escape clock to byte clock

Changing DSI escape clock source from PXO to byte clock to add
flexibilty for customers. They can modify the escape clock by
changing the pinfo divider.

Change-Id: I3ad072fc524fe5fae9695a55bba24ce23b97efc7
CRs-Fixed: 361022
Signed-off-by: Siddhartha Agrawal <agrawals@codeaurora.org>

Conflicts:
	arch/arm/mach-msm/clock-8960.c
Use AC charging for unknown chargers
Linux 3.0.60

Change-Id: I9d3e94a3830cb37a0b0f457a5d3c0eade9400a75
Signed-off-by: rohan <rohanmathur34@gmail.com>
Linux 3.0.61

Change-Id: I9b6527e26176e1e6f67929a7d60d5e8de021ee12
bdi: use deferable timer for sync_supers task

sync_supers task currently wakes up periodically for superblock
writeback. This hurts power on battery driven devices. This patch
turns this housekeeping timer into a deferable timer so that it
does not fire when system is really idle.

CRs-Fixed: 353700
Signed-off-by: Yong Wang <yong.y.wang@intel.com>
Signed-off-by: Xia Wu <xia.wu@intel.com>
Signed-off-by: Krishna Vanka <kvanka@codeaurora.org>
(cherry picked from commit f398f30d1f34632d3c96758b5b19e65b056af072)

Change-Id: I6ec6310d66c0d014adf0f41e75cd4c48c233f83d
Signed-off-by: Sridhar Gujje <sgujje@codeaurora.org>
msm: iommu: Use threaded IRQ handler for page faults

A threaded interrupt handler for IOMMU page faults will
allow the use of the new clock APIs from the interrupt
handler.

Change-Id: I381df3974daa7fbc4bc4ec0558434959597b4f24
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>

Conflicts:
	arch/arm/mach-msm/iommu_dev.c