Revert "ASoC: msm: fall back to have AFE port started at prepare"

This reverts commit c5179ea56dc45ec8f072d54b4b44fdc307bd5170.

	modified:   include/sound/q6afe.h
	modified:   sound/soc/msm/msm-dai-q6-hdmi.c
	modified:   sound/soc/msm/msm-dai-q6.c
	modified:   sound/soc/msm/qdsp6/q6afe.c
Merge tag 'v3.0.88' into cm-10.1-3.0.87

This is the 3.0.88 stable release
Merge commit 'c1aa3501dc851ef050c8d19df0d3b9cdf02afa3f' into cm-10.1-stable
vidc: Fix EOS handling if video h/w has a frame in transaction

In case of video hardware is encoding a frame and EOS buffer with
with zero data length arrived, set the EOS flag to the transaction
available in the transaction table which will be passed to the
client in frame done callback from the video hardware.

Signed-off-by: Praveen Chavan <pchavan@codeaurora.org>

Conflicts:
	drivers/video/msm/vidc/common/vcd/vcd_sub.c

Change-Id: Ia5711d30a6d19d828797690dbede82c7d55923bf
msm: vidc: Adds AU delimiter support for AVC.

Add new V4L2 control to set AU delimiter for AVC.

Change-Id: I8c72cb89f18c9b2b550b906d797eafb73ac4ebbe
CRs-Fixed: 389030
Signed-off-by: Srinu Gorle <sgorle@codeaurora.org>
Signed-off-by: Neha Pandey <nehap@codeaurora.org>

Conflicts:
	drivers/media/video/msm_wfd/enc-mfc-subdev.c
	include/linux/videodev2.h
	include/media/msm/vcd_property.h
media: v4l2: add video controls in v4l2 framework.

Adds control definitions in v4l2 framework needed for
configuring video codec properties. Userspace clients
and in-kernel clients can make calls into video driver
to set/change codec properties like codec, profile, level,
resolution, bitrate, ratecontrol, framerate.

Change-Id: I6396106af69b2686a78b83d5833cd60a1c6d4cef
Signed-off-by: Ashray Kulkarni <ashrayk@codeaurora.org>

Conflicts:
	include/linux/videodev2.h
msm: vidc: Adds VUI timing info support for AVC encoding.

Poor video quality is observed as VUI fps information is not present in
the encoded bit stream. Add support for VUI timing info in video driver
and an additional V4L2 control to set from user space.

CRs-Fixed: 399017
Signed-off-by: Srinu Gorle <sgorle@codeaurora.org>
Conflicts:

	include/linux/videodev2.h

Change-Id: I970d4c479009da2d08531a9e9b8489a84cc5d44c
Signed-off-by: Neha Pandey <nehap@codeaurora.org>

Conflicts:
	drivers/media/video/msm_wfd/enc-subdev.h
	drivers/media/video/msm_wfd/wfd-ioctl.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_shared_mem.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_shared_mem.h
	include/media/msm/vcd_property.h
msm: vidc: add support for the bitstream_restrict flag

Adds support for the MFC core to add the bitstream_restrict flag in the
sps/pps for H264 codecs.  This allows for the decoder to determine how
many frames to buffer when decoding.

Change-Id: Ic0de960d92a771d74c303dac7100734d6411fc45
Signed-off-by: Deepak Verma <dverma@codeaurora.org>

Conflicts:
	drivers/video/msm/vidc/common/enc/venc.c
	include/linux/msm_vidc_enc.h
	include/media/msm/vcd_property.h
Revert "Merge branch 'cm-10.1' of git://github.com/razrqcom-dev-team/android_kernel_motorola_msm8960-common into jb2"

This reverts commit bea6d3ca66718fb691c1e335f171101b034aa6a3, reversing
changes made to e919fe1402fa563214e9e8b6097558aac2ab1a5a.
Revert "Merge branch 'cm-10.1' of git://github.com/razrqcom-dev-team/android_kernel_motorola_msm8960-common into jb2"

This reverts commit e919fe1402fa563214e9e8b6097558aac2ab1a5a, reversing
changes made to 34c20d8fbed371347a052df9edc46ede2ddc85f1.

Conflicts:
	sound/soc/msm/msm-dai-q6.c
Revert "Merge branch 'cm-10.1' of git://github.com/razrqcom-dev-team/android_kernel_motorola_msm8960-common into jb2"

This reverts commit e919fe1402fa563214e9e8b6097558aac2ab1a5a, reversing
changes made to 34c20d8fbed371347a052df9edc46ede2ddc85f1.

	modified:   sound/soc/msm/msm-dai-q6.c
Merge branch 'cm-10.1' of git://github.com/razrqcom-dev-team/android_kernel_motorola_msm8960-common into jb2